diff --git a/API.Tests/Helpers/RandfHelper.cs b/API.Tests/Helpers/RandfHelper.cs new file mode 100644 index 000000000..d8c007df7 --- /dev/null +++ b/API.Tests/Helpers/RandfHelper.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; + +namespace API.Tests.Helpers; + +public class RandfHelper +{ + private static readonly Random Random = new (); + + /// + /// Returns true if all simple fields are equal + /// + /// + /// + /// fields to ignore, note that the names are very weird sometimes + /// + /// + /// + public static bool AreSimpleFieldsEqual(object obj1, object obj2, IList ignoreFields) + { + if (obj1 == null || obj2 == null) + throw new ArgumentNullException("Neither object can be null."); + + Type type1 = obj1.GetType(); + Type type2 = obj2.GetType(); + + if (type1 != type2) + throw new ArgumentException("Objects must be of the same type."); + + FieldInfo[] fields = type1.GetFields(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic); + + foreach (var field in fields) + { + if (field.IsInitOnly) continue; + if (ignoreFields.Contains(field.Name)) continue; + + Type fieldType = field.FieldType; + + if (IsRelevantType(fieldType)) + { + object value1 = field.GetValue(obj1); + object value2 = field.GetValue(obj2); + + if (!Equals(value1, value2)) + { + throw new ArgumentException("Fields must be of the same type: " + field.Name + " was " + value1 + " and " + value2); + } + } + } + + return true; + } + + private static bool IsRelevantType(Type type) + { + return type.IsPrimitive + || type == typeof(string) + || type.IsEnum; + } + + /// + /// Sets all simple fields of the given object to a random value + /// + /// + /// Simple is, primitive, string, or enum + /// + public static void SetRandomValues(object obj) + { + if (obj == null) throw new ArgumentNullException(nameof(obj)); + + Type type = obj.GetType(); + FieldInfo[] fields = type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + + foreach (var field in fields) + { + if (field.IsInitOnly) continue; // Skip readonly fields + + object value = GenerateRandomValue(field.FieldType); + if (value != null) + { + field.SetValue(obj, value); + } + } + } + + private static object GenerateRandomValue(Type type) + { + if (type == typeof(int)) + return Random.Next(); + if (type == typeof(float)) + return (float)Random.NextDouble() * 100; + if (type == typeof(double)) + return Random.NextDouble() * 100; + if (type == typeof(bool)) + return Random.Next(2) == 1; + if (type == typeof(char)) + return (char)Random.Next('A', 'Z' + 1); + if (type == typeof(byte)) + return (byte)Random.Next(0, 256); + if (type == typeof(short)) + return (short)Random.Next(short.MinValue, short.MaxValue); + if (type == typeof(long)) + return (long)(Random.NextDouble() * long.MaxValue); + if (type == typeof(string)) + return GenerateRandomString(10); + if (type.IsEnum) + { + var values = Enum.GetValues(type); + return values.GetValue(Random.Next(values.Length)); + } + + // Unsupported type + return null; + } + + private static string GenerateRandomString(int length) + { + const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + return new string(Enumerable.Repeat(chars, length) + .Select(s => s[Random.Next(s.Length)]).ToArray()); + } +} diff --git a/API.Tests/Services/ImageServiceTests.cs b/API.Tests/Services/ImageServiceTests.cs index a1073a55b..f2c87e1ad 100644 --- a/API.Tests/Services/ImageServiceTests.cs +++ b/API.Tests/Services/ImageServiceTests.cs @@ -161,10 +161,10 @@ public class ImageServiceTests private static void GenerateColorImage(string hexColor, string outputPath) { - var color = ImageService.HexToRgb(hexColor); - using var colorImage = Image.Black(200, 100); - using var output = colorImage + new[] { color.R / 255.0, color.G / 255.0, color.B / 255.0 }; - output.WriteToFile(outputPath); + var (r, g, b) = ImageService.HexToRgb(hexColor); + using var blackImage = Image.Black(200, 100); + using var colorImage = blackImage.NewFromImage(r, g, b); + colorImage.WriteToFile(outputPath); } private void GenerateHtmlFileForColorScape() diff --git a/API.Tests/Services/ReadingProfileServiceTest.cs b/API.Tests/Services/ReadingProfileServiceTest.cs new file mode 100644 index 000000000..b3d81e5ac --- /dev/null +++ b/API.Tests/Services/ReadingProfileServiceTest.cs @@ -0,0 +1,561 @@ +using System.Linq; +using System.Threading.Tasks; +using API.Data.Repositories; +using API.DTOs; +using API.Entities; +using API.Entities.Enums; +using API.Helpers.Builders; +using API.Services; +using API.Tests.Helpers; +using Kavita.Common; +using Microsoft.EntityFrameworkCore; +using NSubstitute; +using Xunit; + +namespace API.Tests.Services; + +public class ReadingProfileServiceTest: AbstractDbTest +{ + + /// + /// Does not add a default reading profile + /// + /// + public async Task<(ReadingProfileService, AppUser, Library, Series)> Setup() + { + var user = new AppUserBuilder("amelia", "amelia@localhost").Build(); + Context.AppUser.Add(user); + await UnitOfWork.CommitAsync(); + + var series = new SeriesBuilder("Spice and Wolf").Build(); + + var library = new LibraryBuilder("Manga") + .WithSeries(series) + .Build(); + + user.Libraries.Add(library); + await UnitOfWork.CommitAsync(); + + var rps = new ReadingProfileService(UnitOfWork, Substitute.For(), Mapper); + user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.UserPreferences); + + return (rps, user, library, series); + } + + [Fact] + public async Task ImplicitProfileFirst() + { + await ResetDb(); + var (rps, user, library, series) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Implicit) + .WithSeries(series) + .WithName("Implicit Profile") + .Build(); + + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Non-implicit Profile") + .Build(); + + user.ReadingProfiles.Add(profile); + user.ReadingProfiles.Add(profile2); + await UnitOfWork.CommitAsync(); + + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(seriesProfile); + Assert.Equal("Implicit Profile", seriesProfile.Name); + + // Find parent + seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id, true); + Assert.NotNull(seriesProfile); + Assert.Equal("Non-implicit Profile", seriesProfile.Name); + } + + [Fact] + public async Task CantDeleteDefaultReadingProfile() + { + await ResetDb(); + var (rps, user, _, _) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Default) + .Build(); + Context.AppUserReadingProfiles.Add(profile); + await UnitOfWork.CommitAsync(); + + await Assert.ThrowsAsync(async () => + { + await rps.DeleteReadingProfile(user.Id, profile.Id); + }); + + var profile2 = new AppUserReadingProfileBuilder(user.Id).Build(); + Context.AppUserReadingProfiles.Add(profile2); + await UnitOfWork.CommitAsync(); + + await rps.DeleteReadingProfile(user.Id, profile2.Id); + await UnitOfWork.CommitAsync(); + + var allProfiles = await Context.AppUserReadingProfiles.ToListAsync(); + Assert.Single(allProfiles); + } + + [Fact] + public async Task CreateImplicitSeriesReadingProfile() + { + await ResetDb(); + var (rps, user, _, series) = await Setup(); + + var dto = new UserReadingProfileDto + { + ReaderMode = ReaderMode.Webtoon, + ScalingOption = ScalingOption.FitToHeight, + WidthOverride = 53, + }; + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, dto); + + var profile = await rps.GetReadingProfileForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Contains(profile.SeriesIds, s => s == series.Id); + Assert.Equal(ReadingProfileKind.Implicit, profile.Kind); + } + + [Fact] + public async Task UpdateImplicitReadingProfile_DoesNotCreateNew() + { + await ResetDb(); + var (rps, user, _, series) = await Setup(); + + var dto = new UserReadingProfileDto + { + ReaderMode = ReaderMode.Webtoon, + ScalingOption = ScalingOption.FitToHeight, + WidthOverride = 53, + }; + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, dto); + + var profile = await rps.GetReadingProfileForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Contains(profile.SeriesIds, s => s == series.Id); + Assert.Equal(ReadingProfileKind.Implicit, profile.Kind); + + dto = new UserReadingProfileDto + { + ReaderMode = ReaderMode.LeftRight, + }; + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, dto); + profile = await rps.GetReadingProfileForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Contains(profile.SeriesIds, s => s == series.Id); + Assert.Equal(ReadingProfileKind.Implicit, profile.Kind); + Assert.Equal(ReaderMode.LeftRight, profile.ReaderMode); + + var implicitCount = await Context.AppUserReadingProfiles + .Where(p => p.Kind == ReadingProfileKind.Implicit) + .CountAsync(); + Assert.Equal(1, implicitCount); + } + + [Fact] + public async Task GetCorrectProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Series Specific") + .Build(); + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithLibrary(lib) + .WithName("Library Specific") + .Build(); + var profile3 = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Default) + .WithName("Global") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + Context.AppUserReadingProfiles.Add(profile2); + Context.AppUserReadingProfiles.Add(profile3); + + var series2 = new SeriesBuilder("Rainbows After Storms").Build(); + lib.Series.Add(series2); + + var lib2 = new LibraryBuilder("Manga2").Build(); + var series3 = new SeriesBuilder("A Tropical Fish Yearns for Snow").Build(); + lib2.Series.Add(series3); + + user.Libraries.Add(lib2); + await UnitOfWork.CommitAsync(); + + var p = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(p); + Assert.Equal("Series Specific", p.Name); + + p = await rps.GetReadingProfileDtoForSeries(user.Id, series2.Id); + Assert.NotNull(p); + Assert.Equal("Library Specific", p.Name); + + p = await rps.GetReadingProfileDtoForSeries(user.Id, series3.Id); + Assert.NotNull(p); + Assert.Equal("Global", p.Name); + } + + [Fact] + public async Task ReplaceReadingProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var profile1 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile 1") + .Build(); + + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithName("Profile 2") + .Build(); + + Context.AppUserReadingProfiles.Add(profile1); + Context.AppUserReadingProfiles.Add(profile2); + await UnitOfWork.CommitAsync(); + + var profile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Equal("Profile 1", profile.Name); + + await rps.AddProfileToSeries(user.Id, profile2.Id, series.Id); + profile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Equal("Profile 2", profile.Name); + } + + [Fact] + public async Task DeleteReadingProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var profile1 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile 1") + .Build(); + + Context.AppUserReadingProfiles.Add(profile1); + await UnitOfWork.CommitAsync(); + + await rps.ClearSeriesProfile(user.Id, series.Id); + var profiles = await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id); + Assert.DoesNotContain(profiles, rp => rp.SeriesIds.Contains(series.Id)); + + } + + [Fact] + public async Task BulkAddReadingProfiles() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + for (var i = 0; i < 10; i++) + { + var generatedSeries = new SeriesBuilder($"Generated Series #{i}").Build(); + lib.Series.Add(generatedSeries); + } + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile2") + .Build(); + Context.AppUserReadingProfiles.Add(profile2); + + await UnitOfWork.CommitAsync(); + + var someSeriesIds = lib.Series.Take(lib.Series.Count / 2).Select(s => s.Id).ToList(); + await rps.BulkAddProfileToSeries(user.Id, profile.Id, someSeriesIds); + + foreach (var id in someSeriesIds) + { + var foundProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(foundProfile); + Assert.Equal(profile.Id, foundProfile.Id); + } + + var allIds = lib.Series.Select(s => s.Id).ToList(); + await rps.BulkAddProfileToSeries(user.Id, profile2.Id, allIds); + + foreach (var id in allIds) + { + var foundProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(foundProfile); + Assert.Equal(profile2.Id, foundProfile.Id); + } + + + } + + [Fact] + public async Task BulkAssignDeletesImplicit() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var implicitProfile = Mapper.Map(new AppUserReadingProfileBuilder(user.Id) + .Build()); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Profile 1") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + + for (var i = 0; i < 10; i++) + { + var generatedSeries = new SeriesBuilder($"Generated Series #{i}").Build(); + lib.Series.Add(generatedSeries); + } + await UnitOfWork.CommitAsync(); + + var ids = lib.Series.Select(s => s.Id).ToList(); + + foreach (var id in ids) + { + await rps.UpdateImplicitReadingProfile(user.Id, id, implicitProfile); + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.Implicit, seriesProfile.Kind); + } + + await rps.BulkAddProfileToSeries(user.Id, profile.Id, ids); + + foreach (var id in ids) + { + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.User, seriesProfile.Kind); + } + + var implicitCount = await Context.AppUserReadingProfiles + .Where(p => p.Kind == ReadingProfileKind.Implicit) + .CountAsync(); + Assert.Equal(0, implicitCount); + } + + [Fact] + public async Task AddDeletesImplicit() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var implicitProfile = Mapper.Map(new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Implicit) + .Build()); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Profile 1") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + await UnitOfWork.CommitAsync(); + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, implicitProfile); + + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.Implicit, seriesProfile.Kind); + + await rps.AddProfileToSeries(user.Id, profile.Id, series.Id); + + seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.User, seriesProfile.Kind); + + var implicitCount = await Context.AppUserReadingProfiles + .Where(p => p.Kind == ReadingProfileKind.Implicit) + .CountAsync(); + Assert.Equal(0, implicitCount); + } + + [Fact] + public async Task CreateReadingProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var dto = new UserReadingProfileDto + { + Name = "Profile 1", + ReaderMode = ReaderMode.LeftRight, + EmulateBook = false, + }; + + await rps.CreateReadingProfile(user.Id, dto); + + var dto2 = new UserReadingProfileDto + { + Name = "Profile 2", + ReaderMode = ReaderMode.LeftRight, + EmulateBook = false, + }; + + await rps.CreateReadingProfile(user.Id, dto2); + + var dto3 = new UserReadingProfileDto + { + Name = "Profile 1", // Not unique name + ReaderMode = ReaderMode.LeftRight, + EmulateBook = false, + }; + + await Assert.ThrowsAsync(async () => + { + await rps.CreateReadingProfile(user.Id, dto3); + }); + + var allProfiles = Context.AppUserReadingProfiles.ToList(); + Assert.Equal(2, allProfiles.Count); + } + + [Fact] + public async Task ClearSeriesProfile_RemovesImplicitAndUnlinksExplicit() + { + await ResetDb(); + var (rps, user, _, series) = await Setup(); + + var implicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithKind(ReadingProfileKind.Implicit) + .WithName("Implicit Profile") + .Build(); + + var explicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Explicit Profile") + .Build(); + + Context.AppUserReadingProfiles.Add(implicitProfile); + Context.AppUserReadingProfiles.Add(explicitProfile); + await UnitOfWork.CommitAsync(); + + var allBefore = await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id); + Assert.Equal(2, allBefore.Count(rp => rp.SeriesIds.Contains(series.Id))); + + await rps.ClearSeriesProfile(user.Id, series.Id); + + var remainingProfiles = await Context.AppUserReadingProfiles.ToListAsync(); + Assert.Single(remainingProfiles); + Assert.Equal("Explicit Profile", remainingProfiles[0].Name); + Assert.Empty(remainingProfiles[0].SeriesIds); + + var profilesForSeries = await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id); + Assert.DoesNotContain(profilesForSeries, rp => rp.SeriesIds.Contains(series.Id)); + } + + [Fact] + public async Task AddProfileToLibrary_AddsAndOverridesExisting() + { + await ResetDb(); + var (rps, user, lib, _) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Library Profile") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + await UnitOfWork.CommitAsync(); + + await rps.AddProfileToLibrary(user.Id, profile.Id, lib.Id); + await UnitOfWork.CommitAsync(); + + var linkedProfile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.NotNull(linkedProfile); + Assert.Equal(profile.Id, linkedProfile.Id); + + var newProfile = new AppUserReadingProfileBuilder(user.Id) + .WithName("New Profile") + .Build(); + Context.AppUserReadingProfiles.Add(newProfile); + await UnitOfWork.CommitAsync(); + + await rps.AddProfileToLibrary(user.Id, newProfile.Id, lib.Id); + await UnitOfWork.CommitAsync(); + + linkedProfile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.NotNull(linkedProfile); + Assert.Equal(newProfile.Id, linkedProfile.Id); + } + + [Fact] + public async Task ClearLibraryProfile_RemovesImplicitOrUnlinksExplicit() + { + await ResetDb(); + var (rps, user, lib, _) = await Setup(); + + var implicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Implicit) + .WithLibrary(lib) + .Build(); + Context.AppUserReadingProfiles.Add(implicitProfile); + await UnitOfWork.CommitAsync(); + + await rps.ClearLibraryProfile(user.Id, lib.Id); + var profile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.Null(profile); + + var explicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithLibrary(lib) + .Build(); + Context.AppUserReadingProfiles.Add(explicitProfile); + await UnitOfWork.CommitAsync(); + + await rps.ClearLibraryProfile(user.Id, lib.Id); + profile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.Null(profile); + + var stillExists = await Context.AppUserReadingProfiles.FindAsync(explicitProfile.Id); + Assert.NotNull(stillExists); + } + + /// + /// As response to #3793, I'm not sure if we want to keep this. It's not the most nice. But I think the idea of this test + /// is worth having. + /// + [Fact] + public void UpdateFields_UpdatesAll() + { + // Repeat to ensure booleans are flipped and actually tested + for (int i = 0; i < 10; i++) + { + var profile = new AppUserReadingProfile(); + var dto = new UserReadingProfileDto(); + + RandfHelper.SetRandomValues(profile); + RandfHelper.SetRandomValues(dto); + + ReadingProfileService.UpdateReaderProfileFields(profile, dto); + + var newDto = Mapper.Map(profile); + + Assert.True(RandfHelper.AreSimpleFieldsEqual(dto, newDto, + ["k__BackingField", "k__BackingField"])); + } + } + + + + protected override async Task ResetDb() + { + Context.AppUserReadingProfiles.RemoveRange(Context.AppUserReadingProfiles); + await UnitOfWork.CommitAsync(); + } +} diff --git a/API/API.csproj b/API/API.csproj index f9a889d74..4eed66f22 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -97,9 +97,9 @@ + - diff --git a/API/Controllers/AccountController.cs b/API/Controllers/AccountController.cs index c504e1ce7..d8b9164af 100644 --- a/API/Controllers/AccountController.cs +++ b/API/Controllers/AccountController.cs @@ -153,6 +153,9 @@ public class AccountController : BaseApiController // Assign default streams AddDefaultStreamsToUser(user); + // Assign default reading profile + await AddDefaultReadingProfileToUser(user); + var token = await _userManager.GenerateEmailConfirmationTokenAsync(user); if (string.IsNullOrEmpty(token)) return BadRequest(await _localizationService.Get("en", "confirm-token-gen")); if (!await ConfirmEmailToken(token, user)) return BadRequest(await _localizationService.Get("en", "validate-email", token)); @@ -609,7 +612,7 @@ public class AccountController : BaseApiController } /// - /// Requests the Invite Url for the UserId. Will return error if user is already validated. + /// Requests the Invite Url for the AppUserId. Will return error if user is already validated. /// /// /// Include the "https://ip:port/" in the generated link @@ -669,6 +672,9 @@ public class AccountController : BaseApiController // Assign default streams AddDefaultStreamsToUser(user); + // Assign default reading profile + await AddDefaultReadingProfileToUser(user); + // Assign Roles var roles = dto.Roles; var hasAdminRole = dto.Roles.Contains(PolicyConstants.AdminRole); @@ -779,6 +785,16 @@ public class AccountController : BaseApiController } } + private async Task AddDefaultReadingProfileToUser(AppUser user) + { + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Default Profile") + .WithKind(ReadingProfileKind.Default) + .Build(); + _unitOfWork.AppUserReadingProfileRepository.Add(profile); + await _unitOfWork.CommitAsync(); + } + /// /// Last step in authentication flow, confirms the email token for email /// diff --git a/API/Controllers/MetadataController.cs b/API/Controllers/MetadataController.cs index 10a5f393a..cab33692a 100644 --- a/API/Controllers/MetadataController.cs +++ b/API/Controllers/MetadataController.cs @@ -6,8 +6,10 @@ using System.Threading.Tasks; using API.Constants; using API.Data; using API.Data.Repositories; +using API.DTOs; using API.DTOs.Filtering; using API.DTOs.Metadata; +using API.DTOs.Metadata.Browse; using API.DTOs.Person; using API.DTOs.Recommendation; using API.DTOs.SeriesDetail; @@ -46,6 +48,22 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc return Ok(await unitOfWork.GenreRepository.GetAllGenreDtosForLibrariesAsync(User.GetUserId(), ids, context)); } + /// + /// Returns a list of Genres with counts for counts when Genre is on Series/Chapter + /// + /// + [HttpPost("genres-with-counts")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.FiveMinute)] + public async Task>> GetBrowseGenres(UserParams? userParams = null) + { + userParams ??= UserParams.Default; + + var list = await unitOfWork.GenreRepository.GetBrowseableGenre(User.GetUserId(), userParams); + Response.AddPaginationHeader(list.CurrentPage, list.PageSize, list.TotalCount, list.TotalPages); + + return Ok(list); + } + /// /// Fetches people from the instance by role /// @@ -95,6 +113,22 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc return Ok(await unitOfWork.TagRepository.GetAllTagDtosForLibrariesAsync(User.GetUserId())); } + /// + /// Returns a list of Tags with counts for counts when Tag is on Series/Chapter + /// + /// + [HttpPost("tags-with-counts")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.FiveMinute)] + public async Task>> GetBrowseTags(UserParams? userParams = null) + { + userParams ??= UserParams.Default; + + var list = await unitOfWork.TagRepository.GetBrowseableTag(User.GetUserId(), userParams); + Response.AddPaginationHeader(list.CurrentPage, list.PageSize, list.TotalCount, list.TotalPages); + + return Ok(list); + } + /// /// Fetches all age ratings from the instance /// diff --git a/API/Controllers/PersonController.cs b/API/Controllers/PersonController.cs index a2ab3bf88..bf3cc1814 100644 --- a/API/Controllers/PersonController.cs +++ b/API/Controllers/PersonController.cs @@ -4,6 +4,9 @@ using System.Threading.Tasks; using API.Data; using API.Data.Repositories; using API.DTOs; +using API.DTOs.Filtering.v2; +using API.DTOs.Metadata.Browse; +using API.DTOs.Metadata.Browse.Requests; using API.DTOs.Person; using API.Entities.Enums; using API.Extensions; @@ -77,11 +80,13 @@ public class PersonController : BaseApiController /// /// [HttpPost("all")] - public async Task>> GetAuthorsForBrowse([FromQuery] UserParams? userParams) + public async Task>> GetPeopleForBrowse(BrowsePersonFilterDto filter, [FromQuery] UserParams? userParams) { userParams ??= UserParams.Default; - var list = await _unitOfWork.PersonRepository.GetAllWritersAndSeriesCount(User.GetUserId(), userParams); + + var list = await _unitOfWork.PersonRepository.GetBrowsePersonDtos(User.GetUserId(), filter, userParams); Response.AddPaginationHeader(list.CurrentPage, list.PageSize, list.TotalCount, list.TotalPages); + return Ok(list); } @@ -112,6 +117,7 @@ public class PersonController : BaseApiController person.Name = dto.Name?.Trim(); + person.NormalizedName = person.Name.ToNormalized(); person.Description = dto.Description ?? string.Empty; person.CoverImageLocked = dto.CoverImageLocked; diff --git a/API/Controllers/PluginController.cs b/API/Controllers/PluginController.cs index c7f48cf54..f39462bbf 100644 --- a/API/Controllers/PluginController.cs +++ b/API/Controllers/PluginController.cs @@ -45,7 +45,7 @@ public class PluginController(IUnitOfWork unitOfWork, ITokenService tokenService throw new KavitaUnauthenticatedUserException(); } var user = await unitOfWork.UserRepository.GetUserByIdAsync(userId); - logger.LogInformation("Plugin {PluginName} has authenticated with {UserName} ({UserId})'s API Key", pluginName.Replace(Environment.NewLine, string.Empty), user!.UserName, userId); + logger.LogInformation("Plugin {PluginName} has authenticated with {UserName} ({AppUserId})'s API Key", pluginName.Replace(Environment.NewLine, string.Empty), user!.UserName, userId); return new UserDto { diff --git a/API/Controllers/ReadingProfileController.cs b/API/Controllers/ReadingProfileController.cs new file mode 100644 index 000000000..bc1b4fa52 --- /dev/null +++ b/API/Controllers/ReadingProfileController.cs @@ -0,0 +1,198 @@ +#nullable enable +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs; +using API.Extensions; +using API.Services; +using AutoMapper; +using Kavita.Common; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; + +namespace API.Controllers; + +[Route("api/reading-profile")] +public class ReadingProfileController(ILogger logger, IUnitOfWork unitOfWork, + IReadingProfileService readingProfileService): BaseApiController +{ + + /// + /// Gets all non-implicit reading profiles for a user + /// + /// + [HttpGet("all")] + public async Task>> GetAllReadingProfiles() + { + return Ok(await unitOfWork.AppUserReadingProfileRepository.GetProfilesDtoForUser(User.GetUserId(), true)); + } + + /// + /// Returns the ReadingProfile that should be applied to the given series, walks up the tree. + /// Series -> Library -> Default + /// + /// + /// + /// + [HttpGet("{seriesId:int}")] + public async Task> GetProfileForSeries(int seriesId, [FromQuery] bool skipImplicit) + { + return Ok(await readingProfileService.GetReadingProfileDtoForSeries(User.GetUserId(), seriesId, skipImplicit)); + } + + /// + /// Returns the (potential) Reading Profile bound to the library + /// + /// + /// + [HttpGet("library")] + public async Task> GetProfileForLibrary(int libraryId) + { + return Ok(await readingProfileService.GetReadingProfileDtoForLibrary(User.GetUserId(), libraryId)); + } + + /// + /// Creates a new reading profile for the current user + /// + /// + /// + [HttpPost("create")] + public async Task> CreateReadingProfile([FromBody] UserReadingProfileDto dto) + { + return Ok(await readingProfileService.CreateReadingProfile(User.GetUserId(), dto)); + } + + /// + /// Promotes the implicit profile to a user profile. Removes the series from other profiles + /// + /// + /// + [HttpPost("promote")] + public async Task> PromoteImplicitReadingProfile([FromQuery] int profileId) + { + return Ok(await readingProfileService.PromoteImplicitProfile(User.GetUserId(), profileId)); + } + + /// + /// Update the implicit reading profile for a series, creates one if none exists + /// + /// Any modification to the reader settings during reading will create an implicit profile. Use "update-parent" to save to the bound series profile. + /// + /// + /// + [HttpPost("series")] + public async Task> UpdateReadingProfileForSeries([FromBody] UserReadingProfileDto dto, [FromQuery] int seriesId) + { + var updatedProfile = await readingProfileService.UpdateImplicitReadingProfile(User.GetUserId(), seriesId, dto); + return Ok(updatedProfile); + } + + /// + /// Updates the non-implicit reading profile for the given series, and removes implicit profiles + /// + /// + /// + /// + [HttpPost("update-parent")] + public async Task> UpdateParentProfileForSeries([FromBody] UserReadingProfileDto dto, [FromQuery] int seriesId) + { + var newParentProfile = await readingProfileService.UpdateParent(User.GetUserId(), seriesId, dto); + return Ok(newParentProfile); + } + + /// + /// Updates the given reading profile, must belong to the current user + /// + /// + /// The updated reading profile + /// + /// This does not update connected series and libraries. + /// + [HttpPost] + public async Task> UpdateReadingProfile(UserReadingProfileDto dto) + { + return Ok(await readingProfileService.UpdateReadingProfile(User.GetUserId(), dto)); + } + + /// + /// Deletes the given profile, requires the profile to belong to the logged-in user + /// + /// + /// + /// + /// + [HttpDelete] + public async Task DeleteReadingProfile([FromQuery] int profileId) + { + await readingProfileService.DeleteReadingProfile(User.GetUserId(), profileId); + return Ok(); + } + + /// + /// Sets the reading profile for a given series, removes the old one + /// + /// + /// + /// + [HttpPost("series/{seriesId:int}")] + public async Task AddProfileToSeries(int seriesId, [FromQuery] int profileId) + { + await readingProfileService.AddProfileToSeries(User.GetUserId(), profileId, seriesId); + return Ok(); + } + + /// + /// Clears the reading profile for the given series for the currently logged-in user + /// + /// + /// + [HttpDelete("series/{seriesId:int}")] + public async Task ClearSeriesProfile(int seriesId) + { + await readingProfileService.ClearSeriesProfile(User.GetUserId(), seriesId); + return Ok(); + } + + /// + /// Sets the reading profile for a given library, removes the old one + /// + /// + /// + /// + [HttpPost("library/{libraryId:int}")] + public async Task AddProfileToLibrary(int libraryId, [FromQuery] int profileId) + { + await readingProfileService.AddProfileToLibrary(User.GetUserId(), profileId, libraryId); + return Ok(); + } + + /// + /// Clears the reading profile for the given library for the currently logged-in user + /// + /// + /// + /// + [HttpDelete("library/{libraryId:int}")] + public async Task ClearLibraryProfile(int libraryId) + { + await readingProfileService.ClearLibraryProfile(User.GetUserId(), libraryId); + return Ok(); + } + + /// + /// Assigns the reading profile to all passes series, and deletes their implicit profiles + /// + /// + /// + /// + [HttpPost("bulk")] + public async Task BulkAddReadingProfile([FromQuery] int profileId, [FromBody] IList seriesIds) + { + await readingProfileService.BulkAddProfileToSeries(User.GetUserId(), profileId, seriesIds); + return Ok(); + } + +} diff --git a/API/Controllers/SeriesController.cs b/API/Controllers/SeriesController.cs index 7cd897c32..84eacc838 100644 --- a/API/Controllers/SeriesController.cs +++ b/API/Controllers/SeriesController.cs @@ -310,7 +310,7 @@ public class SeriesController : BaseApiController /// /// /// - /// + /// This is not in use /// [HttpPost("all-v2")] public async Task>> GetAllSeriesV2(FilterV2Dto filterDto, [FromQuery] UserParams userParams, @@ -321,8 +321,6 @@ public class SeriesController : BaseApiController await _unitOfWork.SeriesRepository.GetSeriesDtoForLibraryIdV2Async(userId, userParams, filterDto, context); // Apply progress/rating information (I can't work out how to do this in initial query) - if (series == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "no-series")); - await _unitOfWork.SeriesRepository.AddSeriesModifiers(userId, series); Response.AddPaginationHeader(series.CurrentPage, series.PageSize, series.TotalCount, series.TotalPages); diff --git a/API/Controllers/UsersController.cs b/API/Controllers/UsersController.cs index 944ea987b..17ebc758e 100644 --- a/API/Controllers/UsersController.cs +++ b/API/Controllers/UsersController.cs @@ -103,38 +103,13 @@ public class UsersController : BaseApiController var existingPreferences = user!.UserPreferences; - existingPreferences.ReadingDirection = preferencesDto.ReadingDirection; - existingPreferences.ScalingOption = preferencesDto.ScalingOption; - existingPreferences.PageSplitOption = preferencesDto.PageSplitOption; - existingPreferences.AutoCloseMenu = preferencesDto.AutoCloseMenu; - existingPreferences.ShowScreenHints = preferencesDto.ShowScreenHints; - existingPreferences.EmulateBook = preferencesDto.EmulateBook; - existingPreferences.ReaderMode = preferencesDto.ReaderMode; - existingPreferences.LayoutMode = preferencesDto.LayoutMode; - existingPreferences.BackgroundColor = string.IsNullOrEmpty(preferencesDto.BackgroundColor) ? "#000000" : preferencesDto.BackgroundColor; - existingPreferences.BookReaderMargin = preferencesDto.BookReaderMargin; - existingPreferences.BookReaderLineSpacing = preferencesDto.BookReaderLineSpacing; - existingPreferences.BookReaderFontFamily = preferencesDto.BookReaderFontFamily; - existingPreferences.BookReaderFontSize = preferencesDto.BookReaderFontSize; - existingPreferences.BookReaderTapToPaginate = preferencesDto.BookReaderTapToPaginate; - existingPreferences.BookReaderReadingDirection = preferencesDto.BookReaderReadingDirection; - existingPreferences.BookReaderWritingStyle = preferencesDto.BookReaderWritingStyle; - existingPreferences.BookThemeName = preferencesDto.BookReaderThemeName; - existingPreferences.BookReaderLayoutMode = preferencesDto.BookReaderLayoutMode; - existingPreferences.BookReaderImmersiveMode = preferencesDto.BookReaderImmersiveMode; existingPreferences.GlobalPageLayoutMode = preferencesDto.GlobalPageLayoutMode; existingPreferences.BlurUnreadSummaries = preferencesDto.BlurUnreadSummaries; - existingPreferences.LayoutMode = preferencesDto.LayoutMode; existingPreferences.PromptForDownloadSize = preferencesDto.PromptForDownloadSize; existingPreferences.NoTransitions = preferencesDto.NoTransitions; - existingPreferences.SwipeToPaginate = preferencesDto.SwipeToPaginate; existingPreferences.CollapseSeriesRelationships = preferencesDto.CollapseSeriesRelationships; existingPreferences.ShareReviews = preferencesDto.ShareReviews; - existingPreferences.PdfTheme = preferencesDto.PdfTheme; - existingPreferences.PdfScrollMode = preferencesDto.PdfScrollMode; - existingPreferences.PdfSpreadMode = preferencesDto.PdfSpreadMode; - if (await _licenseService.HasActiveLicense()) { existingPreferences.AniListScrobblingEnabled = preferencesDto.AniListScrobblingEnabled; diff --git a/API/DTOs/Filtering/PersonSortField.cs b/API/DTOs/Filtering/PersonSortField.cs new file mode 100644 index 000000000..5268a1bf9 --- /dev/null +++ b/API/DTOs/Filtering/PersonSortField.cs @@ -0,0 +1,8 @@ +namespace API.DTOs.Filtering; + +public enum PersonSortField +{ + Name = 1, + SeriesCount = 2, + ChapterCount = 3 +} diff --git a/API/DTOs/Filtering/SortOptions.cs b/API/DTOs/Filtering/SortOptions.cs index a08e2968e..18f2b17ea 100644 --- a/API/DTOs/Filtering/SortOptions.cs +++ b/API/DTOs/Filtering/SortOptions.cs @@ -8,3 +8,12 @@ public sealed record SortOptions public SortField SortField { get; set; } public bool IsAscending { get; set; } = true; } + +/// +/// All Sorting Options for a query related to Person Entity +/// +public sealed record PersonSortOptions +{ + public PersonSortField SortField { get; set; } + public bool IsAscending { get; set; } = true; +} diff --git a/API/DTOs/Filtering/v2/FilterField.cs b/API/DTOs/Filtering/v2/FilterField.cs index 5323f2b48..246a92a90 100644 --- a/API/DTOs/Filtering/v2/FilterField.cs +++ b/API/DTOs/Filtering/v2/FilterField.cs @@ -56,5 +56,12 @@ public enum FilterField /// Last time User Read /// ReadLast = 32, - +} + +public enum PersonFilterField +{ + Role = 1, + Name = 2, + SeriesCount = 3, + ChapterCount = 4, } diff --git a/API/DTOs/Filtering/v2/FilterStatementDto.cs b/API/DTOs/Filtering/v2/FilterStatementDto.cs index ebe6d16af..8c99bd24c 100644 --- a/API/DTOs/Filtering/v2/FilterStatementDto.cs +++ b/API/DTOs/Filtering/v2/FilterStatementDto.cs @@ -1,4 +1,6 @@ -namespace API.DTOs.Filtering.v2; +using API.DTOs.Metadata.Browse.Requests; + +namespace API.DTOs.Filtering.v2; public sealed record FilterStatementDto { @@ -6,3 +8,10 @@ public sealed record FilterStatementDto public FilterField Field { get; set; } public string Value { get; set; } } + +public sealed record PersonFilterStatementDto +{ + public FilterComparison Comparison { get; set; } + public PersonFilterField Field { get; set; } + public string Value { get; set; } +} diff --git a/API/DTOs/Filtering/v2/FilterV2Dto.cs b/API/DTOs/Filtering/v2/FilterV2Dto.cs index 11dc42a6b..a247a17a6 100644 --- a/API/DTOs/Filtering/v2/FilterV2Dto.cs +++ b/API/DTOs/Filtering/v2/FilterV2Dto.cs @@ -16,7 +16,7 @@ public sealed record FilterV2Dto /// The name of the filter /// public string? Name { get; set; } - public ICollection Statements { get; set; } = new List(); + public ICollection Statements { get; set; } = []; public FilterCombination Combination { get; set; } = FilterCombination.And; public SortOptions? SortOptions { get; set; } diff --git a/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs b/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs index 8eb38c98a..c394cf8d4 100644 --- a/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs +++ b/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs @@ -15,5 +15,9 @@ public enum MatchStateOption public sealed record ManageMatchFilterDto { public MatchStateOption MatchStateOption { get; set; } = MatchStateOption.All; + /// + /// Library Type in int form. -1 indicates to ignore the field. + /// + public int LibraryType { get; set; } = -1; public string SearchTerm { get; set; } = string.Empty; } diff --git a/API/DTOs/Metadata/Browse/BrowseGenreDto.cs b/API/DTOs/Metadata/Browse/BrowseGenreDto.cs new file mode 100644 index 000000000..8044c7914 --- /dev/null +++ b/API/DTOs/Metadata/Browse/BrowseGenreDto.cs @@ -0,0 +1,13 @@ +namespace API.DTOs.Metadata.Browse; + +public sealed record BrowseGenreDto : GenreTagDto +{ + /// + /// Number of Series this Entity is on + /// + public int SeriesCount { get; set; } + /// + /// Number of Chapters this Entity is on + /// + public int ChapterCount { get; set; } +} diff --git a/API/DTOs/Person/BrowsePersonDto.cs b/API/DTOs/Metadata/Browse/BrowsePersonDto.cs similarity index 71% rename from API/DTOs/Person/BrowsePersonDto.cs rename to API/DTOs/Metadata/Browse/BrowsePersonDto.cs index c7d318e79..20f84b783 100644 --- a/API/DTOs/Person/BrowsePersonDto.cs +++ b/API/DTOs/Metadata/Browse/BrowsePersonDto.cs @@ -1,6 +1,6 @@ using API.DTOs.Person; -namespace API.DTOs; +namespace API.DTOs.Metadata.Browse; /// /// Used to browse writers and click in to see their series @@ -12,7 +12,7 @@ public class BrowsePersonDto : PersonDto /// public int SeriesCount { get; set; } /// - /// Number or Issues this Person is the Writer for + /// Number of Issues this Person is the Writer for /// - public int IssueCount { get; set; } + public int ChapterCount { get; set; } } diff --git a/API/DTOs/Metadata/Browse/BrowseTagDto.cs b/API/DTOs/Metadata/Browse/BrowseTagDto.cs new file mode 100644 index 000000000..9a71876e3 --- /dev/null +++ b/API/DTOs/Metadata/Browse/BrowseTagDto.cs @@ -0,0 +1,13 @@ +namespace API.DTOs.Metadata.Browse; + +public sealed record BrowseTagDto : TagDto +{ + /// + /// Number of Series this Entity is on + /// + public int SeriesCount { get; set; } + /// + /// Number of Chapters this Entity is on + /// + public int ChapterCount { get; set; } +} diff --git a/API/DTOs/Metadata/Browse/Requests/BrowsePersonFilterDto.cs b/API/DTOs/Metadata/Browse/Requests/BrowsePersonFilterDto.cs new file mode 100644 index 000000000..d41cf37f3 --- /dev/null +++ b/API/DTOs/Metadata/Browse/Requests/BrowsePersonFilterDto.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using API.DTOs.Filtering; +using API.DTOs.Filtering.v2; +using API.Entities.Enums; + +namespace API.DTOs.Metadata.Browse.Requests; +#nullable enable + +public sealed record BrowsePersonFilterDto +{ + /// + /// Not used - For parity with Series Filter + /// + public int Id { get; set; } + /// + /// Not used - For parity with Series Filter + /// + public string? Name { get; set; } + public ICollection Statements { get; set; } = []; + public FilterCombination Combination { get; set; } = FilterCombination.And; + public PersonSortOptions? SortOptions { get; set; } + + /// + /// Limit the number of rows returned. Defaults to not applying a limit (aka 0) + /// + public int LimitTo { get; set; } = 0; +} diff --git a/API/DTOs/Metadata/GenreTagDto.cs b/API/DTOs/Metadata/GenreTagDto.cs index 4846048d2..13a339d38 100644 --- a/API/DTOs/Metadata/GenreTagDto.cs +++ b/API/DTOs/Metadata/GenreTagDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Metadata; -public sealed record GenreTagDto +public record GenreTagDto { public int Id { get; set; } public required string Title { get; set; } diff --git a/API/DTOs/Metadata/TagDto.cs b/API/DTOs/Metadata/TagDto.cs index f8deb6913..f5c925e1f 100644 --- a/API/DTOs/Metadata/TagDto.cs +++ b/API/DTOs/Metadata/TagDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Metadata; -public sealed record TagDto +public record TagDto { public int Id { get; set; } public required string Title { get; set; } diff --git a/API/DTOs/ReadingLists/ReadingListDto.cs b/API/DTOs/ReadingLists/ReadingListDto.cs index cbc16275d..47a526411 100644 --- a/API/DTOs/ReadingLists/ReadingListDto.cs +++ b/API/DTOs/ReadingLists/ReadingListDto.cs @@ -49,6 +49,11 @@ public sealed record ReadingListDto : IHasCoverImage /// public required AgeRating AgeRating { get; set; } = AgeRating.Unknown; + /// + /// Username of the User that owns (in the case of a promoted list) + /// + public string OwnerUserName { get; set; } + public void ResetColorScape() { PrimaryColor = string.Empty; diff --git a/API/DTOs/UserPreferencesDto.cs b/API/DTOs/UserPreferencesDto.cs index 6645a8f39..46f42306e 100644 --- a/API/DTOs/UserPreferencesDto.cs +++ b/API/DTOs/UserPreferencesDto.cs @@ -9,61 +9,6 @@ namespace API.DTOs; public sealed record UserPreferencesDto { - /// - [Required] - public ReadingDirection ReadingDirection { get; set; } - /// - [Required] - public ScalingOption ScalingOption { get; set; } - /// - [Required] - public PageSplitOption PageSplitOption { get; set; } - /// - [Required] - public ReaderMode ReaderMode { get; set; } - /// - [Required] - public LayoutMode LayoutMode { get; set; } - /// - [Required] - public bool EmulateBook { get; set; } - /// - [Required] - public string BackgroundColor { get; set; } = "#000000"; - /// - [Required] - public bool SwipeToPaginate { get; set; } - /// - [Required] - public bool AutoCloseMenu { get; set; } - /// - [Required] - public bool ShowScreenHints { get; set; } = true; - /// - [Required] - public bool AllowAutomaticWebtoonReaderDetection { get; set; } - - /// - [Required] - public int BookReaderMargin { get; set; } - /// - [Required] - public int BookReaderLineSpacing { get; set; } - /// - [Required] - public int BookReaderFontSize { get; set; } - /// - [Required] - public string BookReaderFontFamily { get; set; } = null!; - /// - [Required] - public bool BookReaderTapToPaginate { get; set; } - /// - [Required] - public ReadingDirection BookReaderReadingDirection { get; set; } - /// - [Required] - public WritingStyle BookReaderWritingStyle { get; set; } /// /// UI Site Global Setting: The UI theme the user should use. @@ -72,15 +17,6 @@ public sealed record UserPreferencesDto [Required] public SiteThemeDto? Theme { get; set; } - [Required] public string BookReaderThemeName { get; set; } = null!; - /// - [Required] - public BookPageLayoutMode BookReaderLayoutMode { get; set; } - /// - [Required] - public bool BookReaderImmersiveMode { get; set; } = false; - /// - [Required] public PageLayoutMode GlobalPageLayoutMode { get; set; } = PageLayoutMode.Cards; /// [Required] @@ -101,16 +37,6 @@ public sealed record UserPreferencesDto [Required] public string Locale { get; set; } - /// - [Required] - public PdfTheme PdfTheme { get; set; } = PdfTheme.Dark; - /// - [Required] - public PdfScrollMode PdfScrollMode { get; set; } = PdfScrollMode.Vertical; - /// - [Required] - public PdfSpreadMode PdfSpreadMode { get; set; } = PdfSpreadMode.None; - /// public bool AniListScrobblingEnabled { get; set; } /// diff --git a/API/DTOs/UserReadingProfileDto.cs b/API/DTOs/UserReadingProfileDto.cs new file mode 100644 index 000000000..24dbf1c34 --- /dev/null +++ b/API/DTOs/UserReadingProfileDto.cs @@ -0,0 +1,132 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Enums.UserPreferences; + +namespace API.DTOs; + +public sealed record UserReadingProfileDto +{ + + public int Id { get; set; } + public int UserId { get; init; } + + public string Name { get; init; } + public ReadingProfileKind Kind { get; init; } + + #region MangaReader + + /// + [Required] + public ReadingDirection ReadingDirection { get; set; } + + /// + [Required] + public ScalingOption ScalingOption { get; set; } + + /// + [Required] + public PageSplitOption PageSplitOption { get; set; } + + /// + [Required] + public ReaderMode ReaderMode { get; set; } + + /// + [Required] + public bool AutoCloseMenu { get; set; } + + /// + [Required] + public bool ShowScreenHints { get; set; } = true; + + /// + [Required] + public bool EmulateBook { get; set; } + + /// + [Required] + public LayoutMode LayoutMode { get; set; } + + /// + [Required] + public string BackgroundColor { get; set; } = "#000000"; + + /// + [Required] + public bool SwipeToPaginate { get; set; } + + /// + [Required] + public bool AllowAutomaticWebtoonReaderDetection { get; set; } + + /// + public int? WidthOverride { get; set; } + + /// + public BreakPoint DisableWidthOverride { get; set; } = BreakPoint.Never; + + #endregion + + #region EpubReader + + /// + [Required] + public int BookReaderMargin { get; set; } + + /// + [Required] + public int BookReaderLineSpacing { get; set; } + + /// + [Required] + public int BookReaderFontSize { get; set; } + + /// + [Required] + public string BookReaderFontFamily { get; set; } = null!; + + /// + [Required] + public bool BookReaderTapToPaginate { get; set; } + + /// + [Required] + public ReadingDirection BookReaderReadingDirection { get; set; } + + /// + [Required] + public WritingStyle BookReaderWritingStyle { get; set; } + + /// + [Required] + public string BookReaderThemeName { get; set; } = null!; + + /// + [Required] + public BookPageLayoutMode BookReaderLayoutMode { get; set; } + + /// + [Required] + public bool BookReaderImmersiveMode { get; set; } = false; + + #endregion + + #region PdfReader + + /// + [Required] + public PdfTheme PdfTheme { get; set; } = PdfTheme.Dark; + + /// + [Required] + public PdfScrollMode PdfScrollMode { get; set; } = PdfScrollMode.Vertical; + + /// + [Required] + public PdfSpreadMode PdfSpreadMode { get; set; } = PdfSpreadMode.None; + + #endregion + +} diff --git a/API/Data/DataContext.cs b/API/Data/DataContext.cs index ce35ba7ec..3bbf45e23 100644 --- a/API/Data/DataContext.cs +++ b/API/Data/DataContext.cs @@ -81,6 +81,7 @@ public sealed class DataContext : IdentityDbContext MetadataSettings { get; set; } = null!; public DbSet MetadataFieldMapping { get; set; } = null!; public DbSet AppUserChapterRating { get; set; } = null!; + public DbSet AppUserReadingProfiles { get; set; } = null!; protected override void OnModelCreating(ModelBuilder builder) { @@ -256,6 +257,32 @@ public sealed class DataContext : IdentityDbContext() .Property(b => b.EnableCoverImage) .HasDefaultValue(true); + + builder.Entity() + .Property(b => b.BookThemeName) + .HasDefaultValue("Dark"); + builder.Entity() + .Property(b => b.BackgroundColor) + .HasDefaultValue("#000000"); + builder.Entity() + .Property(b => b.BookReaderWritingStyle) + .HasDefaultValue(WritingStyle.Horizontal); + builder.Entity() + .Property(b => b.AllowAutomaticWebtoonReaderDetection) + .HasDefaultValue(true); + + builder.Entity() + .Property(rp => rp.LibraryIds) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List()) + .HasColumnType("TEXT"); + builder.Entity() + .Property(rp => rp.SeriesIds) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List()) + .HasColumnType("TEXT"); } #nullable enable diff --git a/API/Data/ManualMigrations/v0.8.7/ManualMigrateReadingProfiles.cs b/API/Data/ManualMigrations/v0.8.7/ManualMigrateReadingProfiles.cs new file mode 100644 index 000000000..b2afde98a --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.7/ManualMigrateReadingProfiles.cs @@ -0,0 +1,84 @@ +using System; +using System.Threading.Tasks; +using API.Entities; +using API.Entities.Enums; +using API.Entities.History; +using API.Extensions; +using API.Helpers.Builders; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +public static class ManualMigrateReadingProfiles +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateReadingProfiles")) + { + return; + } + + logger.LogCritical("Running ManualMigrateReadingProfiles migration - Please be patient, this may take some time. This is not an error"); + + var users = await context.AppUser + .Include(u => u.UserPreferences) + .Include(u => u.ReadingProfiles) + .ToListAsync(); + + foreach (var user in users) + { + var readingProfile = new AppUserReadingProfile + { + Name = "Default", + NormalizedName = "Default".ToNormalized(), + Kind = ReadingProfileKind.Default, + LibraryIds = [], + SeriesIds = [], + BackgroundColor = user.UserPreferences.BackgroundColor, + EmulateBook = user.UserPreferences.EmulateBook, + AppUser = user, + PdfTheme = user.UserPreferences.PdfTheme, + ReaderMode = user.UserPreferences.ReaderMode, + ReadingDirection = user.UserPreferences.ReadingDirection, + ScalingOption = user.UserPreferences.ScalingOption, + LayoutMode = user.UserPreferences.LayoutMode, + WidthOverride = null, + AppUserId = user.Id, + AutoCloseMenu = user.UserPreferences.AutoCloseMenu, + BookReaderMargin = user.UserPreferences.BookReaderMargin, + PageSplitOption = user.UserPreferences.PageSplitOption, + BookThemeName = user.UserPreferences.BookThemeName, + PdfSpreadMode = user.UserPreferences.PdfSpreadMode, + PdfScrollMode = user.UserPreferences.PdfScrollMode, + SwipeToPaginate = user.UserPreferences.SwipeToPaginate, + BookReaderFontFamily = user.UserPreferences.BookReaderFontFamily, + BookReaderFontSize = user.UserPreferences.BookReaderFontSize, + BookReaderImmersiveMode = user.UserPreferences.BookReaderImmersiveMode, + BookReaderLayoutMode = user.UserPreferences.BookReaderLayoutMode, + BookReaderLineSpacing = user.UserPreferences.BookReaderLineSpacing, + BookReaderReadingDirection = user.UserPreferences.BookReaderReadingDirection, + BookReaderWritingStyle = user.UserPreferences.BookReaderWritingStyle, + AllowAutomaticWebtoonReaderDetection = user.UserPreferences.AllowAutomaticWebtoonReaderDetection, + BookReaderTapToPaginate = user.UserPreferences.BookReaderTapToPaginate, + ShowScreenHints = user.UserPreferences.ShowScreenHints, + }; + user.ReadingProfiles.Add(readingProfile); + } + + await context.SaveChangesAsync(); + + context.ManualMigrationHistory.Add(new ManualMigrationHistory + { + Name = "ManualMigrateReadingProfiles", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow, + }); + await context.SaveChangesAsync(); + + + logger.LogCritical("Running ManualMigrateReadingProfiles migration - Completed. This is not an error"); + + } +} diff --git a/API/Data/Migrations/20250601200056_ReadingProfiles.Designer.cs b/API/Data/Migrations/20250601200056_ReadingProfiles.Designer.cs new file mode 100644 index 000000000..762eae142 --- /dev/null +++ b/API/Data/Migrations/20250601200056_ReadingProfiles.Designer.cs @@ -0,0 +1,3698 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250601200056_ReadingProfiles")] + partial class ReadingProfiles + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.PrimitiveCollection("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ReadingProfiles"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250601200056_ReadingProfiles.cs b/API/Data/Migrations/20250601200056_ReadingProfiles.cs new file mode 100644 index 000000000..66b9e53e5 --- /dev/null +++ b/API/Data/Migrations/20250601200056_ReadingProfiles.cs @@ -0,0 +1,75 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class ReadingProfiles : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AppUserReadingProfiles", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(type: "TEXT", nullable: true), + NormalizedName = table.Column(type: "TEXT", nullable: true), + AppUserId = table.Column(type: "INTEGER", nullable: false), + Kind = table.Column(type: "INTEGER", nullable: false), + LibraryIds = table.Column(type: "TEXT", nullable: true), + SeriesIds = table.Column(type: "TEXT", nullable: true), + ReadingDirection = table.Column(type: "INTEGER", nullable: false), + ScalingOption = table.Column(type: "INTEGER", nullable: false), + PageSplitOption = table.Column(type: "INTEGER", nullable: false), + ReaderMode = table.Column(type: "INTEGER", nullable: false), + AutoCloseMenu = table.Column(type: "INTEGER", nullable: false), + ShowScreenHints = table.Column(type: "INTEGER", nullable: false), + EmulateBook = table.Column(type: "INTEGER", nullable: false), + LayoutMode = table.Column(type: "INTEGER", nullable: false), + BackgroundColor = table.Column(type: "TEXT", nullable: true, defaultValue: "#000000"), + SwipeToPaginate = table.Column(type: "INTEGER", nullable: false), + AllowAutomaticWebtoonReaderDetection = table.Column(type: "INTEGER", nullable: false, defaultValue: true), + WidthOverride = table.Column(type: "INTEGER", nullable: true), + BookReaderMargin = table.Column(type: "INTEGER", nullable: false), + BookReaderLineSpacing = table.Column(type: "INTEGER", nullable: false), + BookReaderFontSize = table.Column(type: "INTEGER", nullable: false), + BookReaderFontFamily = table.Column(type: "TEXT", nullable: true), + BookReaderTapToPaginate = table.Column(type: "INTEGER", nullable: false), + BookReaderReadingDirection = table.Column(type: "INTEGER", nullable: false), + BookReaderWritingStyle = table.Column(type: "INTEGER", nullable: false, defaultValue: 0), + BookThemeName = table.Column(type: "TEXT", nullable: true, defaultValue: "Dark"), + BookReaderLayoutMode = table.Column(type: "INTEGER", nullable: false), + BookReaderImmersiveMode = table.Column(type: "INTEGER", nullable: false), + PdfTheme = table.Column(type: "INTEGER", nullable: false), + PdfScrollMode = table.Column(type: "INTEGER", nullable: false), + PdfSpreadMode = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AppUserReadingProfiles", x => x.Id); + table.ForeignKey( + name: "FK_AppUserReadingProfiles_AspNetUsers_AppUserId", + column: x => x.AppUserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_AppUserReadingProfiles_AppUserId", + table: "AppUserReadingProfiles", + column: "AppUserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AppUserReadingProfiles"); + } + } +} diff --git a/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.Designer.cs b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.Designer.cs new file mode 100644 index 000000000..0e9f00b4e --- /dev/null +++ b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.Designer.cs @@ -0,0 +1,3701 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint")] + partial class AppUserReadingProfileDisableWidthOverrideBreakPoint + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("DisableWidthOverride") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ReadingProfiles"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.cs b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.cs new file mode 100644 index 000000000..11a554bdf --- /dev/null +++ b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class AppUserReadingProfileDisableWidthOverrideBreakPoint : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DisableWidthOverride", + table: "AppUserReadingProfiles", + type: "INTEGER", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "DisableWidthOverride", + table: "AppUserReadingProfiles"); + } + } +} diff --git a/API/Data/Migrations/DataContextModelSnapshot.cs b/API/Data/Migrations/DataContextModelSnapshot.cs index ea758a00e..c9fb953df 100644 --- a/API/Data/Migrations/DataContextModelSnapshot.cs +++ b/API/Data/Migrations/DataContextModelSnapshot.cs @@ -609,6 +609,123 @@ namespace API.Data.Migrations b.ToTable("AppUserRating"); }); + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("DisableWidthOverride") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + modelBuilder.Entity("API.Entities.AppUserRole", b => { b.Property("UserId") @@ -2841,6 +2958,17 @@ namespace API.Data.Migrations b.Navigation("Series"); }); + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + modelBuilder.Entity("API.Entities.AppUserRole", b => { b.HasOne("API.Entities.AppRole", "Role") @@ -3479,6 +3607,8 @@ namespace API.Data.Migrations b.Navigation("ReadingLists"); + b.Navigation("ReadingProfiles"); + b.Navigation("ScrobbleHolds"); b.Navigation("SideNavStreams"); diff --git a/API/Data/Repositories/AppUserReadingProfileRepository.cs b/API/Data/Repositories/AppUserReadingProfileRepository.cs new file mode 100644 index 000000000..11b97f21a --- /dev/null +++ b/API/Data/Repositories/AppUserReadingProfileRepository.cs @@ -0,0 +1,112 @@ +#nullable enable +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.DTOs; +using API.Entities; +using API.Entities.Enums; +using API.Extensions; +using API.Extensions.QueryExtensions; +using AutoMapper; +using AutoMapper.QueryableExtensions; +using Microsoft.EntityFrameworkCore; + +namespace API.Data.Repositories; + + +public interface IAppUserReadingProfileRepository +{ + + /// + /// Return the given profile if it belongs the user + /// + /// + /// + /// + Task GetUserProfile(int userId, int profileId); + /// + /// Returns all reading profiles for the user + /// + /// + /// + Task> GetProfilesForUser(int userId, bool skipImplicit = false); + /// + /// Returns all reading profiles for the user + /// + /// + /// + Task> GetProfilesDtoForUser(int userId, bool skipImplicit = false); + /// + /// Is there a user reading profile with this name (normalized) + /// + /// + /// + /// + Task IsProfileNameInUse(int userId, string name); + + void Add(AppUserReadingProfile readingProfile); + void Update(AppUserReadingProfile readingProfile); + void Remove(AppUserReadingProfile readingProfile); + void RemoveRange(IEnumerable readingProfiles); +} + +public class AppUserReadingProfileRepository(DataContext context, IMapper mapper): IAppUserReadingProfileRepository +{ + public async Task GetUserProfile(int userId, int profileId) + { + return await context.AppUserReadingProfiles + .Where(rp => rp.AppUserId == userId && rp.Id == profileId) + .FirstOrDefaultAsync(); + } + + public async Task> GetProfilesForUser(int userId, bool skipImplicit = false) + { + return await context.AppUserReadingProfiles + .Where(rp => rp.AppUserId == userId) + .WhereIf(skipImplicit, rp => rp.Kind != ReadingProfileKind.Implicit) + .ToListAsync(); + } + + /// + /// Returns all Reading Profiles for the User + /// + /// + /// + public async Task> GetProfilesDtoForUser(int userId, bool skipImplicit = false) + { + return await context.AppUserReadingProfiles + .Where(rp => rp.AppUserId == userId) + .WhereIf(skipImplicit, rp => rp.Kind != ReadingProfileKind.Implicit) + .ProjectTo(mapper.ConfigurationProvider) + .ToListAsync(); + } + + public async Task IsProfileNameInUse(int userId, string name) + { + var normalizedName = name.ToNormalized(); + + return await context.AppUserReadingProfiles + .Where(rp => rp.NormalizedName == normalizedName && rp.AppUserId == userId) + .AnyAsync(); + } + + public void Add(AppUserReadingProfile readingProfile) + { + context.AppUserReadingProfiles.Add(readingProfile); + } + + public void Update(AppUserReadingProfile readingProfile) + { + context.AppUserReadingProfiles.Update(readingProfile).State = EntityState.Modified; + } + + public void Remove(AppUserReadingProfile readingProfile) + { + context.AppUserReadingProfiles.Remove(readingProfile); + } + + public void RemoveRange(IEnumerable readingProfiles) + { + context.AppUserReadingProfiles.RemoveRange(readingProfiles); + } +} diff --git a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs index 45882b5c4..377344a3c 100644 --- a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs +++ b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs @@ -108,14 +108,17 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor public async Task NeedsDataRefresh(int seriesId) { + // TODO: Add unit test var row = await _context.ExternalSeriesMetadata .Where(s => s.SeriesId == seriesId) .FirstOrDefaultAsync(); + return row == null || row.ValidUntilUtc <= DateTime.UtcNow; } public async Task GetSeriesDetailPlusDto(int seriesId) { + // TODO: Add unit test var seriesDetailDto = await _context.ExternalSeriesMetadata .Where(m => m.SeriesId == seriesId) .Include(m => m.ExternalRatings) @@ -144,7 +147,7 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); - IEnumerable reviews = new List(); + IEnumerable reviews = []; if (seriesDetailDto.ExternalReviews != null && seriesDetailDto.ExternalReviews.Any()) { reviews = seriesDetailDto.ExternalReviews @@ -231,6 +234,7 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor .Include(s => s.ExternalSeriesMetadata) .Where(s => !ExternalMetadataService.NonEligibleLibraryTypes.Contains(s.Library.Type)) .Where(s => s.Library.AllowMetadataMatching) + .WhereIf(filter.LibraryType >= 0, s => s.Library.Type == (LibraryType) filter.LibraryType) .FilterMatchState(filter.MatchStateOption) .OrderBy(s => s.NormalizedName) .ProjectTo(_mapper.ConfigurationProvider) diff --git a/API/Data/Repositories/GenreRepository.cs b/API/Data/Repositories/GenreRepository.cs index ef9dfa7ec..3e645cb2e 100644 --- a/API/Data/Repositories/GenreRepository.cs +++ b/API/Data/Repositories/GenreRepository.cs @@ -3,9 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using API.DTOs.Metadata; +using API.DTOs.Metadata.Browse; using API.Entities; using API.Extensions; using API.Extensions.QueryExtensions; +using API.Helpers; using API.Services.Tasks.Scanner.Parser; using AutoMapper; using AutoMapper.QueryableExtensions; @@ -27,6 +29,7 @@ public interface IGenreRepository Task GetRandomGenre(); Task GetGenreById(int id); Task> GetAllGenresNotInListAsync(ICollection genreNames); + Task> GetBrowseableGenre(int userId, UserParams userParams); } public class GenreRepository : IGenreRepository @@ -111,7 +114,7 @@ public class GenreRepository : IGenreRepository /// /// Returns a set of Genre tags for a set of library Ids. - /// UserId will restrict returned Genres based on user's age restriction and library access. + /// AppUserId will restrict returned Genres based on user's age restriction and library access. /// /// /// @@ -165,4 +168,28 @@ public class GenreRepository : IGenreRepository // Return the original non-normalized genres for the missing ones return missingGenres.Select(normalizedName => normalizedToOriginalMap[normalizedName]).ToList(); } + + public async Task> GetBrowseableGenre(int userId, UserParams userParams) + { + var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + + var query = _context.Genre + .RestrictAgainstAgeRestriction(ageRating) + .Select(g => new BrowseGenreDto + { + Id = g.Id, + Title = g.Title, + SeriesCount = g.SeriesMetadatas + .Select(sm => sm.Id) + .Distinct() + .Count(), + ChapterCount = g.Chapters + .Select(ch => ch.Id) + .Distinct() + .Count() + }) + .OrderBy(g => g.Title); + + return await PagedList.CreateAsync(query, userParams.PageNumber, userParams.PageSize); + } } diff --git a/API/Data/Repositories/PersonRepository.cs b/API/Data/Repositories/PersonRepository.cs index dce3f86ef..6954ccf03 100644 --- a/API/Data/Repositories/PersonRepository.cs +++ b/API/Data/Repositories/PersonRepository.cs @@ -2,13 +2,19 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using API.Data.Misc; using API.DTOs; +using API.DTOs.Filtering.v2; +using API.DTOs.Metadata.Browse; +using API.DTOs.Metadata.Browse.Requests; using API.DTOs.Person; using API.Entities.Enums; using API.Entities.Person; using API.Extensions; using API.Extensions.QueryExtensions; +using API.Extensions.QueryExtensions.Filtering; using API.Helpers; +using API.Helpers.Converters; using AutoMapper; using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; @@ -45,7 +51,7 @@ public interface IPersonRepository Task GetCoverImageAsync(int personId); Task GetCoverImageByNameAsync(string name); Task> GetRolesForPersonByName(int personId, int userId); - Task> GetAllWritersAndSeriesCount(int userId, UserParams userParams); + Task> GetBrowsePersonDtos(int userId, BrowsePersonFilterDto filter, UserParams userParams); Task GetPersonById(int personId, PersonIncludes includes = PersonIncludes.None); Task GetPersonDtoByName(string name, int userId, PersonIncludes includes = PersonIncludes.Aliases); /// @@ -194,36 +200,82 @@ public class PersonRepository : IPersonRepository return chapterRoles.Union(seriesRoles).Distinct(); } - public async Task> GetAllWritersAndSeriesCount(int userId, UserParams userParams) + public async Task> GetBrowsePersonDtos(int userId, BrowsePersonFilterDto filter, UserParams userParams) { - List roles = [PersonRole.Writer, PersonRole.CoverArtist]; var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); - var query = _context.Person - .Where(p => p.SeriesMetadataPeople.Any(smp => roles.Contains(smp.Role)) || p.ChapterPeople.Any(cmp => roles.Contains(cmp.Role))) - .RestrictAgainstAgeRestriction(ageRating) - .Select(p => new BrowsePersonDto - { - Id = p.Id, - Name = p.Name, - Description = p.Description, - CoverImage = p.CoverImage, - SeriesCount = p.SeriesMetadataPeople - .Where(smp => roles.Contains(smp.Role)) - .Select(smp => smp.SeriesMetadata.SeriesId) - .Distinct() - .Count(), - IssueCount = p.ChapterPeople - .Where(cp => roles.Contains(cp.Role)) - .Select(cp => cp.Chapter.Id) - .Distinct() - .Count() - }) - .OrderBy(p => p.Name); + var query = CreateFilteredPersonQueryable(userId, filter, ageRating); return await PagedList.CreateAsync(query, userParams.PageNumber, userParams.PageSize); } + private IQueryable CreateFilteredPersonQueryable(int userId, BrowsePersonFilterDto filter, AgeRestriction ageRating) + { + var query = _context.Person.AsNoTracking(); + + // Apply filtering based on statements + query = BuildPersonFilterQuery(userId, filter, query); + + // Apply age restriction + query = query.RestrictAgainstAgeRestriction(ageRating); + + // Apply sorting and limiting + var sortedQuery = query.SortBy(filter.SortOptions); + + var limitedQuery = ApplyPersonLimit(sortedQuery, filter.LimitTo); + + // Project to DTO + var projectedQuery = limitedQuery.Select(p => new BrowsePersonDto + { + Id = p.Id, + Name = p.Name, + Description = p.Description, + CoverImage = p.CoverImage, + SeriesCount = p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count(), + ChapterCount = p.ChapterPeople + .Select(cp => cp.Chapter.Id) + .Distinct() + .Count() + }); + + return projectedQuery; + } + + private static IQueryable BuildPersonFilterQuery(int userId, BrowsePersonFilterDto filterDto, IQueryable query) + { + if (filterDto.Statements == null || filterDto.Statements.Count == 0) return query; + + var queries = filterDto.Statements + .Select(statement => BuildPersonFilterGroup(userId, statement, query)) + .ToList(); + + return filterDto.Combination == FilterCombination.And + ? queries.Aggregate((q1, q2) => q1.Intersect(q2)) + : queries.Aggregate((q1, q2) => q1.Union(q2)); + } + + private static IQueryable BuildPersonFilterGroup(int userId, PersonFilterStatementDto statement, IQueryable query) + { + var value = PersonFilterFieldValueConverter.ConvertValue(statement.Field, statement.Value); + + return statement.Field switch + { + PersonFilterField.Name => query.HasPersonName(true, statement.Comparison, (string)value), + PersonFilterField.Role => query.HasPersonRole(true, statement.Comparison, (IList)value), + PersonFilterField.SeriesCount => query.HasPersonSeriesCount(true, statement.Comparison, (int)value), + PersonFilterField.ChapterCount => query.HasPersonChapterCount(true, statement.Comparison, (int)value), + _ => throw new ArgumentOutOfRangeException(nameof(statement.Field), $"Unexpected value for field: {statement.Field}") + }; + } + + private static IQueryable ApplyPersonLimit(IQueryable query, int limit) + { + return limit <= 0 ? query : query.Take(limit); + } + public async Task GetPersonById(int personId, PersonIncludes includes = PersonIncludes.None) { return await _context.Person.Where(p => p.Id == personId) diff --git a/API/Data/Repositories/SeriesRepository.cs b/API/Data/Repositories/SeriesRepository.cs index e04c944e3..e2eab0976 100644 --- a/API/Data/Repositories/SeriesRepository.cs +++ b/API/Data/Repositories/SeriesRepository.cs @@ -735,6 +735,7 @@ public class SeriesRepository : ISeriesRepository { return await _context.Series .Where(s => s.Id == seriesId) + .Include(s => s.ExternalSeriesMetadata) .Select(series => new PlusSeriesRequestDto() { MediaFormat = series.Library.Type.ConvertToPlusMediaFormat(series.Format), @@ -744,6 +745,7 @@ public class SeriesRepository : ISeriesRepository ScrobblingService.AniListWeblinkWebsite), MalId = ScrobblingService.ExtractId(series.Metadata.WebLinks, ScrobblingService.MalWeblinkWebsite), + CbrId = series.ExternalSeriesMetadata.CbrId, GoogleBooksId = ScrobblingService.ExtractId(series.Metadata.WebLinks, ScrobblingService.GoogleBooksWeblinkWebsite), MangaDexId = ScrobblingService.ExtractId(series.Metadata.WebLinks, @@ -1088,8 +1090,6 @@ public class SeriesRepository : ISeriesRepository return query.Where(s => false); } - - // First setup any FilterField.Libraries in the statements, as these don't have any traditional query statements applied here query = ApplyLibraryFilter(filter, query); @@ -1290,7 +1290,7 @@ public class SeriesRepository : ISeriesRepository FilterField.ReadingDate => query.HasReadingDate(true, statement.Comparison, (DateTime) value, userId), FilterField.ReadLast => query.HasReadLast(true, statement.Comparison, (int) value, userId), FilterField.AverageRating => query.HasAverageRating(true, statement.Comparison, (float) value), - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(nameof(statement.Field), $"Unexpected value for field: {statement.Field}") }; } diff --git a/API/Data/Repositories/TagRepository.cs b/API/Data/Repositories/TagRepository.cs index c4f189957..ea39d2b0d 100644 --- a/API/Data/Repositories/TagRepository.cs +++ b/API/Data/Repositories/TagRepository.cs @@ -2,9 +2,11 @@ using System.Linq; using System.Threading.Tasks; using API.DTOs.Metadata; +using API.DTOs.Metadata.Browse; using API.Entities; using API.Extensions; using API.Extensions.QueryExtensions; +using API.Helpers; using API.Services.Tasks.Scanner.Parser; using AutoMapper; using AutoMapper.QueryableExtensions; @@ -23,6 +25,7 @@ public interface ITagRepository Task RemoveAllTagNoLongerAssociated(); Task> GetAllTagDtosForLibrariesAsync(int userId, IList? libraryIds = null); Task> GetAllTagsNotInListAsync(ICollection tags); + Task> GetBrowseableTag(int userId, UserParams userParams); } public class TagRepository : ITagRepository @@ -104,6 +107,30 @@ public class TagRepository : ITagRepository return missingTags.Select(normalizedName => normalizedToOriginalMap[normalizedName]).ToList(); } + public async Task> GetBrowseableTag(int userId, UserParams userParams) + { + var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + + var query = _context.Tag + .RestrictAgainstAgeRestriction(ageRating) + .Select(g => new BrowseTagDto + { + Id = g.Id, + Title = g.Title, + SeriesCount = g.SeriesMetadatas + .Select(sm => sm.Id) + .Distinct() + .Count(), + ChapterCount = g.Chapters + .Select(ch => ch.Id) + .Distinct() + .Count() + }) + .OrderBy(g => g.Title); + + return await PagedList.CreateAsync(query, userParams.PageNumber, userParams.PageSize); + } + public async Task> GetAllTagsAsync() { return await _context.Tag.ToListAsync(); diff --git a/API/Data/Repositories/UserRepository.cs b/API/Data/Repositories/UserRepository.cs index e55338c8b..6437cfcfe 100644 --- a/API/Data/Repositories/UserRepository.cs +++ b/API/Data/Repositories/UserRepository.cs @@ -757,7 +757,7 @@ public class UserRepository : IUserRepository /// - /// Fetches the UserId by API Key. This does not include any extra information + /// Fetches the AppUserId by API Key. This does not include any extra information /// /// /// diff --git a/API/Data/Seed.cs b/API/Data/Seed.cs index 74bfbb296..c08f80afa 100644 --- a/API/Data/Seed.cs +++ b/API/Data/Seed.cs @@ -120,7 +120,7 @@ public static class Seed new AppUserSideNavStream() { Name = "browse-authors", - StreamType = SideNavStreamType.BrowseAuthors, + StreamType = SideNavStreamType.BrowsePeople, Order = 6, IsProvided = true, Visible = true diff --git a/API/Data/UnitOfWork.cs b/API/Data/UnitOfWork.cs index c4a07dee7..d72dd3bc7 100644 --- a/API/Data/UnitOfWork.cs +++ b/API/Data/UnitOfWork.cs @@ -33,6 +33,7 @@ public interface IUnitOfWork IAppUserExternalSourceRepository AppUserExternalSourceRepository { get; } IExternalSeriesMetadataRepository ExternalSeriesMetadataRepository { get; } IEmailHistoryRepository EmailHistoryRepository { get; } + IAppUserReadingProfileRepository AppUserReadingProfileRepository { get; } bool Commit(); Task CommitAsync(); bool HasChanges(); @@ -74,6 +75,7 @@ public class UnitOfWork : IUnitOfWork AppUserExternalSourceRepository = new AppUserExternalSourceRepository(_context, _mapper); ExternalSeriesMetadataRepository = new ExternalSeriesMetadataRepository(_context, _mapper); EmailHistoryRepository = new EmailHistoryRepository(_context, _mapper); + AppUserReadingProfileRepository = new AppUserReadingProfileRepository(_context, _mapper); } /// @@ -103,6 +105,7 @@ public class UnitOfWork : IUnitOfWork public IAppUserExternalSourceRepository AppUserExternalSourceRepository { get; } public IExternalSeriesMetadataRepository ExternalSeriesMetadataRepository { get; } public IEmailHistoryRepository EmailHistoryRepository { get; } + public IAppUserReadingProfileRepository AppUserReadingProfileRepository { get; } /// /// Commits changes to the DB. Completes the open transaction. diff --git a/API/Entities/AppUser.cs b/API/Entities/AppUser.cs index 50f795041..848636209 100644 --- a/API/Entities/AppUser.cs +++ b/API/Entities/AppUser.cs @@ -21,6 +21,7 @@ public class AppUser : IdentityUser, IHasConcurrencyToken public ICollection Ratings { get; set; } = null!; public ICollection ChapterRatings { get; set; } = null!; public AppUserPreferences UserPreferences { get; set; } = null!; + public ICollection ReadingProfiles { get; set; } = null!; /// /// Bookmarks associated with this User /// diff --git a/API/Entities/AppUserPreferences.cs b/API/Entities/AppUserPreferences.cs index b728e84e5..b0f21bcba 100644 --- a/API/Entities/AppUserPreferences.cs +++ b/API/Entities/AppUserPreferences.cs @@ -1,4 +1,5 @@ -using API.Data; +using System.Collections.Generic; +using API.Data; using API.Entities.Enums; using API.Entities.Enums.UserPreferences; diff --git a/API/Entities/AppUserReadingProfile.cs b/API/Entities/AppUserReadingProfile.cs new file mode 100644 index 000000000..9b238b4f5 --- /dev/null +++ b/API/Entities/AppUserReadingProfile.cs @@ -0,0 +1,160 @@ +using System.Collections.Generic; +using System.ComponentModel; +using API.Entities.Enums; +using API.Entities.Enums.UserPreferences; + +namespace API.Entities; + +public enum BreakPoint +{ + [Description("Never")] + Never = 0, + [Description("Mobile")] + Mobile = 1, + [Description("Tablet")] + Tablet = 2, + [Description("Desktop")] + Desktop = 3, +} + +public class AppUserReadingProfile +{ + public int Id { get; set; } + + public string Name { get; set; } + public string NormalizedName { get; set; } + + public int AppUserId { get; set; } + public AppUser AppUser { get; set; } + + public ReadingProfileKind Kind { get; set; } + public List LibraryIds { get; set; } + public List SeriesIds { get; set; } + + #region MangaReader + + /// + /// Manga Reader Option: What direction should the next/prev page buttons go + /// + public ReadingDirection ReadingDirection { get; set; } = ReadingDirection.LeftToRight; + /// + /// Manga Reader Option: How should the image be scaled to screen + /// + public ScalingOption ScalingOption { get; set; } = ScalingOption.Automatic; + /// + /// Manga Reader Option: Which side of a split image should we show first + /// + public PageSplitOption PageSplitOption { get; set; } = PageSplitOption.FitSplit; + /// + /// Manga Reader Option: How the manga reader should perform paging or reading of the file + /// + /// Webtoon uses scrolling to page, MANGA_LR uses paging by clicking left/right side of reader, MANGA_UD uses paging + /// by clicking top/bottom sides of reader. + /// + /// + public ReaderMode ReaderMode { get; set; } + /// + /// Manga Reader Option: Allow the menu to close after 6 seconds without interaction + /// + public bool AutoCloseMenu { get; set; } = true; + /// + /// Manga Reader Option: Show screen hints to the user on some actions, ie) pagination direction change + /// + public bool ShowScreenHints { get; set; } = true; + /// + /// Manga Reader Option: Emulate a book by applying a shadow effect on the pages + /// + public bool EmulateBook { get; set; } = false; + /// + /// Manga Reader Option: How many pages to display in the reader at once + /// + public LayoutMode LayoutMode { get; set; } = LayoutMode.Single; + /// + /// Manga Reader Option: Background color of the reader + /// + public string BackgroundColor { get; set; } = "#000000"; + /// + /// Manga Reader Option: Should swiping trigger pagination + /// + public bool SwipeToPaginate { get; set; } + /// + /// Manga Reader Option: Allow Automatic Webtoon detection + /// + public bool AllowAutomaticWebtoonReaderDetection { get; set; } + /// + /// Manga Reader Option: Optional fixed width override + /// + public int? WidthOverride { get; set; } = null; + /// + /// Manga Reader Option: Disable the width override if the screen is past the breakpoint + /// + public BreakPoint DisableWidthOverride { get; set; } = BreakPoint.Never; + + #endregion + + #region EpubReader + + /// + /// Book Reader Option: Override extra Margin + /// + public int BookReaderMargin { get; set; } = 15; + /// + /// Book Reader Option: Override line-height + /// + public int BookReaderLineSpacing { get; set; } = 100; + /// + /// Book Reader Option: Override font size + /// + public int BookReaderFontSize { get; set; } = 100; + /// + /// Book Reader Option: Maps to the default Kavita font-family (inherit) or an override + /// + public string BookReaderFontFamily { get; set; } = "default"; + /// + /// Book Reader Option: Allows tapping on side of screens to paginate + /// + public bool BookReaderTapToPaginate { get; set; } = false; + /// + /// Book Reader Option: What direction should the next/prev page buttons go + /// + public ReadingDirection BookReaderReadingDirection { get; set; } = ReadingDirection.LeftToRight; + /// + /// Book Reader Option: Defines the writing styles vertical/horizontal + /// + public WritingStyle BookReaderWritingStyle { get; set; } = WritingStyle.Horizontal; + /// + /// Book Reader Option: The color theme to decorate the book contents + /// + /// Should default to Dark + public string BookThemeName { get; set; } = "Dark"; + /// + /// Book Reader Option: The way a page from a book is rendered. Default is as book dictates, 1 column is fit to height, + /// 2 column is fit to height, 2 columns + /// + /// Defaults to Default + public BookPageLayoutMode BookReaderLayoutMode { get; set; } = BookPageLayoutMode.Default; + /// + /// Book Reader Option: A flag that hides the menu-ing system behind a click on the screen. This should be used with tap to paginate, but the app doesn't enforce this. + /// + /// Defaults to false + public bool BookReaderImmersiveMode { get; set; } = false; + #endregion + + #region PdfReader + + /// + /// PDF Reader: Theme of the Reader + /// + public PdfTheme PdfTheme { get; set; } = PdfTheme.Dark; + /// + /// PDF Reader: Scroll mode of the reader + /// + public PdfScrollMode PdfScrollMode { get; set; } = PdfScrollMode.Vertical; + /// + /// PDF Reader: Spread Mode of the reader + /// + public PdfSpreadMode PdfSpreadMode { get; set; } = PdfSpreadMode.None; + + + #endregion +} diff --git a/API/Entities/Enums/ReadingProfileKind.cs b/API/Entities/Enums/ReadingProfileKind.cs new file mode 100644 index 000000000..0f9cfa20b --- /dev/null +++ b/API/Entities/Enums/ReadingProfileKind.cs @@ -0,0 +1,17 @@ +namespace API.Entities.Enums; + +public enum ReadingProfileKind +{ + /// + /// Generate by Kavita when registering a user, this is your default profile + /// + Default, + /// + /// Created by the user in the UI or via the API + /// + User, + /// + /// Automatically generated by Kavita to track changes made in the readers. Can be converted to a User Reading Profile. + /// + Implicit +} diff --git a/API/Entities/SideNavStreamType.cs b/API/Entities/SideNavStreamType.cs index 545c630d8..62f429889 100644 --- a/API/Entities/SideNavStreamType.cs +++ b/API/Entities/SideNavStreamType.cs @@ -10,5 +10,5 @@ public enum SideNavStreamType ExternalSource = 6, AllSeries = 7, WantToRead = 8, - BrowseAuthors = 9 + BrowsePeople = 9 } diff --git a/API/Extensions/ApplicationServiceExtensions.cs b/API/Extensions/ApplicationServiceExtensions.cs index cbfa9de1a..0d1d7d561 100644 --- a/API/Extensions/ApplicationServiceExtensions.cs +++ b/API/Extensions/ApplicationServiceExtensions.cs @@ -54,6 +54,7 @@ public static class ApplicationServiceExtensions services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/API/Extensions/EnumerableExtensions.cs b/API/Extensions/EnumerableExtensions.cs index 4e84e2fa5..8beec88ca 100644 --- a/API/Extensions/EnumerableExtensions.cs +++ b/API/Extensions/EnumerableExtensions.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text.RegularExpressions; using API.Data.Misc; using API.Entities.Enums; +using API.Entities.Metadata; namespace API.Extensions; #nullable enable @@ -42,4 +43,16 @@ public static class EnumerableExtensions return q; } + + public static IEnumerable RestrictAgainstAgeRestriction(this IEnumerable items, AgeRestriction restriction) + { + if (restriction.AgeRating == AgeRating.NotApplicable) return items; + var q = items.Where(s => s.AgeRating <= restriction.AgeRating); + if (!restriction.IncludeUnknowns) + { + return q.Where(s => s.AgeRating != AgeRating.Unknown); + } + + return q; + } } diff --git a/API/Extensions/QueryExtensions/Filtering/PersonFilter.cs b/API/Extensions/QueryExtensions/Filtering/PersonFilter.cs new file mode 100644 index 000000000..c36164d9d --- /dev/null +++ b/API/Extensions/QueryExtensions/Filtering/PersonFilter.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using API.DTOs.Filtering.v2; +using API.Entities.Enums; +using API.Entities.Person; +using Kavita.Common; +using Microsoft.EntityFrameworkCore; + +namespace API.Extensions.QueryExtensions.Filtering; + +public static class PersonFilter +{ + public static IQueryable HasPersonName(this IQueryable queryable, bool condition, + FilterComparison comparison, string queryString) + { + if (string.IsNullOrEmpty(queryString) || !condition) return queryable; + + return comparison switch + { + FilterComparison.Equal => queryable.Where(p => p.Name.Equals(queryString)), + FilterComparison.BeginsWith => queryable.Where(p => EF.Functions.Like(p.Name, $"{queryString}%")), + FilterComparison.EndsWith => queryable.Where(p => EF.Functions.Like(p.Name, $"%{queryString}")), + FilterComparison.Matches => queryable.Where(p => EF.Functions.Like(p.Name, $"%{queryString}%")), + FilterComparison.NotEqual => queryable.Where(p => p.Name != queryString), + FilterComparison.NotContains or FilterComparison.GreaterThan or FilterComparison.GreaterThanEqual + or FilterComparison.LessThan or FilterComparison.LessThanEqual or FilterComparison.Contains + or FilterComparison.IsBefore or FilterComparison.IsAfter or FilterComparison.IsInLast + or FilterComparison.IsNotInLast or FilterComparison.MustContains + or FilterComparison.IsEmpty => + throw new KavitaException($"{comparison} not applicable for Person.Name"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, + "Filter Comparison is not supported") + }; + } + public static IQueryable HasPersonRole(this IQueryable queryable, bool condition, + FilterComparison comparison, IList roles) + { + if (roles == null || roles.Count == 0 || !condition) return queryable; + + return comparison switch + { + FilterComparison.Contains or FilterComparison.MustContains => queryable.Where(p => + p.SeriesMetadataPeople.Any(smp => roles.Contains(smp.Role)) || + p.ChapterPeople.Any(cmp => roles.Contains(cmp.Role))), + FilterComparison.NotContains => queryable.Where(p => + !p.SeriesMetadataPeople.Any(smp => roles.Contains(smp.Role)) && + !p.ChapterPeople.Any(cmp => roles.Contains(cmp.Role))), + FilterComparison.Equal or FilterComparison.NotEqual or FilterComparison.BeginsWith + or FilterComparison.EndsWith or FilterComparison.Matches or FilterComparison.GreaterThan + or FilterComparison.GreaterThanEqual or FilterComparison.LessThan or FilterComparison.LessThanEqual + or FilterComparison.IsBefore or FilterComparison.IsAfter or FilterComparison.IsInLast + or FilterComparison.IsNotInLast + or FilterComparison.IsEmpty => + throw new KavitaException($"{comparison} not applicable for Person.Role"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, + "Filter Comparison is not supported") + }; + } + + public static IQueryable HasPersonSeriesCount(this IQueryable queryable, bool condition, + FilterComparison comparison, int count) + { + if (!condition) return queryable; + + return comparison switch + { + FilterComparison.Equal => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() == count), + FilterComparison.GreaterThan => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() > count), + FilterComparison.GreaterThanEqual => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() >= count), + FilterComparison.LessThan => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() < count), + FilterComparison.LessThanEqual => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() <= count), + FilterComparison.NotEqual => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() != count), + FilterComparison.BeginsWith or FilterComparison.EndsWith or FilterComparison.Matches + or FilterComparison.Contains or FilterComparison.NotContains or FilterComparison.IsBefore + or FilterComparison.IsAfter or FilterComparison.IsInLast or FilterComparison.IsNotInLast + or FilterComparison.MustContains + or FilterComparison.IsEmpty => throw new KavitaException( + $"{comparison} not applicable for Person.SeriesCount"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, "Filter Comparison is not supported") + }; + } + + public static IQueryable HasPersonChapterCount(this IQueryable queryable, bool condition, + FilterComparison comparison, int count) + { + if (!condition) return queryable; + + return comparison switch + { + FilterComparison.Equal => queryable.Where(p => + p.ChapterPeople.Select(cp => cp.Chapter.Id).Distinct().Count() == count), + FilterComparison.GreaterThan => queryable.Where(p => p.ChapterPeople + .Select(cp => cp.Chapter.Id) + .Distinct() + .Count() > count), + FilterComparison.GreaterThanEqual => queryable.Where(p => p.ChapterPeople + .Select(cp => cp.Chapter.Id) + .Distinct() + .Count() >= count), + FilterComparison.LessThan => queryable.Where(p => + p.ChapterPeople.Select(cp => cp.Chapter.Id).Distinct().Count() < count), + FilterComparison.LessThanEqual => queryable.Where(p => p.ChapterPeople + .Select(cp => cp.Chapter.Id) + .Distinct() + .Count() <= count), + FilterComparison.NotEqual => queryable.Where(p => + p.ChapterPeople.Select(cp => cp.Chapter.Id).Distinct().Count() != count), + FilterComparison.BeginsWith or FilterComparison.EndsWith or FilterComparison.Matches + or FilterComparison.Contains or FilterComparison.NotContains or FilterComparison.IsBefore + or FilterComparison.IsAfter or FilterComparison.IsInLast or FilterComparison.IsNotInLast + or FilterComparison.MustContains + or FilterComparison.IsEmpty => throw new KavitaException( + $"{comparison} not applicable for Person.ChapterCount"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, "Filter Comparison is not supported") + }; + } +} diff --git a/API/Extensions/QueryExtensions/QueryableExtensions.cs b/API/Extensions/QueryExtensions/QueryableExtensions.cs index a2db1dde7..ef2af721f 100644 --- a/API/Extensions/QueryExtensions/QueryableExtensions.cs +++ b/API/Extensions/QueryExtensions/QueryableExtensions.cs @@ -5,10 +5,13 @@ using System.Linq.Expressions; using System.Threading.Tasks; using API.Data.Misc; using API.Data.Repositories; +using API.DTOs; using API.DTOs.Filtering; using API.DTOs.KavitaPlus.Manage; +using API.DTOs.Metadata.Browse; using API.Entities; using API.Entities.Enums; +using API.Entities.Person; using API.Entities.Scrobble; using Microsoft.EntityFrameworkCore; @@ -273,6 +276,27 @@ public static class QueryableExtensions }; } + public static IQueryable SortBy(this IQueryable query, PersonSortOptions? sort) + { + if (sort == null) + { + return query.OrderBy(p => p.Name); + } + + return sort.SortField switch + { + PersonSortField.Name when sort.IsAscending => query.OrderBy(p => p.Name), + PersonSortField.Name => query.OrderByDescending(p => p.Name), + PersonSortField.SeriesCount when sort.IsAscending => query.OrderBy(p => p.SeriesMetadataPeople.Count), + PersonSortField.SeriesCount => query.OrderByDescending(p => p.SeriesMetadataPeople.Count), + PersonSortField.ChapterCount when sort.IsAscending => query.OrderBy(p => p.ChapterPeople.Count), + PersonSortField.ChapterCount => query.OrderByDescending(p => p.ChapterPeople.Count), + _ => query.OrderBy(p => p.Name) + }; + + + } + /// /// Performs either OrderBy or OrderByDescending on the given query based on the value of SortOptions.IsAscending. /// diff --git a/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs b/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs index fc3314f58..aef595596 100644 --- a/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs +++ b/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs @@ -3,6 +3,7 @@ using System.Linq; using API.Data.Misc; using API.Entities; using API.Entities.Enums; +using API.Entities.Metadata; using API.Entities.Person; namespace API.Extensions.QueryExtensions; @@ -26,6 +27,7 @@ public static class RestrictByAgeExtensions return q; } + public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) { if (restriction.AgeRating == AgeRating.NotApplicable) return queryable; @@ -39,20 +41,6 @@ public static class RestrictByAgeExtensions return q; } - [Obsolete] - public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) - { - if (restriction.AgeRating == AgeRating.NotApplicable) return queryable; - - if (restriction.IncludeUnknowns) - { - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating)); - } - - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown)); - } public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) { @@ -74,12 +62,15 @@ public static class RestrictByAgeExtensions if (restriction.IncludeUnknowns) { - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating)); } - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating && sm.AgeRating != AgeRating.Unknown) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating && cp.AgeRating != AgeRating.Unknown) + ); } public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) @@ -88,12 +79,15 @@ public static class RestrictByAgeExtensions if (restriction.IncludeUnknowns) { - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating)); } - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating && sm.AgeRating != AgeRating.Unknown) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating && cp.AgeRating != AgeRating.Unknown) + ); } public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) diff --git a/API/Helpers/AutoMapperProfiles.cs b/API/Helpers/AutoMapperProfiles.cs index 75183fdcd..bb7511c64 100644 --- a/API/Helpers/AutoMapperProfiles.cs +++ b/API/Helpers/AutoMapperProfiles.cs @@ -275,19 +275,19 @@ public class AutoMapperProfiles : Profile CreateMap() .ForMember(dest => dest.Theme, opt => - opt.MapFrom(src => src.Theme)) + opt.MapFrom(src => src.Theme)); + + CreateMap() .ForMember(dest => dest.BookReaderThemeName, opt => - opt.MapFrom(src => src.BookThemeName)) - .ForMember(dest => dest.BookReaderLayoutMode, - opt => - opt.MapFrom(src => src.BookReaderLayoutMode)); + opt.MapFrom(src => src.BookThemeName)); CreateMap(); CreateMap() - .ForMember(dest => dest.ItemCount, opt => opt.MapFrom(src => src.Items.Count)); + .ForMember(dest => dest.ItemCount, opt => opt.MapFrom(src => src.Items.Count)) + .ForMember(dest => dest.OwnerUserName, opt => opt.MapFrom(src => src.AppUser.UserName)); CreateMap(); CreateMap(); CreateMap(); diff --git a/API/Helpers/Builders/AppUserBuilder.cs b/API/Helpers/Builders/AppUserBuilder.cs index 282361e41..7ffac355e 100644 --- a/API/Helpers/Builders/AppUserBuilder.cs +++ b/API/Helpers/Builders/AppUserBuilder.cs @@ -21,7 +21,7 @@ public class AppUserBuilder : IEntityBuilder ApiKey = HashUtil.ApiKey(), UserPreferences = new AppUserPreferences { - Theme = theme ?? Seed.DefaultThemes.First() + Theme = theme ?? Seed.DefaultThemes.First(), }, ReadingLists = new List(), Bookmarks = new List(), @@ -31,7 +31,8 @@ public class AppUserBuilder : IEntityBuilder Devices = new List(), Id = 0, DashboardStreams = new List(), - SideNavStreams = new List() + SideNavStreams = new List(), + ReadingProfiles = [], }; } diff --git a/API/Helpers/Builders/AppUserReadingProfileBuilder.cs b/API/Helpers/Builders/AppUserReadingProfileBuilder.cs new file mode 100644 index 000000000..26da5fd86 --- /dev/null +++ b/API/Helpers/Builders/AppUserReadingProfileBuilder.cs @@ -0,0 +1,54 @@ +using API.Entities; +using API.Entities.Enums; +using API.Extensions; + +namespace API.Helpers.Builders; + +public class AppUserReadingProfileBuilder +{ + private readonly AppUserReadingProfile _profile; + + public AppUserReadingProfile Build() => _profile; + + /// + /// The profile's kind will be unless overwritten with + /// + /// + public AppUserReadingProfileBuilder(int userId) + { + _profile = new AppUserReadingProfile + { + AppUserId = userId, + Kind = ReadingProfileKind.User, + SeriesIds = [], + LibraryIds = [] + }; + } + + public AppUserReadingProfileBuilder WithSeries(Series series) + { + _profile.SeriesIds.Add(series.Id); + return this; + } + + public AppUserReadingProfileBuilder WithLibrary(Library library) + { + _profile.LibraryIds.Add(library.Id); + return this; + } + + public AppUserReadingProfileBuilder WithKind(ReadingProfileKind kind) + { + _profile.Kind = kind; + return this; + } + + public AppUserReadingProfileBuilder WithName(string name) + { + _profile.Name = name; + _profile.NormalizedName = name.ToNormalized(); + return this; + } + + +} diff --git a/API/Helpers/Converters/PersonFilterFieldValueConverter.cs b/API/Helpers/Converters/PersonFilterFieldValueConverter.cs new file mode 100644 index 000000000..822ce105a --- /dev/null +++ b/API/Helpers/Converters/PersonFilterFieldValueConverter.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using API.DTOs.Filtering.v2; +using API.Entities.Enums; + +namespace API.Helpers.Converters; + +public static class PersonFilterFieldValueConverter +{ + public static object ConvertValue(PersonFilterField field, string value) + { + return field switch + { + PersonFilterField.Name => value, + PersonFilterField.Role => ParsePersonRoles(value), + PersonFilterField.SeriesCount => int.Parse(value), + PersonFilterField.ChapterCount => int.Parse(value), + _ => throw new ArgumentOutOfRangeException(nameof(field), field, "Field is not supported") + }; + } + + private static IList ParsePersonRoles(string value) + { + if (string.IsNullOrEmpty(value)) return []; + + return value.Split(',', StringSplitOptions.RemoveEmptyEntries) + .Select(v => Enum.Parse(v.Trim())) + .ToList(); + } +} diff --git a/API/I18N/as.json b/API/I18N/as.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/API/I18N/as.json @@ -0,0 +1 @@ +{} diff --git a/API/I18N/cs.json b/API/I18N/cs.json index 9825ab074..e136d8e75 100644 --- a/API/I18N/cs.json +++ b/API/I18N/cs.json @@ -208,5 +208,6 @@ "smart-filter-name-required": "Vyžaduje se název chytrého filtru", "smart-filter-system-name": "Nelze použít název streamu poskytovaného systémem", "sidenav-stream-only-delete-smart-filter": "Z postranní navigace lze odstranit pouze streamy chytrých filtrů", - "aliases-have-overlap": "Jeden nebo více aliasů se překrývají s jinými osobami, nelze je aktualizovat" + "aliases-have-overlap": "Jeden nebo více aliasů se překrývají s jinými osobami, nelze je aktualizovat", + "generated-reading-profile-name": "Generováno z {0}" } diff --git a/API/I18N/en.json b/API/I18N/en.json index 5916bc63e..d3cd1ecd3 100644 --- a/API/I18N/en.json +++ b/API/I18N/en.json @@ -230,6 +230,8 @@ "scan-libraries": "Scan Libraries", "kavita+-data-refresh": "Kavita+ Data Refresh", "backup": "Backup", - "update-yearly-stats": "Update Yearly Stats" + "update-yearly-stats": "Update Yearly Stats", + + "generated-reading-profile-name": "Generated from {0}" } diff --git a/API/I18N/ga.json b/API/I18N/ga.json index 79d0d271e..142425aec 100644 --- a/API/I18N/ga.json +++ b/API/I18N/ga.json @@ -208,5 +208,6 @@ "sidenav-stream-only-delete-smart-filter": "Ní féidir ach sruthanna cliste scagaire a scriosadh as an SideNav", "dashboard-stream-only-delete-smart-filter": "Ní féidir ach sruthanna cliste scagaire a scriosadh ón deais", "smart-filter-name-required": "Ainm Scagaire Cliste ag teastáil", - "aliases-have-overlap": "Tá forluí idir ceann amháin nó níos mó de na leasainmneacha agus daoine eile, ní féidir iad a nuashonrú" + "aliases-have-overlap": "Tá forluí idir ceann amháin nó níos mó de na leasainmneacha agus daoine eile, ní féidir iad a nuashonrú", + "generated-reading-profile-name": "Gineadh ó {0}" } diff --git a/API/I18N/he.json b/API/I18N/he.json index 41a9a7de7..3b2386bf6 100644 --- a/API/I18N/he.json +++ b/API/I18N/he.json @@ -21,5 +21,6 @@ "age-restriction-update": "אירעה תקלה בעת עדכון הגבלת גיל", "generic-user-update": "אירעה תקלה בעת עדכון משתמש", "user-already-registered": "משתמש רשום כבר בתור {0}", - "manual-setup-fail": "לא מתאפשר להשלים הגדרה ידנית. יש לבטל וליצור מחדש את ההזמנה" + "manual-setup-fail": "לא מתאפשר להשלים הגדרה ידנית. יש לבטל וליצור מחדש את ההזמנה", + "email-taken": "דואר אלקטרוני כבר בשימוש" } diff --git a/API/I18N/pt_BR.json b/API/I18N/pt_BR.json index b67d926b0..418e0ea3b 100644 --- a/API/I18N/pt_BR.json +++ b/API/I18N/pt_BR.json @@ -208,5 +208,6 @@ "dashboard-stream-only-delete-smart-filter": "Somente fluxos de filtros inteligentes podem ser excluídos do painel", "smart-filter-system-name": "Você não pode usar o nome de um fluxo fornecido pelo sistema", "sidenav-stream-only-delete-smart-filter": "Somente fluxos de filtros inteligentes podem ser excluídos do Navegador Lateral", - "aliases-have-overlap": "Um ou mais dos pseudônimos se sobrepõem a outras pessoas, não pode atualizar" + "aliases-have-overlap": "Um ou mais dos pseudônimos se sobrepõem a outras pessoas, não pode atualizar", + "generated-reading-profile-name": "Gerado a partir de {0}" } diff --git a/API/I18N/ru.json b/API/I18N/ru.json index 92d842336..fdea5920f 100644 --- a/API/I18N/ru.json +++ b/API/I18N/ru.json @@ -1,5 +1,5 @@ { - "confirm-email": "Вы обязаны сначала подтвердить свою почту", + "confirm-email": "Сначала Вы обязаны подтвердить свою электронную почту", "generate-token": "Возникла проблема с генерацией токена подтверждения электронной почты. Смотрите журналы", "invalid-password": "Неверный пароль", "invalid-email-confirmation": "Неверное подтверждение электронной почты", @@ -35,15 +35,15 @@ "no-user": "Пользователь не существует", "generic-invite-user": "Возникла проблема с приглашением пользователя. Пожалуйста, проверьте журналы.", "permission-denied": "Вам запрещено выполнять эту операцию", - "invalid-access": "Недопустимый доступ", + "invalid-access": "В доступе отказано", "reading-list-name-exists": "Такой список для чтения уже существует", "perform-scan": "Пожалуйста, выполните сканирование этой серии или библиотеки и повторите попытку", "generic-device-create": "При создании устройства возникла ошибка", "generic-read-progress": "Возникла проблема с сохранением прогресса", "file-doesnt-exist": "Файл не существует", "admin-already-exists": "Администратор уже существует", - "send-to-kavita-email": "Отправка на устройство не может быть использована с почтовым сервисом Kavita. Пожалуйста, настройте свой собственный.", - "no-image-for-page": "Нет такого изображения для страницы {0}. Попробуйте обновить, чтобы обновить кэш.", + "send-to-kavita-email": "Отправка на устройство не может быть использована без настройки электронной почты", + "no-image-for-page": "Нет такого изображения для страницы {0}. Попробуйте обновить, для повторного кеширования.", "reading-list-permission": "У вас нет прав на этот список чтения или список не существует", "volume-doesnt-exist": "Том не существует", "generic-library": "Возникла критическая проблема. Пожалуйста, попробуйте еще раз.", @@ -57,7 +57,7 @@ "generic-reading-list-create": "Возникла проблема с созданием списка для чтения", "no-cover-image": "Изображение на обложке отсутствует", "collection-updated": "Коллекция успешно обновлена", - "critical-email-migration": "Возникла проблема при переносе электронной почты. Обратитесь в службу поддержки", + "critical-email-migration": "Возникла проблема при смене электронной почты. Обратитесь в службу поддержки", "cache-file-find": "Не удалось найти изображение в кэше. Перезагрузитесь и попробуйте снова.", "duplicate-bookmark": "Дублирующая закладка уже существует", "collection-tag-duplicate": "Такая коллекция уже существует", @@ -72,7 +72,7 @@ "pdf-doesnt-exist": "PDF не существует, когда он должен существовать", "generic-device-delete": "При удалении устройства возникла ошибка", "bookmarks-empty": "Закладки не могут быть пустыми", - "valid-number": "Должен быть действительный номер страницы", + "valid-number": "Номер страницы должен быть действительным", "series-doesnt-exist": "Серия не существует", "no-library-access": "Пользователь не имеет доступа к этой библиотеке", "reading-list-item-delete": "Не удалось удалить элемент(ы)", @@ -155,7 +155,7 @@ "generic-user-delete": "Не удалось удалить пользователя", "generic-cover-reading-list-save": "Невозможно сохранить изображение обложки в списке для чтения", "unable-to-register-k+": "Невозможно зарегистрировать лицензию из-за ошибки. Обратитесь в службу поддержки Кавита+", - "encode-as-warning": "Конвертировать в PNG невозможно. Для обложек используйте Обновить Обложки. Закладки и фавиконки нельзя закодировать обратно.", + "encode-as-warning": "Вы не можете конвертировать в формат PNG. Для обновления обложек используйте команду \"Обновить обложку\". Закладки и значки не могут быть закодированы обратно.", "want-to-read": "Хотите прочитать", "generic-user-pref": "Возникла проблема с сохранением предпочтений", "external-sources": "Внешние источники", @@ -197,7 +197,7 @@ "kavita+-data-refresh": "Обновление данных Kavita+", "kavitaplus-restricted": "Это доступно только для Kavita+", "person-doesnt-exist": "Персона не существует", - "generic-cover-volume-save": "Не удается сохранить обложку для раздела", + "generic-cover-volume-save": "Не удается сохранить обложку для тома", "generic-cover-person-save": "Не удается сохранить изображение обложки для Персоны", "person-name-unique": "Имя персоны должно быть уникальным", "person-image-doesnt-exist": "Персона не существует в CoversDB", diff --git a/API/I18N/sk.json b/API/I18N/sk.json index 0967ef424..a48add072 100644 --- a/API/I18N/sk.json +++ b/API/I18N/sk.json @@ -1 +1,92 @@ -{} +{ + "disabled-account": "Váš účet je zakázaný. Kontaktujte správcu servera.", + "register-user": "Niečo sa pokazilo pri registrácii užívateľa", + "confirm-email": "Najprv musíte potvrdiť svoj e-mail", + "locked-out": "Boli ste zamknutí z dôvodu veľkého počtu neúspešných pokusov o prihlásenie. Počkajte 10 minút.", + "validate-email": "Pri validácii vášho e-mailu sa vyskytla chyba: {0}", + "confirm-token-gen": "Pri vytváraní potvrdzovacieho tokenu sa vyskytla chyba", + "permission-denied": "Na vykonanie tejto úlohy nemáte oprávnenie", + "password-required": "Ak nie ste administrátor, musíte na vykonanie zmien vo vašom profile zadať vaše aktuálne heslo", + "invalid-password": "Nesprávne heslo", + "invalid-token": "Nesprávny token", + "unable-to-reset-key": "Niečo sa pokazilo, kľúč nie je možné resetovať", + "invalid-payload": "Nesprávny payload", + "nothing-to-do": "Nič na vykonanie", + "share-multiple-emails": "Nemôžete zdielať e-maily medzi rôznymi účtami", + "generate-token": "Pri generovaní potvrdzovacieho tokenu e-mailu sa vyskytla chyba. Pozrite záznamy udalostí", + "age-restriction-update": "Pri aktualizovaní vekového obmedzenia sa vyskytla chyba", + "no-user": "Používateľ neexistuje", + "generic-user-update": "Aktualizácia používateľa prebehla s výnimkou", + "username-taken": "Používateľské meno už existuje", + "user-already-confirmed": "Používateľ je už potvrdený", + "user-already-registered": "Používateľ je už registrovaný ako {0}", + "user-already-invited": "Používateľ je už pod týmto e-mailom pozvaný a musí ešte prijať pozvanie.", + "generic-password-update": "Pri potvrdení nového hesla sa vyskytla neočakávaná chyba", + "generic-invite-user": "Pri pozývaní tohto používateľa sa vyskytla chyba. Pozrite záznamy udalostí.", + "password-updated": "Heslo aktualizované", + "forgot-password-generic": "E-mail bude odoslaný na zadanú adresu len v prípade, ak existuje v databáze", + "invalid-email-confirmation": "Neplatné potvrdenie e-mailu", + "not-accessible-password": "Váš server nie je dostupný. Odkaz na resetovanie vášho hesla je v záznamoch udalostí", + "email-taken": "Zadaný e-mail už existuje", + "denied": "Nepovolené", + "manual-setup-fail": "Manuálne nastavenie nie je možné dokončiť. Prosím zrušte aktuálny postup a znovu vytvorte pozvánku", + "generic-user-email-update": "Nemožno aktualizovať e-mail používateľa. Skontrolujte záznamy udalostí.", + "email-not-enabled": "E-mail nie je na tomto serveri povolený. Preto túto akciu nemôžete vykonať.", + "collection-updated": "Zbierka bola úspešne aktualizovaná", + "device-doesnt-exist": "Zariadenie neexistuje", + "generic-device-delete": "Pri odstraňovaní zariadenia sa vyskytla chyba", + "greater-0": "{0} musí byť väčší ako 0", + "send-to-size-limit": "Snažíte sa odoslať súbor(y), ktoré sú príliš veľké pre vášho e-mailového poskytovateľa", + "send-to-device-status": "Prenos súborov do vášho zariadenia", + "no-cover-image": "Žiadny prebal", + "must-be-defined": "{0} musí byť definovaný", + "generic-favicon": "Pri získavaní favicon-u domény sa vyskytla chyba", + "no-library-access": "Pozužívateľ nemá prístup do tejto knižnice", + "user-doesnt-exist": "Používateľ neexistuje", + "collection-already-exists": "Zbierka už existuje", + "not-accessible": "Váš server nie je dostupný z vonkajšieho prostredia", + "email-sent": "E-mail odoslaný", + "user-migration-needed": "Uvedený používateľ potrebuje migrovať. Odhláste ho a opäť prihláste na spustenie migrácie", + "generic-invite-email": "Pri opakovanom odosielaní pozývacieho e-mailu sa vyskytla chyba", + "email-settings-invalid": "V nastaveniach e-mailu chýbajú potrebné údaje. Uistite sa, že všetky nastavenia e-mailu sú uložené.", + "chapter-doesnt-exist": "Kapitola neexistuje", + "critical-email-migration": "Počas migrácie e-mailu sa vyskytla chyba. Kontaktujte podporu", + "collection-deleted": "Zbierka bola vymazaná", + "generic-error": "Niečo sa pokazilo, skúste to znova", + "collection-doesnt-exist": "Zbierka neexistuje", + "generic-device-update": "Pri aktualizácii zariadenia sa vyskytla chyba", + "bookmark-doesnt-exist": "Záložka neexistuje", + "person-doesnt-exist": "Osoba neexistuje", + "send-to-kavita-email": "Odoslanie do zariadenia nemôže byť použité bez nastavenia e-amilu", + "send-to-unallowed": "Nemôžete odosielať do zariadenia, ktoré nie je vaše", + "generic-library": "Vyskytla sa kritická chyba. Prosím skúste to opäť.", + "pdf-doesnt-exist": "PDF neexistuje, hoci by malo", + "generic-library-update": "Počas aktualizácie knižnice sa vyskytla kritická chyba.", + "invalid-access": "Neplatný prístup", + "perform-scan": "Prosím, vykonajte opakovaný sken na tejto sérii alebo knižnici", + "generic-read-progress": "Pri ukladaní aktuálneho stavu sa vyskytla chyba", + "generic-clear-bookmarks": "Záložky nie je možné vymazať", + "bookmark-permission": "Nemáte oprávnenie na vkladanie/odstraňovanie záložiek", + "bookmark-save": "Nemožno uložiť záložku", + "bookmarks-empty": "Záložky nemôžu byť prázdne", + "library-doesnt-exist": "Knižnica neexistuje", + "invalid-path": "Neplatné umiestnenie", + "generic-send-to": "Pri odosielaní súboru(-ov) do vášho zariadenia sa vyskytla chyba", + "no-image-for-page": "Žiadny taký obrázok pre stránku {0}. Pokúste sa ju obnoviť, aby ste ju mohli nanovo uložiť.", + "delete-library-while-scan": "Nemôžete odstrániť knižnicu počas prebiehajúceho skenovania. Prosím, vyčkajte na dokončenie skenovania alebo reštartujte Kavitu a skúste ju opäť odstrániť", + "invalid-username": "Neplatné používateľské meno", + "account-email-invalid": "E-mail uvedený v údajoch administrátora nie je platným e-mailom. Nie je možné zaslať testovací e-mail.", + "admin-already-exists": "Administrátor už existuje", + "invalid-filename": "Neplatný názov súboru", + "file-doesnt-exist": "Súbor neexistuje", + "invalid-email": "E-mail v záznamoch pre používateľov nie platný e-mail. Odkazy sú uvedené v záznamoch udalostí.", + "file-missing": "Súbor nebol nájdený v knihe", + "error-import-stack": "Pri importovaní MAL balíka sa vyskytla chyba", + "person-name-required": "Meno osoby je povinné a nesmie byť prázdne", + "person-name-unique": "Meno osoby musí byť jedinečné", + "person-image-doesnt-exist": "Osoba neexistuje v databáze CoversDB", + "generic-device-create": "Pri vytváraní zariadenia sa vyskytla chyba", + "series-doesnt-exist": "Séria neexistuje", + "volume-doesnt-exist": "Zväzok neexistuje", + "library-name-exists": "Názov knižnice už existuje. Prosím, vyberte si pre daný server jedinečný názov." +} diff --git a/API/I18N/zh_Hans.json b/API/I18N/zh_Hans.json index 070a87855..14c8c902e 100644 --- a/API/I18N/zh_Hans.json +++ b/API/I18N/zh_Hans.json @@ -208,5 +208,6 @@ "smart-filter-name-required": "需要智能筛选器名称", "smart-filter-system-name": "您不能使用系统提供的流名称", "sidenav-stream-only-delete-smart-filter": "只能从侧边栏删除智能筛选器流", - "aliases-have-overlap": "一个或多个别名与其他人有重叠，无法更新" + "aliases-have-overlap": "一个或多个别名与其他人有重叠，无法更新", + "generated-reading-profile-name": "由 {0} 生成" } diff --git a/API/Services/ImageService.cs b/API/Services/ImageService.cs index 0255b785d..544efa4ce 100644 --- a/API/Services/ImageService.cs +++ b/API/Services/ImageService.cs @@ -10,11 +10,9 @@ using API.Entities.Interfaces; using API.Extensions; using Microsoft.Extensions.Logging; using NetVips; -using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors.Quantization; -using Color = System.Drawing.Color; using Image = NetVips.Image; namespace API.Services; @@ -750,7 +748,7 @@ public class ImageService : IImageService } - public static Color HexToRgb(string? hex) + public static (int R, int G, int B) HexToRgb(string? hex) { if (string.IsNullOrEmpty(hex)) throw new ArgumentException("Hex cannot be null"); @@ -774,7 +772,7 @@ public class ImageService : IImageService var g = Convert.ToInt32(hex.Substring(2, 2), 16); var b = Convert.ToInt32(hex.Substring(4, 2), 16); - return Color.FromArgb(r, g, b); + return (r, g, b); } diff --git a/API/Services/Plus/ExternalMetadataService.cs b/API/Services/Plus/ExternalMetadataService.cs index a1e3750dd..435727bda 100644 --- a/API/Services/Plus/ExternalMetadataService.cs +++ b/API/Services/Plus/ExternalMetadataService.cs @@ -200,6 +200,9 @@ public class ExternalMetadataService : IExternalMetadataService /// /// Returns the match results for a Series from UI Flow /// + /// + /// Will extract alternative names like Localized name, year will send as ReleaseYear but fallback to Comic Vine syntax if applicable + /// /// /// public async Task> MatchSeries(MatchSeriesDto dto) @@ -212,19 +215,26 @@ public class ExternalMetadataService : IExternalMetadataService var potentialAnilistId = ScrobblingService.ExtractId(dto.Query, ScrobblingService.AniListWeblinkWebsite); var potentialMalId = ScrobblingService.ExtractId(dto.Query, ScrobblingService.MalWeblinkWebsite); - List altNames = [series.LocalizedName, series.OriginalName]; - if (potentialAnilistId == null && potentialMalId == null && !string.IsNullOrEmpty(dto.Query)) + var format = series.Library.Type.ConvertToPlusMediaFormat(series.Format); + var otherNames = ExtractAlternativeNames(series); + + var year = series.Metadata.ReleaseYear; + if (year == 0 && format == PlusMediaFormat.Comic && !string.IsNullOrWhiteSpace(series.Name)) { - altNames.Add(dto.Query); + var potentialYear = Parser.ParseYear(series.Name); + if (!string.IsNullOrEmpty(potentialYear)) + { + year = int.Parse(potentialYear); + } } var matchRequest = new MatchSeriesRequestDto() { - Format = series.Library.Type.ConvertToPlusMediaFormat(series.Format), + Format = format, Query = dto.Query, SeriesName = series.Name, - AlternativeNames = altNames.Where(s => !string.IsNullOrEmpty(s)).ToList(), - Year = series.Metadata.ReleaseYear, + AlternativeNames = otherNames, + Year = year, AniListId = potentialAnilistId ?? ScrobblingService.GetAniListId(series), MalId = potentialMalId ?? ScrobblingService.GetMalId(series) }; @@ -254,6 +264,12 @@ public class ExternalMetadataService : IExternalMetadataService return ArraySegment.Empty; } + private static List ExtractAlternativeNames(Series series) + { + List altNames = [series.LocalizedName, series.OriginalName]; + return altNames.Where(s => !string.IsNullOrEmpty(s)).Distinct().ToList(); + } + /// /// Retrieves Metadata about a Recommended External Series diff --git a/API/Services/Plus/LicenseService.cs b/API/Services/Plus/LicenseService.cs index 774103518..91f5a8fdd 100644 --- a/API/Services/Plus/LicenseService.cs +++ b/API/Services/Plus/LicenseService.cs @@ -130,22 +130,23 @@ public class LicenseService( if (cacheValue.HasValue) return cacheValue.Value; } + var result = false; try { var serverSetting = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); - var result = await IsLicenseValid(serverSetting.Value); - await provider.FlushAsync(); - await provider.SetAsync(CacheKey, result, _licenseCacheTimeout); - return result; + result = await IsLicenseValid(serverSetting.Value); } catch (Exception ex) { logger.LogError(ex, "There was an issue connecting to Kavita+"); + } + finally + { await provider.FlushAsync(); - await provider.SetAsync(CacheKey, false, _licenseCacheTimeout); + await provider.SetAsync(CacheKey, result, _licenseCacheTimeout); } - return false; + return result; } /// diff --git a/API/Services/Plus/ScrobblingService.cs b/API/Services/Plus/ScrobblingService.cs index ef22736d2..85814dcd9 100644 --- a/API/Services/Plus/ScrobblingService.cs +++ b/API/Services/Plus/ScrobblingService.cs @@ -261,7 +261,7 @@ public class ScrobblingService : IScrobblingService var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Library); if (series == null) throw new KavitaException(await _localizationService.Translate(userId, "series-doesnt-exist")); - _logger.LogInformation("Processing Scrobbling review event for {UserId} on {SeriesName}", userId, series.Name); + _logger.LogInformation("Processing Scrobbling review event for {AppUserId} on {SeriesName}", userId, series.Name); if (await CheckIfCannotScrobble(userId, seriesId, series)) return; if (IsAniListReviewValid(reviewTitle, reviewBody)) @@ -297,7 +297,7 @@ public class ScrobblingService : IScrobblingService }; _unitOfWork.ScrobbleRepository.Attach(evt); await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling Review update on {SeriesName} with Userid {UserId} ", series.Name, userId); + _logger.LogDebug("Added Scrobbling Review update on {SeriesName} with Userid {AppUserId} ", series.Name, userId); } private static bool IsAniListReviewValid(string reviewTitle, string reviewBody) @@ -317,7 +317,7 @@ public class ScrobblingService : IScrobblingService var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); if (user == null || !user.UserPreferences.AniListScrobblingEnabled) return; - _logger.LogInformation("Processing Scrobbling rating event for {UserId} on {SeriesName}", userId, series.Name); + _logger.LogInformation("Processing Scrobbling rating event for {AppUserId} on {SeriesName}", userId, series.Name); if (await CheckIfCannotScrobble(userId, seriesId, series)) return; var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id, @@ -346,7 +346,7 @@ public class ScrobblingService : IScrobblingService }; _unitOfWork.ScrobbleRepository.Attach(evt); await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling Rating update on {SeriesName} with Userid {UserId}", series.Name, userId); + _logger.LogDebug("Added Scrobbling Rating update on {SeriesName} with Userid {AppUserId}", series.Name, userId); } public static long? GetMalId(Series series) @@ -371,7 +371,7 @@ public class ScrobblingService : IScrobblingService var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); if (user == null || !user.UserPreferences.AniListScrobblingEnabled) return; - _logger.LogInformation("Processing Scrobbling reading event for {UserId} on {SeriesName}", userId, series.Name); + _logger.LogInformation("Processing Scrobbling reading event for {AppUserId} on {SeriesName}", userId, series.Name); if (await CheckIfCannotScrobble(userId, seriesId, series)) return; var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id, @@ -418,7 +418,7 @@ public class ScrobblingService : IScrobblingService _unitOfWork.ScrobbleRepository.Attach(evt); await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling Read update on {SeriesName} - Volume: {VolumeNumber} Chapter: {ChapterNumber} for User: {UserId}", series.Name, evt.VolumeNumber, evt.ChapterNumber, userId); + _logger.LogDebug("Added Scrobbling Read update on {SeriesName} - Volume: {VolumeNumber} Chapter: {ChapterNumber} for User: {AppUserId}", series.Name, evt.VolumeNumber, evt.ChapterNumber, userId); } catch (Exception ex) { @@ -437,7 +437,7 @@ public class ScrobblingService : IScrobblingService if (user == null || !user.UserPreferences.AniListScrobblingEnabled) return; if (await CheckIfCannotScrobble(userId, seriesId, series)) return; - _logger.LogInformation("Processing Scrobbling want-to-read event for {UserId} on {SeriesName}", userId, series.Name); + _logger.LogInformation("Processing Scrobbling want-to-read event for {AppUserId} on {SeriesName}", userId, series.Name); // Get existing events for this series/user var existingEvents = (await _unitOfWork.ScrobbleRepository.GetUserEventsForSeries(userId, seriesId)) @@ -463,7 +463,7 @@ public class ScrobblingService : IScrobblingService _unitOfWork.ScrobbleRepository.Attach(evt); await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling WantToRead update on {SeriesName} with Userid {UserId} ", series.Name, userId); + _logger.LogDebug("Added Scrobbling WantToRead update on {SeriesName} with Userid {AppUserId} ", series.Name, userId); } private async Task CheckIfCannotScrobble(int userId, int seriesId, Series series) @@ -471,7 +471,7 @@ public class ScrobblingService : IScrobblingService if (series.DontMatch) return true; if (await _unitOfWork.UserRepository.HasHoldOnSeries(userId, seriesId)) { - _logger.LogInformation("Series {SeriesName} is on UserId {UserId}'s hold list. Not scrobbling", series.Name, + _logger.LogInformation("Series {SeriesName} is on AppUserId {AppUserId}'s hold list. Not scrobbling", series.Name, userId); return true; } @@ -750,7 +750,7 @@ public class ScrobblingService : IScrobblingService /// public async Task ClearEventsForSeries(int userId, int seriesId) { - _logger.LogInformation("Clearing Pre-existing Scrobble events for Series {SeriesId} by User {UserId} as Series is now on hold list", seriesId, userId); + _logger.LogInformation("Clearing Pre-existing Scrobble events for Series {SeriesId} by User {AppUserId} as Series is now on hold list", seriesId, userId); var events = await _unitOfWork.ScrobbleRepository.GetUserEventsForSeries(userId, seriesId); foreach (var scrobble in events) { @@ -1109,7 +1109,7 @@ public class ScrobblingService : IScrobblingService { if (ex.Message.Contains("Access token is invalid")) { - _logger.LogCritical(ex, "Access Token for UserId: {UserId} needs to be regenerated/renewed to continue scrobbling", evt.AppUser.Id); + _logger.LogCritical(ex, "Access Token for AppUserId: {AppUserId} needs to be regenerated/renewed to continue scrobbling", evt.AppUser.Id); evt.IsErrored = true; evt.ErrorDetails = AccessTokenErrorMessage; _unitOfWork.ScrobbleRepository.Update(evt); diff --git a/API/Services/ReadingProfileService.cs b/API/Services/ReadingProfileService.cs new file mode 100644 index 000000000..4c3dab006 --- /dev/null +++ b/API/Services/ReadingProfileService.cs @@ -0,0 +1,454 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs; +using API.Entities; +using API.Entities.Enums; +using API.Extensions; +using API.Helpers.Builders; +using AutoMapper; +using Kavita.Common; + +namespace API.Services; +#nullable enable + +public interface IReadingProfileService +{ + /// + /// Returns the ReadingProfile that should be applied to the given series, walks up the tree. + /// Series (Implicit) -> Series (User) -> Library (User) -> Default + /// + /// + /// + /// + /// + Task GetReadingProfileDtoForSeries(int userId, int seriesId, bool skipImplicit = false); + + /// + /// Creates a new reading profile for a user. Name must be unique per user + /// + /// + /// + /// + Task CreateReadingProfile(int userId, UserReadingProfileDto dto); + Task PromoteImplicitProfile(int userId, int profileId); + + /// + /// Updates the implicit reading profile for a series, creates one if none exists + /// + /// + /// + /// + /// + Task UpdateImplicitReadingProfile(int userId, int seriesId, UserReadingProfileDto dto); + + /// + /// Updates the non-implicit reading profile for the given series, and removes implicit profiles + /// + /// + /// + /// + /// + Task UpdateParent(int userId, int seriesId, UserReadingProfileDto dto); + + /// + /// Updates a given reading profile for a user + /// + /// + /// + /// + /// Does not update connected series and libraries + Task UpdateReadingProfile(int userId, UserReadingProfileDto dto); + + /// + /// Deletes a given profile for a user + /// + /// + /// + /// + /// + /// The default profile for the user cannot be deleted + Task DeleteReadingProfile(int userId, int profileId); + + /// + /// Binds the reading profile to the series, and remove the implicit RP from the series if it exists + /// + /// + /// + /// + /// + Task AddProfileToSeries(int userId, int profileId, int seriesId); + /// + /// Binds the reading profile to many series, and remove the implicit RP from the series if it exists + /// + /// + /// + /// + /// + Task BulkAddProfileToSeries(int userId, int profileId, IList seriesIds); + /// + /// Remove all reading profiles bound to the series + /// + /// + /// + /// + Task ClearSeriesProfile(int userId, int seriesId); + + /// + /// Bind the reading profile to the library + /// + /// + /// + /// + /// + Task AddProfileToLibrary(int userId, int profileId, int libraryId); + /// + /// Remove the reading profile bound to the library, if it exists + /// + /// + /// + /// + Task ClearLibraryProfile(int userId, int libraryId); + /// + /// Returns the bound Reading Profile to a Library + /// + /// + /// + /// + Task GetReadingProfileDtoForLibrary(int userId, int libraryId); +} + +public class ReadingProfileService(IUnitOfWork unitOfWork, ILocalizationService localizationService, IMapper mapper): IReadingProfileService +{ + /// + /// Tries to resolve the Reading Profile for a given Series. Will first check (optionally) Implicit profiles, then check for a bound Series profile, then a bound + /// Library profile, then default to the default profile. + /// + /// + /// + /// + /// + /// + public async Task GetReadingProfileForSeries(int userId, int seriesId, bool skipImplicit = false) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId, skipImplicit); + + // If there is an implicit, send back + var implicitProfile = + profiles.FirstOrDefault(p => p.SeriesIds.Contains(seriesId) && p.Kind == ReadingProfileKind.Implicit); + if (implicitProfile != null) return implicitProfile; + + // Next check for a bound Series profile + var seriesProfile = profiles + .FirstOrDefault(p => p.SeriesIds.Contains(seriesId) && p.Kind != ReadingProfileKind.Implicit); + if (seriesProfile != null) return seriesProfile; + + // Check for a library bound profile + var series = await unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); + if (series == null) throw new KavitaException(await localizationService.Translate(userId, "series-doesnt-exist")); + + var libraryProfile = profiles + .FirstOrDefault(p => p.LibraryIds.Contains(series.LibraryId) && p.Kind != ReadingProfileKind.Implicit); + if (libraryProfile != null) return libraryProfile; + + // Fallback to the default profile + return profiles.First(p => p.Kind == ReadingProfileKind.Default); + } + + public async Task GetReadingProfileDtoForSeries(int userId, int seriesId, bool skipImplicit = false) + { + return mapper.Map(await GetReadingProfileForSeries(userId, seriesId, skipImplicit)); + } + + public async Task UpdateParent(int userId, int seriesId, UserReadingProfileDto dto) + { + var parentProfile = await GetReadingProfileForSeries(userId, seriesId, true); + + UpdateReaderProfileFields(parentProfile, dto, false); + unitOfWork.AppUserReadingProfileRepository.Update(parentProfile); + + // Remove the implicit profile when we UpdateParent (from reader) as it is implied that we are already bound with a non-implicit profile + await DeleteImplicateReadingProfilesForSeries(userId, [seriesId]); + + await unitOfWork.CommitAsync(); + return mapper.Map(parentProfile); + } + + public async Task UpdateReadingProfile(int userId, UserReadingProfileDto dto) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, dto.Id); + if (profile == null) throw new KavitaException("profile-does-not-exist"); + + UpdateReaderProfileFields(profile, dto); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + + await unitOfWork.CommitAsync(); + return mapper.Map(profile); + } + + public async Task CreateReadingProfile(int userId, UserReadingProfileDto dto) + { + var user = await unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); + if (user == null) throw new UnauthorizedAccessException(); + + if (await unitOfWork.AppUserReadingProfileRepository.IsProfileNameInUse(userId, dto.Name)) throw new KavitaException("name-already-in-use"); + + var newProfile = new AppUserReadingProfileBuilder(user.Id).Build(); + UpdateReaderProfileFields(newProfile, dto); + + unitOfWork.AppUserReadingProfileRepository.Add(newProfile); + user.ReadingProfiles.Add(newProfile); + + await unitOfWork.CommitAsync(); + + return mapper.Map(newProfile); + } + + /// + /// Promotes the implicit profile to a user profile. Removes the series from other profiles. + /// + /// + /// + /// + public async Task PromoteImplicitProfile(int userId, int profileId) + { + // Get all the user's profiles including the implicit + var allUserProfiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId, false); + var profileToPromote = allUserProfiles.First(r => r.Id == profileId); + var seriesId = profileToPromote.SeriesIds[0]; // An Implicit series can only be bound to 1 Series + + // Check if there are any reading profiles (Series) already bound to the series + var existingSeriesProfile = allUserProfiles.FirstOrDefault(r => r.SeriesIds.Contains(seriesId) && r.Kind == ReadingProfileKind.User); + if (existingSeriesProfile != null) + { + existingSeriesProfile.SeriesIds.Remove(seriesId); + unitOfWork.AppUserReadingProfileRepository.Update(existingSeriesProfile); + } + + // Convert the implicit profile into a proper Series + var series = await unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); + if (series == null) throw new KavitaException("series-doesnt-exist"); // Shouldn't happen + + profileToPromote.Kind = ReadingProfileKind.User; + profileToPromote.Name = await localizationService.Translate(userId, "generated-reading-profile-name", series.Name); + profileToPromote.Name = EnsureUniqueProfileName(allUserProfiles, profileToPromote.Name); + profileToPromote.NormalizedName = profileToPromote.Name.ToNormalized(); + unitOfWork.AppUserReadingProfileRepository.Update(profileToPromote); + + await unitOfWork.CommitAsync(); + + return mapper.Map(profileToPromote); + } + + private static string EnsureUniqueProfileName(IList allUserProfiles, string name) + { + var counter = 1; + var newName = name; + while (allUserProfiles.Any(p => p.Name == newName)) + { + newName = $"{name} ({counter})"; + counter++; + } + + return newName; + } + + public async Task UpdateImplicitReadingProfile(int userId, int seriesId, UserReadingProfileDto dto) + { + var user = await unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); + if (user == null) throw new UnauthorizedAccessException(); + + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var existingProfile = profiles.FirstOrDefault(rp => rp.Kind == ReadingProfileKind.Implicit && rp.SeriesIds.Contains(seriesId)); + + // Series already had an implicit profile, update it + if (existingProfile is {Kind: ReadingProfileKind.Implicit}) + { + UpdateReaderProfileFields(existingProfile, dto, false); + unitOfWork.AppUserReadingProfileRepository.Update(existingProfile); + await unitOfWork.CommitAsync(); + + return mapper.Map(existingProfile); + } + + var series = await unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId) ?? throw new KeyNotFoundException(); + var newProfile = new AppUserReadingProfileBuilder(userId) + .WithSeries(series) + .WithKind(ReadingProfileKind.Implicit) + .Build(); + + // Set name to something fitting for debugging if needed + UpdateReaderProfileFields(newProfile, dto, false); + newProfile.Name = $"Implicit Profile for {seriesId}"; + newProfile.NormalizedName = newProfile.Name.ToNormalized(); + + user.ReadingProfiles.Add(newProfile); + await unitOfWork.CommitAsync(); + + return mapper.Map(newProfile); + } + + public async Task DeleteReadingProfile(int userId, int profileId) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + if (profile.Kind == ReadingProfileKind.Default) throw new KavitaException("cant-delete-default-profile"); + + unitOfWork.AppUserReadingProfileRepository.Remove(profile); + await unitOfWork.CommitAsync(); + } + + public async Task AddProfileToSeries(int userId, int profileId, int seriesId) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + await DeleteImplicitAndRemoveFromUserProfiles(userId, [seriesId], []); + + profile.SeriesIds.Add(seriesId); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + + await unitOfWork.CommitAsync(); + } + + public async Task BulkAddProfileToSeries(int userId, int profileId, IList seriesIds) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + await DeleteImplicitAndRemoveFromUserProfiles(userId, seriesIds, []); + + profile.SeriesIds.AddRange(seriesIds.Except(profile.SeriesIds)); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + + await unitOfWork.CommitAsync(); + } + + public async Task ClearSeriesProfile(int userId, int seriesId) + { + await DeleteImplicitAndRemoveFromUserProfiles(userId, [seriesId], []); + await unitOfWork.CommitAsync(); + } + + public async Task AddProfileToLibrary(int userId, int profileId, int libraryId) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + await DeleteImplicitAndRemoveFromUserProfiles(userId, [], [libraryId]); + + profile.LibraryIds.Add(libraryId); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + await unitOfWork.CommitAsync(); + } + + public async Task ClearLibraryProfile(int userId, int libraryId) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var libraryProfile = profiles.FirstOrDefault(p => p.LibraryIds.Contains(libraryId)); + if (libraryProfile != null) + { + libraryProfile.LibraryIds.Remove(libraryId); + unitOfWork.AppUserReadingProfileRepository.Update(libraryProfile); + } + + + if (unitOfWork.HasChanges()) + { + await unitOfWork.CommitAsync(); + } + } + + public async Task GetReadingProfileDtoForLibrary(int userId, int libraryId) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId, true); + return mapper.Map(profiles.FirstOrDefault(p => p.LibraryIds.Contains(libraryId))); + } + + private async Task DeleteImplicitAndRemoveFromUserProfiles(int userId, IList seriesIds, IList libraryIds) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var implicitProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any()) + .Where(rp => rp.Kind == ReadingProfileKind.Implicit) + .ToList(); + unitOfWork.AppUserReadingProfileRepository.RemoveRange(implicitProfiles); + + var nonImplicitProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any() || rp.LibraryIds.Intersect(libraryIds).Any()) + .Where(rp => rp.Kind != ReadingProfileKind.Implicit); + + foreach (var profile in nonImplicitProfiles) + { + profile.SeriesIds.RemoveAll(seriesIds.Contains); + profile.LibraryIds.RemoveAll(libraryIds.Contains); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + } + } + + private async Task DeleteImplicateReadingProfilesForSeries(int userId, IList seriesIds) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var implicitProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any()) + .Where(rp => rp.Kind == ReadingProfileKind.Implicit) + .ToList(); + unitOfWork.AppUserReadingProfileRepository.RemoveRange(implicitProfiles); + } + + private async Task RemoveSeriesFromUserProfiles(int userId, IList seriesIds) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var userProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any()) + .Where(rp => rp.Kind == ReadingProfileKind.User) + .ToList(); + + unitOfWork.AppUserReadingProfileRepository.RemoveRange(userProfiles); + } + + public static void UpdateReaderProfileFields(AppUserReadingProfile existingProfile, UserReadingProfileDto dto, bool updateName = true) + { + if (updateName && !string.IsNullOrEmpty(dto.Name) && existingProfile.NormalizedName != dto.Name.ToNormalized()) + { + existingProfile.Name = dto.Name; + existingProfile.NormalizedName = dto.Name.ToNormalized(); + } + + // Manga Reader + existingProfile.ReadingDirection = dto.ReadingDirection; + existingProfile.ScalingOption = dto.ScalingOption; + existingProfile.PageSplitOption = dto.PageSplitOption; + existingProfile.ReaderMode = dto.ReaderMode; + existingProfile.AutoCloseMenu = dto.AutoCloseMenu; + existingProfile.ShowScreenHints = dto.ShowScreenHints; + existingProfile.EmulateBook = dto.EmulateBook; + existingProfile.LayoutMode = dto.LayoutMode; + existingProfile.BackgroundColor = string.IsNullOrEmpty(dto.BackgroundColor) ? "#000000" : dto.BackgroundColor; + existingProfile.SwipeToPaginate = dto.SwipeToPaginate; + existingProfile.AllowAutomaticWebtoonReaderDetection = dto.AllowAutomaticWebtoonReaderDetection; + existingProfile.WidthOverride = dto.WidthOverride; + existingProfile.DisableWidthOverride = dto.DisableWidthOverride; + + // Book Reader + existingProfile.BookReaderMargin = dto.BookReaderMargin; + existingProfile.BookReaderLineSpacing = dto.BookReaderLineSpacing; + existingProfile.BookReaderFontSize = dto.BookReaderFontSize; + existingProfile.BookReaderFontFamily = dto.BookReaderFontFamily; + existingProfile.BookReaderTapToPaginate = dto.BookReaderTapToPaginate; + existingProfile.BookReaderReadingDirection = dto.BookReaderReadingDirection; + existingProfile.BookReaderWritingStyle = dto.BookReaderWritingStyle; + existingProfile.BookThemeName = dto.BookReaderThemeName; + existingProfile.BookReaderLayoutMode = dto.BookReaderLayoutMode; + existingProfile.BookReaderImmersiveMode = dto.BookReaderImmersiveMode; + + // PDF Reading + existingProfile.PdfTheme = dto.PdfTheme; + existingProfile.PdfScrollMode = dto.PdfScrollMode; + existingProfile.PdfSpreadMode = dto.PdfSpreadMode; + } +} diff --git a/API/Services/Tasks/Metadata/CoverDbService.cs b/API/Services/Tasks/Metadata/CoverDbService.cs index 99d02401b..015613965 100644 --- a/API/Services/Tasks/Metadata/CoverDbService.cs +++ b/API/Services/Tasks/Metadata/CoverDbService.cs @@ -206,17 +206,12 @@ public class CoverDbService : ICoverDbService throw new KavitaException($"Could not grab publisher image for {publisherName}"); } - _logger.LogTrace("Fetching publisher image from {Url}", publisherLink.Sanitize()); - // Download the publisher file using Flurl - var publisherStream = await publisherLink - .AllowHttpStatus("2xx,304") - .GetStreamAsync(); - // Create the destination file path - using var image = Image.NewFromStream(publisherStream); var filename = ImageService.GetPublisherFormat(publisherName, encodeFormat); - image.WriteToFile(Path.Combine(_directoryService.PublisherDirectory, filename)); + _logger.LogTrace("Fetching publisher image from {Url}", publisherLink.Sanitize()); + await DownloadImageFromUrl(publisherName, encodeFormat, publisherLink, _directoryService.PublisherDirectory); + _logger.LogDebug("Publisher image for {PublisherName} downloaded and saved successfully", publisherName.Sanitize()); return filename; @@ -302,7 +297,27 @@ public class CoverDbService : ICoverDbService .GetStreamAsync(); using var image = Image.NewFromStream(imageStream); - image.WriteToFile(targetFile); + try + { + image.WriteToFile(targetFile); + } + catch (Exception ex) + { + switch (encodeFormat) + { + case EncodeFormat.PNG: + image.Pngsave(Path.Combine(_directoryService.FaviconDirectory, filename)); + break; + case EncodeFormat.WEBP: + image.Webpsave(Path.Combine(_directoryService.FaviconDirectory, filename)); + break; + case EncodeFormat.AVIF: + image.Heifsave(Path.Combine(_directoryService.FaviconDirectory, filename)); + break; + default: + throw new ArgumentOutOfRangeException(nameof(encodeFormat), encodeFormat, null); + } + } return filename; } @@ -385,14 +400,13 @@ public class CoverDbService : ICoverDbService private async Task FallbackToKavitaReaderPublisher(string publisherName) { const string publisherFileName = "publishers.txt"; - var externalLink = string.Empty; var allOverrides = await GetCachedData(publisherFileName) ?? await $"{NewHost}publishers/{publisherFileName}".GetStringAsync(); // Cache immediately await CacheDataAsync(publisherFileName, allOverrides); - if (string.IsNullOrEmpty(allOverrides)) return externalLink; + if (string.IsNullOrEmpty(allOverrides)) return string.Empty; var externalFile = allOverrides .Split("\n") @@ -415,7 +429,7 @@ public class CoverDbService : ICoverDbService throw new KavitaException($"Could not grab publisher image for {publisherName}"); } - return $"{NewHost}publishers/{externalLink}"; + return $"{NewHost}publishers/{externalFile}"; } private async Task CacheDataAsync(string fileName, string? content) @@ -572,8 +586,7 @@ public class CoverDbService : ICoverDbService var choseNewImage = string.Equals(betterImage, tempFullPath, StringComparison.OrdinalIgnoreCase); if (choseNewImage) { - - // Don't delete series cover, unless it's an override, otherwise the first chapter cover will be null + // Don't delete the Series cover unless it is an override, otherwise the first chapter will be null if (existingPath.Contains(ImageService.GetSeriesFormat(series.Id))) { _directoryService.DeleteFiles([existingPath]); @@ -624,6 +637,7 @@ public class CoverDbService : ICoverDbService } } + // TODO: Refactor this to IHasCoverImage instead of a hard entity type public async Task SetChapterCoverByUrl(Chapter chapter, string url, bool fromBase64 = true, bool chooseBetterImage = false) { if (!string.IsNullOrEmpty(url)) diff --git a/API/Services/Tasks/Scanner/Parser/Parser.cs b/API/Services/Tasks/Scanner/Parser/Parser.cs index 12987b18b..c8eb010b3 100644 --- a/API/Services/Tasks/Scanner/Parser/Parser.cs +++ b/API/Services/Tasks/Scanner/Parser/Parser.cs @@ -1159,6 +1159,12 @@ public static partial class Parser return !string.IsNullOrEmpty(name) && SeriesAndYearRegex.IsMatch(name); } + /// + /// Parse a Year from a Comic Series: Series Name (YEAR) + /// + /// Harley Quinn (2024) returns 2024 + /// + /// public static string ParseYear(string? name) { if (string.IsNullOrEmpty(name)) return string.Empty; diff --git a/API/Startup.cs b/API/Startup.cs index cb32d1742..f57cb7d01 100644 --- a/API/Startup.cs +++ b/API/Startup.cs @@ -293,6 +293,9 @@ public class Startup await ManualMigrateScrobbleSpecials.Migrate(dataContext, logger); await ManualMigrateScrobbleEventGen.Migrate(dataContext, logger); + // v0.8.7 + await ManualMigrateReadingProfiles.Migrate(dataContext, logger); + #endregion // Update the version in the DB after all migrations are run diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index dbdfca7b8..5d612e6b7 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -3,7 +3,7 @@ net9.0 kavitareader.com Kavita - 0.8.6.11 + 0.8.6.15 en true diff --git a/README.md b/README.md index bff8f0f5c..ffff8d831 100644 --- a/README.md +++ b/README.md @@ -107,13 +107,10 @@ Support this project by becoming a sponsor. Your logo will show up here with a l ## Mega Sponsors -## JetBrains -Thank you to [ JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools. - -* [ Rider](http://www.jetbrains.com/rider/) +## Powered By +[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSource) ### License - * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html) * Copyright 2020-2024 diff --git a/UI/Web/src/_tag-card-common.scss b/UI/Web/src/_tag-card-common.scss new file mode 100644 index 000000000..07f37c2a0 --- /dev/null +++ b/UI/Web/src/_tag-card-common.scss @@ -0,0 +1,30 @@ +.tag-card { + background-color: var(--bs-card-color, #2c2c2c); + padding: 1rem; + border-radius: 12px; + box-shadow: 0 2px 5px rgba(0,0,0,0.2); + transition: transform 0.2s ease, background 0.3s ease; + cursor: pointer; +} + +.tag-card:hover { + background-color: #3a3a3a; + //transform: translateY(-3px); // Cool effect but has a weird background issue. ROBBIE: Fix this +} + +.tag-name { + font-size: 1.1rem; + font-weight: 600; + margin-bottom: 0.5rem; + max-height: 8rem; + height: 8rem; + overflow: hidden; + text-overflow: ellipsis; +} + +.tag-meta { + font-size: 0.85rem; + display: flex; + justify-content: space-between; + color: var(--text-muted-color, #bbb); +} diff --git a/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts b/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts index a8dc1ce06..05a4041c8 100644 --- a/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts +++ b/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts @@ -1,6 +1,8 @@ import {MatchStateOption} from "./match-state-option"; +import {LibraryType} from "../library/library"; export interface ManageMatchFilter { matchStateOption: MatchStateOption; + libraryType: LibraryType | -1; searchTerm: string; } diff --git a/UI/Web/src/app/_models/library/library.ts b/UI/Web/src/app/_models/library/library.ts index 06ba86cf2..bad83f54b 100644 --- a/UI/Web/src/app/_models/library/library.ts +++ b/UI/Web/src/app/_models/library/library.ts @@ -13,6 +13,8 @@ export enum LibraryType { } export const allLibraryTypes = [LibraryType.Manga, LibraryType.ComicVine, LibraryType.Comic, LibraryType.Book, LibraryType.LightNovel, LibraryType.Images]; +export const allKavitaPlusMetadataApplicableTypes = [LibraryType.Manga, LibraryType.LightNovel, LibraryType.ComicVine, LibraryType.Comic]; +export const allKavitaPlusScrobbleEligibleTypes = [LibraryType.Manga, LibraryType.LightNovel]; export interface Library { id: number; diff --git a/UI/Web/src/app/_models/metadata/browse/browse-genre.ts b/UI/Web/src/app/_models/metadata/browse/browse-genre.ts new file mode 100644 index 000000000..e7bb0d915 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/browse/browse-genre.ts @@ -0,0 +1,6 @@ +import {Genre} from "../genre"; + +export interface BrowseGenre extends Genre { + seriesCount: number; + chapterCount: number; +} diff --git a/UI/Web/src/app/_models/person/browse-person.ts b/UI/Web/src/app/_models/metadata/browse/browse-person.ts similarity index 52% rename from UI/Web/src/app/_models/person/browse-person.ts rename to UI/Web/src/app/_models/metadata/browse/browse-person.ts index aeddac7cd..886f9455b 100644 --- a/UI/Web/src/app/_models/person/browse-person.ts +++ b/UI/Web/src/app/_models/metadata/browse/browse-person.ts @@ -1,6 +1,6 @@ -import {Person} from "../metadata/person"; +import {Person} from "../person"; export interface BrowsePerson extends Person { seriesCount: number; - issueCount: number; + chapterCount: number; } diff --git a/UI/Web/src/app/_models/metadata/browse/browse-tag.ts b/UI/Web/src/app/_models/metadata/browse/browse-tag.ts new file mode 100644 index 000000000..4d87370ee --- /dev/null +++ b/UI/Web/src/app/_models/metadata/browse/browse-tag.ts @@ -0,0 +1,6 @@ +import {Tag} from "../../tag"; + +export interface BrowseTag extends Tag { + seriesCount: number; + chapterCount: number; +} diff --git a/UI/Web/src/app/_models/metadata/language.ts b/UI/Web/src/app/_models/metadata/language.ts index 8b68c7233..28ab2b598 100644 --- a/UI/Web/src/app/_models/metadata/language.ts +++ b/UI/Web/src/app/_models/metadata/language.ts @@ -4,7 +4,10 @@ export interface Language { } export interface KavitaLocale { - fileName: string; // isoCode aka what maps to the file on disk and what transloco loads + /** + * isoCode aka what maps to the file on disk and what transloco loads + */ + fileName: string; renderName: string; translationCompletion: number; isRtL: boolean; diff --git a/UI/Web/src/app/_models/metadata/person.ts b/UI/Web/src/app/_models/metadata/person.ts index 6b098de19..efc8df914 100644 --- a/UI/Web/src/app/_models/metadata/person.ts +++ b/UI/Web/src/app/_models/metadata/person.ts @@ -2,7 +2,6 @@ import {IHasCover} from "../common/i-has-cover"; export enum PersonRole { Other = 1, - Artist = 2, Writer = 3, Penciller = 4, Inker = 5, @@ -32,3 +31,22 @@ export interface Person extends IHasCover { primaryColor: string; secondaryColor: string; } + +/** + * Excludes Other as it's not in use + */ +export const allPeopleRoles = [ + PersonRole.Writer, + PersonRole.Penciller, + PersonRole.Inker, + PersonRole.Colorist, + PersonRole.Letterer, + PersonRole.CoverArtist, + PersonRole.Editor, + PersonRole.Publisher, + PersonRole.Character, + PersonRole.Translator, + PersonRole.Imprint, + PersonRole.Team, + PersonRole.Location +] diff --git a/UI/Web/src/app/_models/metadata/series-filter.ts b/UI/Web/src/app/_models/metadata/series-filter.ts index 7d043aa3c..7875732b7 100644 --- a/UI/Web/src/app/_models/metadata/series-filter.ts +++ b/UI/Web/src/app/_models/metadata/series-filter.ts @@ -1,5 +1,5 @@ import {MangaFormat} from "../manga-format"; -import {SeriesFilterV2} from "./v2/series-filter-v2"; +import {FilterV2} from "./v2/filter-v2"; export interface FilterItem { title: string; @@ -7,10 +7,6 @@ export interface FilterItem { selected: boolean; } -export interface SortOptions { - sortField: SortField; - isAscending: boolean; -} export enum SortField { SortName = 1, @@ -27,7 +23,7 @@ export enum SortField { Random = 9 } -export const allSortFields = Object.keys(SortField) +export const allSeriesSortFields = Object.keys(SortField) .filter(key => !isNaN(Number(key)) && parseInt(key, 10) >= 0) .map(key => parseInt(key, 10)) as SortField[]; @@ -54,8 +50,8 @@ export const mangaFormatFilters = [ } ]; -export interface FilterEvent { - filterV2: SeriesFilterV2; +export interface FilterEvent { + filterV2: FilterV2; isFirst: boolean; } diff --git a/UI/Web/src/app/_models/metadata/v2/browse-person-filter.ts b/UI/Web/src/app/_models/metadata/v2/browse-person-filter.ts new file mode 100644 index 000000000..bb5edc9ce --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/browse-person-filter.ts @@ -0,0 +1,8 @@ +import {PersonRole} from "../person"; +import {PersonSortOptions} from "./sort-options"; + +export interface BrowsePersonFilter { + roles: Array; + query?: string; + sortOptions?: PersonSortOptions; +} diff --git a/UI/Web/src/app/_models/metadata/v2/filter-field.ts b/UI/Web/src/app/_models/metadata/v2/filter-field.ts index 08005d5c8..eeb8c7853 100644 --- a/UI/Web/src/app/_models/metadata/v2/filter-field.ts +++ b/UI/Web/src/app/_models/metadata/v2/filter-field.ts @@ -48,7 +48,7 @@ const enumArray = Object.keys(FilterField) enumArray.sort((a, b) => a.value.localeCompare(b.value)); -export const allFields = enumArray +export const allSeriesFilterFields = enumArray .map(key => parseInt(key.key, 10))as FilterField[]; export const allPeople = [ @@ -66,7 +66,6 @@ export const allPeople = [ export const personRoleForFilterField = (role: PersonRole) => { switch (role) { - case PersonRole.Artist: return FilterField.CoverArtist; case PersonRole.Character: return FilterField.Characters; case PersonRole.Colorist: return FilterField.Colorist; case PersonRole.CoverArtist: return FilterField.CoverArtist; diff --git a/UI/Web/src/app/_models/metadata/v2/filter-statement.ts b/UI/Web/src/app/_models/metadata/v2/filter-statement.ts index d031927a2..b14fe564d 100644 --- a/UI/Web/src/app/_models/metadata/v2/filter-statement.ts +++ b/UI/Web/src/app/_models/metadata/v2/filter-statement.ts @@ -1,8 +1,7 @@ -import { FilterComparison } from "./filter-comparison"; -import { FilterField } from "./filter-field"; +import {FilterComparison} from "./filter-comparison"; -export interface FilterStatement { +export interface FilterStatement { comparison: FilterComparison; - field: FilterField; + field: T; value: string; -} \ No newline at end of file +} diff --git a/UI/Web/src/app/_models/metadata/v2/filter-v2.ts b/UI/Web/src/app/_models/metadata/v2/filter-v2.ts new file mode 100644 index 000000000..77c064450 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/filter-v2.ts @@ -0,0 +1,11 @@ +import {FilterStatement} from "./filter-statement"; +import {FilterCombination} from "./filter-combination"; +import {SortOptions} from "./sort-options"; + +export interface FilterV2 { + name?: string; + statements: Array>; + combination: FilterCombination; + sortOptions?: SortOptions; + limitTo: number; +} diff --git a/UI/Web/src/app/_models/metadata/v2/person-filter-field.ts b/UI/Web/src/app/_models/metadata/v2/person-filter-field.ts new file mode 100644 index 000000000..6bfb5a0c1 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/person-filter-field.ts @@ -0,0 +1,12 @@ +export enum PersonFilterField { + Role = 1, + Name = 2, + SeriesCount = 3, + ChapterCount = 4, +} + + +export const allPersonFilterFields = Object.keys(PersonFilterField) + .filter(key => !isNaN(Number(key)) && parseInt(key, 10) >= 0) + .map(key => parseInt(key, 10)) as PersonFilterField[]; + diff --git a/UI/Web/src/app/_models/metadata/v2/person-sort-field.ts b/UI/Web/src/app/_models/metadata/v2/person-sort-field.ts new file mode 100644 index 000000000..6bcb66925 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/person-sort-field.ts @@ -0,0 +1,9 @@ +export enum PersonSortField { + Name = 1, + SeriesCount = 2, + ChapterCount = 3 +} + +export const allPersonSortFields = Object.keys(PersonSortField) + .filter(key => !isNaN(Number(key)) && parseInt(key, 10) >= 0) + .map(key => parseInt(key, 10)) as PersonSortField[]; diff --git a/UI/Web/src/app/_models/metadata/v2/series-filter-v2.ts b/UI/Web/src/app/_models/metadata/v2/series-filter-v2.ts deleted file mode 100644 index c13244644..000000000 --- a/UI/Web/src/app/_models/metadata/v2/series-filter-v2.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { SortOptions } from "../series-filter"; -import {FilterStatement} from "./filter-statement"; -import {FilterCombination} from "./filter-combination"; - -export interface SeriesFilterV2 { - name?: string; - statements: Array; - combination: FilterCombination; - sortOptions?: SortOptions; - limitTo: number; -} diff --git a/UI/Web/src/app/_models/metadata/v2/sort-options.ts b/UI/Web/src/app/_models/metadata/v2/sort-options.ts new file mode 100644 index 000000000..ed68d6b9d --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/sort-options.ts @@ -0,0 +1,17 @@ +import {PersonSortField} from "./person-sort-field"; + +/** + * Series-based Sort options + */ +export interface SortOptions { + sortField: TSort; + isAscending: boolean; +} + +/** + * Person-based Sort Options + */ +export interface PersonSortOptions { + sortField: PersonSortField; + isAscending: boolean; +} diff --git a/UI/Web/src/app/_models/preferences/book-theme.ts b/UI/Web/src/app/_models/preferences/book-theme.ts index b6e37f6e4..cb321c110 100644 --- a/UI/Web/src/app/_models/preferences/book-theme.ts +++ b/UI/Web/src/app/_models/preferences/book-theme.ts @@ -1,7 +1,7 @@ -import { ThemeProvider } from "./site-theme"; +import {ThemeProvider} from "./site-theme"; /** - * Theme for the the book reader contents + * Theme for the book reader contents */ export interface BookTheme { name: string; diff --git a/UI/Web/src/app/_models/preferences/preferences.ts b/UI/Web/src/app/_models/preferences/preferences.ts index 1dd5731e5..886c570e2 100644 --- a/UI/Web/src/app/_models/preferences/preferences.ts +++ b/UI/Web/src/app/_models/preferences/preferences.ts @@ -1,47 +1,7 @@ -import {LayoutMode} from 'src/app/manga-reader/_models/layout-mode'; -import {BookPageLayoutMode} from '../readers/book-page-layout-mode'; import {PageLayoutMode} from '../page-layout-mode'; -import {PageSplitOption} from './page-split-option'; -import {ReaderMode} from './reader-mode'; -import {ReadingDirection} from './reading-direction'; -import {ScalingOption} from './scaling-option'; import {SiteTheme} from './site-theme'; -import {WritingStyle} from "./writing-style"; -import {PdfTheme} from "./pdf-theme"; -import {PdfScrollMode} from "./pdf-scroll-mode"; -import {PdfLayoutMode} from "./pdf-layout-mode"; -import {PdfSpreadMode} from "./pdf-spread-mode"; export interface Preferences { - // Manga Reader - readingDirection: ReadingDirection; - scalingOption: ScalingOption; - pageSplitOption: PageSplitOption; - readerMode: ReaderMode; - autoCloseMenu: boolean; - layoutMode: LayoutMode; - backgroundColor: string; - showScreenHints: boolean; - emulateBook: boolean; - swipeToPaginate: boolean; - allowAutomaticWebtoonReaderDetection: boolean; - - // Book Reader - bookReaderMargin: number; - bookReaderLineSpacing: number; - bookReaderFontSize: number; - bookReaderFontFamily: string; - bookReaderTapToPaginate: boolean; - bookReaderReadingDirection: ReadingDirection; - bookReaderWritingStyle: WritingStyle; - bookReaderThemeName: string; - bookReaderLayoutMode: BookPageLayoutMode; - bookReaderImmersiveMode: boolean; - - // PDF Reader - pdfTheme: PdfTheme; - pdfScrollMode: PdfScrollMode; - pdfSpreadMode: PdfSpreadMode; // Global theme: SiteTheme; @@ -58,15 +18,3 @@ export interface Preferences { wantToReadSync: boolean; } -export const readingDirections = [{text: 'left-to-right', value: ReadingDirection.LeftToRight}, {text: 'right-to-left', value: ReadingDirection.RightToLeft}]; -export const bookWritingStyles = [{text: 'horizontal', value: WritingStyle.Horizontal}, {text: 'vertical', value: WritingStyle.Vertical}]; -export const scalingOptions = [{text: 'automatic', value: ScalingOption.Automatic}, {text: 'fit-to-height', value: ScalingOption.FitToHeight}, {text: 'fit-to-width', value: ScalingOption.FitToWidth}, {text: 'original', value: ScalingOption.Original}]; -export const pageSplitOptions = [{text: 'fit-to-screen', value: PageSplitOption.FitSplit}, {text: 'right-to-left', value: PageSplitOption.SplitRightToLeft}, {text: 'left-to-right', value: PageSplitOption.SplitLeftToRight}, {text: 'no-split', value: PageSplitOption.NoSplit}]; -export const readingModes = [{text: 'left-to-right', value: ReaderMode.LeftRight}, {text: 'up-to-down', value: ReaderMode.UpDown}, {text: 'webtoon', value: ReaderMode.Webtoon}]; -export const layoutModes = [{text: 'single', value: LayoutMode.Single}, {text: 'double', value: LayoutMode.Double}, {text: 'double-manga', value: LayoutMode.DoubleReversed}]; // TODO: Build this, {text: 'Double (No Cover)', value: LayoutMode.DoubleNoCover} -export const bookLayoutModes = [{text: 'scroll', value: BookPageLayoutMode.Default}, {text: '1-column', value: BookPageLayoutMode.Column1}, {text: '2-column', value: BookPageLayoutMode.Column2}]; -export const pageLayoutModes = [{text: 'cards', value: PageLayoutMode.Cards}, {text: 'list', value: PageLayoutMode.List}]; -export const pdfLayoutModes = [{text: 'pdf-multiple', value: PdfLayoutMode.Multiple}, {text: 'pdf-book', value: PdfLayoutMode.Book}]; -export const pdfScrollModes = [{text: 'pdf-vertical', value: PdfScrollMode.Vertical}, {text: 'pdf-horizontal', value: PdfScrollMode.Horizontal}, {text: 'pdf-page', value: PdfScrollMode.Page}]; -export const pdfSpreadModes = [{text: 'pdf-none', value: PdfSpreadMode.None}, {text: 'pdf-odd', value: PdfSpreadMode.Odd}, {text: 'pdf-even', value: PdfSpreadMode.Even}]; -export const pdfThemes = [{text: 'pdf-light', value: PdfTheme.Light}, {text: 'pdf-dark', value: PdfTheme.Dark}]; diff --git a/UI/Web/src/app/_models/preferences/reading-profiles.ts b/UI/Web/src/app/_models/preferences/reading-profiles.ts new file mode 100644 index 000000000..dad02946f --- /dev/null +++ b/UI/Web/src/app/_models/preferences/reading-profiles.ts @@ -0,0 +1,80 @@ +import {LayoutMode} from 'src/app/manga-reader/_models/layout-mode'; +import {BookPageLayoutMode} from '../readers/book-page-layout-mode'; +import {PageLayoutMode} from '../page-layout-mode'; +import {PageSplitOption} from './page-split-option'; +import {ReaderMode} from './reader-mode'; +import {ReadingDirection} from './reading-direction'; +import {ScalingOption} from './scaling-option'; +import {WritingStyle} from "./writing-style"; +import {PdfTheme} from "./pdf-theme"; +import {PdfScrollMode} from "./pdf-scroll-mode"; +import {PdfLayoutMode} from "./pdf-layout-mode"; +import {PdfSpreadMode} from "./pdf-spread-mode"; +import {Series} from "../series"; +import {Library} from "../library/library"; +import {UserBreakpoint} from "../../shared/_services/utility.service"; + +export enum ReadingProfileKind { + Default = 0, + User = 1, + Implicit = 2, +} + +export interface ReadingProfile { + + id: number; + name: string; + normalizedName: string; + kind: ReadingProfileKind; + + // Manga Reader + readingDirection: ReadingDirection; + scalingOption: ScalingOption; + pageSplitOption: PageSplitOption; + readerMode: ReaderMode; + autoCloseMenu: boolean; + layoutMode: LayoutMode; + backgroundColor: string; + showScreenHints: boolean; + emulateBook: boolean; + swipeToPaginate: boolean; + allowAutomaticWebtoonReaderDetection: boolean; + widthOverride?: number; + disableWidthOverride: UserBreakpoint; + + // Book Reader + bookReaderMargin: number; + bookReaderLineSpacing: number; + bookReaderFontSize: number; + bookReaderFontFamily: string; + bookReaderTapToPaginate: boolean; + bookReaderReadingDirection: ReadingDirection; + bookReaderWritingStyle: WritingStyle; + bookReaderThemeName: string; + bookReaderLayoutMode: BookPageLayoutMode; + bookReaderImmersiveMode: boolean; + + // PDF Reader + pdfTheme: PdfTheme; + pdfScrollMode: PdfScrollMode; + pdfSpreadMode: PdfSpreadMode; + + // relations + seriesIds: number[]; + libraryIds: number[]; + +} + +export const readingDirections = [{text: 'left-to-right', value: ReadingDirection.LeftToRight}, {text: 'right-to-left', value: ReadingDirection.RightToLeft}]; +export const bookWritingStyles = [{text: 'horizontal', value: WritingStyle.Horizontal}, {text: 'vertical', value: WritingStyle.Vertical}]; +export const scalingOptions = [{text: 'automatic', value: ScalingOption.Automatic}, {text: 'fit-to-height', value: ScalingOption.FitToHeight}, {text: 'fit-to-width', value: ScalingOption.FitToWidth}, {text: 'original', value: ScalingOption.Original}]; +export const pageSplitOptions = [{text: 'fit-to-screen', value: PageSplitOption.FitSplit}, {text: 'right-to-left', value: PageSplitOption.SplitRightToLeft}, {text: 'left-to-right', value: PageSplitOption.SplitLeftToRight}, {text: 'no-split', value: PageSplitOption.NoSplit}]; +export const readingModes = [{text: 'left-to-right', value: ReaderMode.LeftRight}, {text: 'up-to-down', value: ReaderMode.UpDown}, {text: 'webtoon', value: ReaderMode.Webtoon}]; +export const layoutModes = [{text: 'single', value: LayoutMode.Single}, {text: 'double', value: LayoutMode.Double}, {text: 'double-manga', value: LayoutMode.DoubleReversed}]; // TODO: Build this, {text: 'Double (No Cover)', value: LayoutMode.DoubleNoCover} +export const bookLayoutModes = [{text: 'scroll', value: BookPageLayoutMode.Default}, {text: '1-column', value: BookPageLayoutMode.Column1}, {text: '2-column', value: BookPageLayoutMode.Column2}]; +export const pageLayoutModes = [{text: 'cards', value: PageLayoutMode.Cards}, {text: 'list', value: PageLayoutMode.List}]; +export const pdfLayoutModes = [{text: 'pdf-multiple', value: PdfLayoutMode.Multiple}, {text: 'pdf-book', value: PdfLayoutMode.Book}]; +export const pdfScrollModes = [{text: 'pdf-vertical', value: PdfScrollMode.Vertical}, {text: 'pdf-horizontal', value: PdfScrollMode.Horizontal}, {text: 'pdf-page', value: PdfScrollMode.Page}]; +export const pdfSpreadModes = [{text: 'pdf-none', value: PdfSpreadMode.None}, {text: 'pdf-odd', value: PdfSpreadMode.Odd}, {text: 'pdf-even', value: PdfSpreadMode.Even}]; +export const pdfThemes = [{text: 'pdf-light', value: PdfTheme.Light}, {text: 'pdf-dark', value: PdfTheme.Dark}]; +export const breakPoints = [UserBreakpoint.Never, UserBreakpoint.Mobile, UserBreakpoint.Tablet, UserBreakpoint.Desktop] diff --git a/UI/Web/src/app/_models/wiki.ts b/UI/Web/src/app/_models/wiki.ts index 21b669f0c..a01267cf3 100644 --- a/UI/Web/src/app/_models/wiki.ts +++ b/UI/Web/src/app/_models/wiki.ts @@ -20,5 +20,6 @@ export enum WikiLink { UpdateNative = 'https://wiki.kavitareader.com/guides/updating/updating-native', UpdateDocker = 'https://wiki.kavitareader.com/guides/updating/updating-docker', OpdsClients = 'https://wiki.kavitareader.com/guides/features/opds/#opds-capable-clients', - Guides = 'https://wiki.kavitareader.com/guides' + Guides = 'https://wiki.kavitareader.com/guides', + ReadingProfiles = "https://wiki.kavitareader.com/guides/user-settings/reading-profiles/", } diff --git a/UI/Web/src/app/_pipes/breakpoint.pipe.ts b/UI/Web/src/app/_pipes/breakpoint.pipe.ts new file mode 100644 index 000000000..1897b773c --- /dev/null +++ b/UI/Web/src/app/_pipes/breakpoint.pipe.ts @@ -0,0 +1,25 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {translate} from "@jsverse/transloco"; +import {UserBreakpoint} from "../shared/_services/utility.service"; + +@Pipe({ + name: 'breakpoint' +}) +export class BreakpointPipe implements PipeTransform { + + transform(value: UserBreakpoint): string { + const v = parseInt(value + '', 10) as UserBreakpoint; + switch (v) { + case UserBreakpoint.Never: + return translate('breakpoint-pipe.never'); + case UserBreakpoint.Mobile: + return translate('breakpoint-pipe.mobile'); + case UserBreakpoint.Tablet: + return translate('breakpoint-pipe.tablet'); + case UserBreakpoint.Desktop: + return translate('breakpoint-pipe.desktop'); + } + throw new Error("unknown breakpoint value: " + value); + } + +} diff --git a/UI/Web/src/app/_pipes/browse-title.pipe.ts b/UI/Web/src/app/_pipes/browse-title.pipe.ts new file mode 100644 index 000000000..0495e8b8a --- /dev/null +++ b/UI/Web/src/app/_pipes/browse-title.pipe.ts @@ -0,0 +1,78 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {FilterField} from "../_models/metadata/v2/filter-field"; +import {translate} from "@jsverse/transloco"; + +/** + * Responsible for taking a filter field and value (as a string) and translating into a "Browse X" heading for All Series page + * Example: Genre & "Action" -> Browse Action + * Example: Artist & "Joe Shmo" -> Browse Joe Shmo Works + */ +@Pipe({ + name: 'browseTitle' +}) +export class BrowseTitlePipe implements PipeTransform { + + transform(field: FilterField, value: string): string { + switch (field) { + case FilterField.PublicationStatus: + return translate('browse-title-pipe.publication-status', {value}); + case FilterField.AgeRating: + return translate('browse-title-pipe.age-rating', {value}); + case FilterField.UserRating: + return translate('browse-title-pipe.user-rating', {value}); + case FilterField.Tags: + return translate('browse-title-pipe.tag', {value}); + case FilterField.Translators: + return translate('browse-title-pipe.translator', {value}); + case FilterField.Characters: + return translate('browse-title-pipe.character', {value}); + case FilterField.Publisher: + return translate('browse-title-pipe.publisher', {value}); + case FilterField.Editor: + return translate('browse-title-pipe.editor', {value}); + case FilterField.CoverArtist: + return translate('browse-title-pipe.artist', {value}); + case FilterField.Letterer: + return translate('browse-title-pipe.letterer', {value}); + case FilterField.Colorist: + return translate('browse-title-pipe.colorist', {value}); + case FilterField.Inker: + return translate('browse-title-pipe.inker', {value}); + case FilterField.Penciller: + return translate('browse-title-pipe.penciller', {value}); + case FilterField.Writers: + return translate('browse-title-pipe.writer', {value}); + case FilterField.Genres: + return translate('browse-title-pipe.genre', {value}); + case FilterField.Libraries: + return translate('browse-title-pipe.library', {value}); + case FilterField.Formats: + return translate('browse-title-pipe.format', {value}); + case FilterField.ReleaseYear: + return translate('browse-title-pipe.release-year', {value}); + case FilterField.Imprint: + return translate('browse-title-pipe.imprint', {value}); + case FilterField.Team: + return translate('browse-title-pipe.team', {value}); + case FilterField.Location: + return translate('browse-title-pipe.location', {value}); + + // These have no natural links in the app to demand a richer title experience + case FilterField.Languages: + case FilterField.CollectionTags: + case FilterField.ReadProgress: + case FilterField.ReadTime: + case FilterField.Path: + case FilterField.FilePath: + case FilterField.WantToRead: + case FilterField.ReadingDate: + case FilterField.AverageRating: + case FilterField.ReadLast: + case FilterField.Summary: + case FilterField.SeriesName: + default: + return ''; + } + } + +} diff --git a/UI/Web/src/app/_pipes/generic-filter-field.pipe.ts b/UI/Web/src/app/_pipes/generic-filter-field.pipe.ts new file mode 100644 index 000000000..f342c0034 --- /dev/null +++ b/UI/Web/src/app/_pipes/generic-filter-field.pipe.ts @@ -0,0 +1,108 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {FilterField} from "../_models/metadata/v2/filter-field"; +import {translate} from "@jsverse/transloco"; +import {ValidFilterEntity} from "../metadata-filter/filter-settings"; +import {PersonFilterField} from "../_models/metadata/v2/person-filter-field"; + +@Pipe({ + name: 'genericFilterField' +}) +export class GenericFilterFieldPipe implements PipeTransform { + + transform(value: T, entityType: ValidFilterEntity): string { + + switch (entityType) { + case "series": + return this.translateFilterField(value as FilterField); + case "person": + return this.translatePersonFilterField(value as PersonFilterField); + } + } + + private translatePersonFilterField(value: PersonFilterField) { + switch (value) { + case PersonFilterField.Role: + return translate('generic-filter-field-pipe.person-role'); + case PersonFilterField.Name: + return translate('generic-filter-field-pipe.person-name'); + case PersonFilterField.SeriesCount: + return translate('generic-filter-field-pipe.person-series-count'); + case PersonFilterField.ChapterCount: + return translate('generic-filter-field-pipe.person-chapter-count'); + } + } + + private translateFilterField(value: FilterField) { + switch (value) { + case FilterField.AgeRating: + return translate('filter-field-pipe.age-rating'); + case FilterField.Characters: + return translate('filter-field-pipe.characters'); + case FilterField.CollectionTags: + return translate('filter-field-pipe.collection-tags'); + case FilterField.Colorist: + return translate('filter-field-pipe.colorist'); + case FilterField.CoverArtist: + return translate('filter-field-pipe.cover-artist'); + case FilterField.Editor: + return translate('filter-field-pipe.editor'); + case FilterField.Formats: + return translate('filter-field-pipe.formats'); + case FilterField.Genres: + return translate('filter-field-pipe.genres'); + case FilterField.Inker: + return translate('filter-field-pipe.inker'); + case FilterField.Imprint: + return translate('filter-field-pipe.imprint'); + case FilterField.Team: + return translate('filter-field-pipe.team'); + case FilterField.Location: + return translate('filter-field-pipe.location'); + case FilterField.Languages: + return translate('filter-field-pipe.languages'); + case FilterField.Libraries: + return translate('filter-field-pipe.libraries'); + case FilterField.Letterer: + return translate('filter-field-pipe.letterer'); + case FilterField.PublicationStatus: + return translate('filter-field-pipe.publication-status'); + case FilterField.Penciller: + return translate('filter-field-pipe.penciller'); + case FilterField.Publisher: + return translate('filter-field-pipe.publisher'); + case FilterField.ReadProgress: + return translate('filter-field-pipe.read-progress'); + case FilterField.ReadTime: + return translate('filter-field-pipe.read-time'); + case FilterField.ReleaseYear: + return translate('filter-field-pipe.release-year'); + case FilterField.SeriesName: + return translate('filter-field-pipe.series-name'); + case FilterField.Summary: + return translate('filter-field-pipe.summary'); + case FilterField.Tags: + return translate('filter-field-pipe.tags'); + case FilterField.Translators: + return translate('filter-field-pipe.translators'); + case FilterField.UserRating: + return translate('filter-field-pipe.user-rating'); + case FilterField.Writers: + return translate('filter-field-pipe.writers'); + case FilterField.Path: + return translate('filter-field-pipe.path'); + case FilterField.FilePath: + return translate('filter-field-pipe.file-path'); + case FilterField.WantToRead: + return translate('filter-field-pipe.want-to-read'); + case FilterField.ReadingDate: + return translate('filter-field-pipe.read-date'); + case FilterField.ReadLast: + return translate('filter-field-pipe.read-last'); + case FilterField.AverageRating: + return translate('filter-field-pipe.average-rating'); + default: + throw new Error(`Invalid FilterField value: ${value}`); + } + } + +} diff --git a/UI/Web/src/app/_pipes/person-role.pipe.ts b/UI/Web/src/app/_pipes/person-role.pipe.ts index c1395ae5b..1b9ee2163 100644 --- a/UI/Web/src/app/_pipes/person-role.pipe.ts +++ b/UI/Web/src/app/_pipes/person-role.pipe.ts @@ -1,6 +1,6 @@ -import {inject, Pipe, PipeTransform} from '@angular/core'; -import { PersonRole } from '../_models/metadata/person'; -import {translate, TranslocoService} from "@jsverse/transloco"; +import {Pipe, PipeTransform} from '@angular/core'; +import {PersonRole} from '../_models/metadata/person'; +import {translate} from "@jsverse/transloco"; @Pipe({ name: 'personRole', @@ -10,8 +10,6 @@ export class PersonRolePipe implements PipeTransform { transform(value: PersonRole): string { switch (value) { - case PersonRole.Artist: - return translate('person-role-pipe.artist'); case PersonRole.Character: return translate('person-role-pipe.character'); case PersonRole.Colorist: diff --git a/UI/Web/src/app/_pipes/sort-field.pipe.ts b/UI/Web/src/app/_pipes/sort-field.pipe.ts index 13ff4f758..d032de9c8 100644 --- a/UI/Web/src/app/_pipes/sort-field.pipe.ts +++ b/UI/Web/src/app/_pipes/sort-field.pipe.ts @@ -1,6 +1,8 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import {SortField} from "../_models/metadata/series-filter"; import {TranslocoService} from "@jsverse/transloco"; +import {ValidFilterEntity} from "../metadata-filter/filter-settings"; +import {PersonSortField} from "../_models/metadata/v2/person-sort-field"; @Pipe({ name: 'sortField', @@ -11,7 +13,30 @@ export class SortFieldPipe implements PipeTransform { constructor(private translocoService: TranslocoService) { } - transform(value: SortField): string { + transform(value: T, entityType: ValidFilterEntity): string { + + switch (entityType) { + case 'series': + return this.seriesSortFields(value as SortField); + case 'person': + return this.personSortFields(value as PersonSortField); + + } + } + + private personSortFields(value: PersonSortField) { + switch (value) { + case PersonSortField.Name: + return this.translocoService.translate('sort-field-pipe.person-name'); + case PersonSortField.SeriesCount: + return this.translocoService.translate('sort-field-pipe.person-series-count'); + case PersonSortField.ChapterCount: + return this.translocoService.translate('sort-field-pipe.person-chapter-count'); + + } + } + + private seriesSortFields(value: SortField) { switch (value) { case SortField.SortName: return this.translocoService.translate('sort-field-pipe.sort-name'); @@ -32,7 +57,6 @@ export class SortFieldPipe implements PipeTransform { case SortField.Random: return this.translocoService.translate('sort-field-pipe.random'); } - } } diff --git a/UI/Web/src/app/_resolvers/reading-profile.resolver.ts b/UI/Web/src/app/_resolvers/reading-profile.resolver.ts new file mode 100644 index 000000000..1d28adf95 --- /dev/null +++ b/UI/Web/src/app/_resolvers/reading-profile.resolver.ts @@ -0,0 +1,18 @@ +import {Injectable} from '@angular/core'; +import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router'; +import {Observable} from 'rxjs'; +import {ReadingProfileService} from "../_services/reading-profile.service"; + +@Injectable({ + providedIn: 'root' +}) +export class ReadingProfileResolver implements Resolve { + + constructor(private readingProfileService: ReadingProfileService) {} + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + // Extract seriesId from route params or parent route + const seriesId = route.params['seriesId'] || route.parent?.params['seriesId']; + return this.readingProfileService.getForSeries(seriesId); + } +} diff --git a/UI/Web/src/app/_resolvers/url-filter.resolver.ts b/UI/Web/src/app/_resolvers/url-filter.resolver.ts new file mode 100644 index 000000000..16bc5c752 --- /dev/null +++ b/UI/Web/src/app/_resolvers/url-filter.resolver.ts @@ -0,0 +1,22 @@ +import {Injectable} from "@angular/core"; +import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from "@angular/router"; +import {Observable, of} from "rxjs"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; +import {FilterUtilitiesService} from "../shared/_services/filter-utilities.service"; + +/** + * Checks the url for a filter and resolves one if applicable, otherwise returns null. + * It is up to the consumer to cast appropriately. + */ +@Injectable({ + providedIn: 'root' +}) +export class UrlFilterResolver implements Resolve { + + constructor(private filterUtilitiesService: FilterUtilitiesService) {} + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + if (!state.url.includes('?')) return of(null); + return this.filterUtilitiesService.decodeFilter(state.url.split('?')[1]); + } +} diff --git a/UI/Web/src/app/_routes/all-series-routing.module.ts b/UI/Web/src/app/_routes/all-series-routing.module.ts index d9dfaaf96..5c4804251 100644 --- a/UI/Web/src/app/_routes/all-series-routing.module.ts +++ b/UI/Web/src/app/_routes/all-series-routing.module.ts @@ -1,7 +1,13 @@ -import { Routes } from "@angular/router"; -import { AllSeriesComponent } from "../all-series/_components/all-series/all-series.component"; +import {Routes} from "@angular/router"; +import {AllSeriesComponent} from "../all-series/_components/all-series/all-series.component"; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ - {path: '', component: AllSeriesComponent, pathMatch: 'full'}, + {path: '', component: AllSeriesComponent, pathMatch: 'full', + runGuardsAndResolvers: 'always', + resolve: { + filter: UrlFilterResolver + } + }, ]; diff --git a/UI/Web/src/app/_routes/book-reader.router.module.ts b/UI/Web/src/app/_routes/book-reader.router.module.ts index 5083c2d4a..c9d6262ad 100644 --- a/UI/Web/src/app/_routes/book-reader.router.module.ts +++ b/UI/Web/src/app/_routes/book-reader.router.module.ts @@ -1,10 +1,14 @@ -import { Routes } from '@angular/router'; -import { BookReaderComponent } from '../book-reader/_components/book-reader/book-reader.component'; +import {Routes} from '@angular/router'; +import {BookReaderComponent} from '../book-reader/_components/book-reader/book-reader.component'; +import {ReadingProfileResolver} from "../_resolvers/reading-profile.resolver"; export const routes: Routes = [ { path: ':chapterId', component: BookReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } } ]; diff --git a/UI/Web/src/app/_routes/bookmark-routing.module.ts b/UI/Web/src/app/_routes/bookmark-routing.module.ts index 6da971e08..2c7c52036 100644 --- a/UI/Web/src/app/_routes/bookmark-routing.module.ts +++ b/UI/Web/src/app/_routes/bookmark-routing.module.ts @@ -1,6 +1,12 @@ -import { Routes } from "@angular/router"; -import { BookmarksComponent } from "../bookmark/_components/bookmarks/bookmarks.component"; +import {Routes} from "@angular/router"; +import {BookmarksComponent} from "../bookmark/_components/bookmarks/bookmarks.component"; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ - {path: '', component: BookmarksComponent, pathMatch: 'full'}, + {path: '', component: BookmarksComponent, pathMatch: 'full', + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, ]; diff --git a/UI/Web/src/app/_routes/browse-authors-routing.module.ts b/UI/Web/src/app/_routes/browse-authors-routing.module.ts deleted file mode 100644 index e7aab1b57..000000000 --- a/UI/Web/src/app/_routes/browse-authors-routing.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Routes } from "@angular/router"; -import { AllSeriesComponent } from "../all-series/_components/all-series/all-series.component"; -import {BrowseAuthorsComponent} from "../browse-people/browse-authors.component"; - - -export const routes: Routes = [ - {path: '', component: BrowseAuthorsComponent, pathMatch: 'full'}, -]; diff --git a/UI/Web/src/app/_routes/browse-routing.module.ts b/UI/Web/src/app/_routes/browse-routing.module.ts new file mode 100644 index 000000000..be96e8193 --- /dev/null +++ b/UI/Web/src/app/_routes/browse-routing.module.ts @@ -0,0 +1,24 @@ +import {Routes} from "@angular/router"; +import {BrowsePeopleComponent} from "../browse/browse-people/browse-people.component"; +import {BrowseGenresComponent} from "../browse/browse-genres/browse-genres.component"; +import {BrowseTagsComponent} from "../browse/browse-tags/browse-tags.component"; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; + + +export const routes: Routes = [ + // Legacy route + {path: 'authors', component: BrowsePeopleComponent, pathMatch: 'full', + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, + {path: 'people', component: BrowsePeopleComponent, pathMatch: 'full', + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, + {path: 'genres', component: BrowseGenresComponent, pathMatch: 'full'}, + {path: 'tags', component: BrowseTagsComponent, pathMatch: 'full'}, +]; diff --git a/UI/Web/src/app/_routes/collections-routing.module.ts b/UI/Web/src/app/_routes/collections-routing.module.ts index 80510c8f6..2b3b0ffd7 100644 --- a/UI/Web/src/app/_routes/collections-routing.module.ts +++ b/UI/Web/src/app/_routes/collections-routing.module.ts @@ -1,9 +1,15 @@ -import { Routes } from '@angular/router'; -import { AllCollectionsComponent } from '../collections/_components/all-collections/all-collections.component'; -import { CollectionDetailComponent } from '../collections/_components/collection-detail/collection-detail.component'; +import {Routes} from '@angular/router'; +import {AllCollectionsComponent} from '../collections/_components/all-collections/all-collections.component'; +import {CollectionDetailComponent} from '../collections/_components/collection-detail/collection-detail.component'; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ {path: '', component: AllCollectionsComponent, pathMatch: 'full'}, - {path: ':id', component: CollectionDetailComponent}, + {path: ':id', component: CollectionDetailComponent, + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, ]; diff --git a/UI/Web/src/app/_routes/library-detail-routing.module.ts b/UI/Web/src/app/_routes/library-detail-routing.module.ts index 04cb3c9dd..3c09a71ee 100644 --- a/UI/Web/src/app/_routes/library-detail-routing.module.ts +++ b/UI/Web/src/app/_routes/library-detail-routing.module.ts @@ -1,7 +1,8 @@ -import { Routes } from '@angular/router'; -import { AuthGuard } from '../_guards/auth.guard'; -import { LibraryAccessGuard } from '../_guards/library-access.guard'; -import { LibraryDetailComponent } from '../library-detail/library-detail.component'; +import {Routes} from '@angular/router'; +import {AuthGuard} from '../_guards/auth.guard'; +import {LibraryAccessGuard} from '../_guards/library-access.guard'; +import {LibraryDetailComponent} from '../library-detail/library-detail.component'; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ @@ -9,12 +10,18 @@ export const routes: Routes = [ path: ':libraryId', runGuardsAndResolvers: 'always', canActivate: [AuthGuard, LibraryAccessGuard], - component: LibraryDetailComponent + component: LibraryDetailComponent, + resolve: { + filter: UrlFilterResolver + }, }, { path: '', runGuardsAndResolvers: 'always', canActivate: [AuthGuard, LibraryAccessGuard], - component: LibraryDetailComponent - } + component: LibraryDetailComponent, + resolve: { + filter: UrlFilterResolver + }, + }, ]; diff --git a/UI/Web/src/app/_routes/manga-reader.router.module.ts b/UI/Web/src/app/_routes/manga-reader.router.module.ts index 04ff77b3c..e479e8ae6 100644 --- a/UI/Web/src/app/_routes/manga-reader.router.module.ts +++ b/UI/Web/src/app/_routes/manga-reader.router.module.ts @@ -1,15 +1,22 @@ -import { Routes } from '@angular/router'; -import { MangaReaderComponent } from '../manga-reader/_components/manga-reader/manga-reader.component'; +import {Routes} from '@angular/router'; +import {MangaReaderComponent} from '../manga-reader/_components/manga-reader/manga-reader.component'; +import {ReadingProfileResolver} from "../_resolvers/reading-profile.resolver"; export const routes: Routes = [ { path: ':chapterId', - component: MangaReaderComponent + component: MangaReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } }, { // This will allow the MangaReader to have a list to use for next/prev chapters rather than natural sort order path: ':chapterId/list/:listId', - component: MangaReaderComponent + component: MangaReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } } ]; diff --git a/UI/Web/src/app/_routes/pdf-reader.router.module.ts b/UI/Web/src/app/_routes/pdf-reader.router.module.ts index a55699280..7cb9f68e2 100644 --- a/UI/Web/src/app/_routes/pdf-reader.router.module.ts +++ b/UI/Web/src/app/_routes/pdf-reader.router.module.ts @@ -1,9 +1,13 @@ -import { Routes } from '@angular/router'; -import { PdfReaderComponent } from '../pdf-reader/_components/pdf-reader/pdf-reader.component'; +import {Routes} from '@angular/router'; +import {PdfReaderComponent} from '../pdf-reader/_components/pdf-reader/pdf-reader.component'; +import {ReadingProfileResolver} from "../_resolvers/reading-profile.resolver"; export const routes: Routes = [ { path: ':chapterId', component: PdfReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } } ]; diff --git a/UI/Web/src/app/_routes/want-to-read-routing.module.ts b/UI/Web/src/app/_routes/want-to-read-routing.module.ts index b3301d9f9..b593172c0 100644 --- a/UI/Web/src/app/_routes/want-to-read-routing.module.ts +++ b/UI/Web/src/app/_routes/want-to-read-routing.module.ts @@ -1,6 +1,10 @@ -import { Routes } from '@angular/router'; -import { WantToReadComponent } from '../want-to-read/_components/want-to-read/want-to-read.component'; +import {Routes} from '@angular/router'; +import {WantToReadComponent} from '../want-to-read/_components/want-to-read/want-to-read.component'; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ - {path: '', component: WantToReadComponent, pathMatch: 'full'}, + {path: '', component: WantToReadComponent, pathMatch: 'full', runGuardsAndResolvers: 'always', resolve: { + filter: UrlFilterResolver + } + }, ]; diff --git a/UI/Web/src/app/_services/account.service.ts b/UI/Web/src/app/_services/account.service.ts index 6b8cdc243..f1f91143f 100644 --- a/UI/Web/src/app/_services/account.service.ts +++ b/UI/Web/src/app/_services/account.service.ts @@ -102,11 +102,22 @@ export class AccountService { return true; } + /** + * If the user has any role in the restricted roles array or is an Admin + * @param user + * @param roles + * @param restrictedRoles + */ hasAnyRole(user: User, roles: Array, restrictedRoles: Array = []) { if (!user || !user.roles) { return false; } + // If the user is an admin, they have the role + if (this.hasAdminRole(user)) { + return true; + } + // If restricted roles are provided and the user has any of them, deny access if (restrictedRoles.length > 0 && restrictedRoles.some(role => user.roles.includes(role))) { return false; @@ -121,6 +132,33 @@ export class AccountService { return roles.some(role => user.roles.includes(role)); } + /** + * If User or Admin, will return false + * @param user + * @param restrictedRoles + */ + hasAnyRestrictedRole(user: User, restrictedRoles: Array = []) { + if (!user || !user.roles) { + return true; + } + + if (restrictedRoles.length === 0) { + return false; + } + + // If the user is an admin, they have the role + if (this.hasAdminRole(user)) { + return false; + } + + + if (restrictedRoles.length > 0 && restrictedRoles.some(role => user.roles.includes(role))) { + return true; + } + + return false; + } + hasAdminRole(user: User) { return user && user.roles.includes(Role.Admin); } diff --git a/UI/Web/src/app/_services/action-factory.service.ts b/UI/Web/src/app/_services/action-factory.service.ts index 61fee39ec..e5967bf24 100644 --- a/UI/Web/src/app/_services/action-factory.service.ts +++ b/UI/Web/src/app/_services/action-factory.service.ts @@ -122,6 +122,14 @@ export enum Action { * Merge two (or more?) entities */ Merge = 29, + /** + * Add to a reading profile + */ + SetReadingProfile = 30, + /** + * Remove the reading profile from the entity + */ + ClearReadingProfile = 31, } /** @@ -342,6 +350,37 @@ export class ActionFactoryService { requiredRoles: [Role.Admin], children: [], }, + { + action: Action.Submenu, + title: 'reading-profiles', + description: '', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [ + { + action: Action.SetReadingProfile, + title: 'set-reading-profile', + description: 'set-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + { + action: Action.ClearReadingProfile, + title: 'clear-reading-profile', + description: 'clear-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + ], + }, { action: Action.Submenu, title: 'others', @@ -528,7 +567,7 @@ export class ActionFactoryService { requiresAdmin: false, requiredRoles: [], children: [], - }, + } ], }, { @@ -555,6 +594,37 @@ export class ActionFactoryService { } ], }, + { + action: Action.Submenu, + title: 'reading-profiles', + description: '', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [ + { + action: Action.SetReadingProfile, + title: 'set-reading-profile', + description: 'set-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + { + action: Action.ClearReadingProfile, + title: 'clear-reading-profile', + description: 'clear-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + ], + }, { action: Action.Submenu, title: 'others', @@ -1047,7 +1117,10 @@ export class ActionFactoryService { if (action.children === null || action.children?.length === 0) return; - action.children?.forEach((childAction) => { + // Ensure action children are a copy of the parent (since parent does a shallow mapping) + action.children = action.children.map(d => { return {...d}; }); + + action.children.forEach((childAction) => { this.applyCallback(childAction, callback, shouldRenderFunc); }); } @@ -1055,10 +1128,13 @@ export class ActionFactoryService { public applyCallbackToList(list: Array>, callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender): Array> { + // Create a clone of the list to ensure we aren't affecting the default state const actions = list.map((a) => { return { ...a }; }); + actions.forEach((action) => this.applyCallback(action, callback, shouldRenderFunc)); + return actions; } diff --git a/UI/Web/src/app/_services/action.service.ts b/UI/Web/src/app/_services/action.service.ts index 37826b0e2..2328bf72e 100644 --- a/UI/Web/src/app/_services/action.service.ts +++ b/UI/Web/src/app/_services/action.service.ts @@ -31,6 +31,9 @@ import {ChapterService} from "./chapter.service"; import {VolumeService} from "./volume.service"; import {DefaultModalOptions} from "../_models/default-modal-options"; import {MatchSeriesModalComponent} from "../_single-module/match-series-modal/match-series-modal.component"; +import { + BulkSetReadingProfileModalComponent +} from "../cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component"; export type LibraryActionCallback = (library: Partial) => void; @@ -813,4 +816,56 @@ export class ActionService { }); } + /** + * Sets the reading profile for multiple series + * @param series + * @param callback + */ + setReadingProfileForMultiple(series: Array, callback?: BooleanActionCallback) { + if (this.readingListModalRef != null) { return; } + + this.readingListModalRef = this.modalService.open(BulkSetReadingProfileModalComponent, { scrollable: true, size: 'md', fullscreen: 'md' }); + this.readingListModalRef.componentInstance.seriesIds = series.map(s => s.id) + this.readingListModalRef.componentInstance.title = "" + + this.readingListModalRef.closed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(true); + } + }); + this.readingListModalRef.dismissed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(false); + } + }); + } + + /** + * Sets the reading profile for multiple series + * @param library + * @param callback + */ + setReadingProfileForLibrary(library: Library, callback?: BooleanActionCallback) { + if (this.readingListModalRef != null) { return; } + + this.readingListModalRef = this.modalService.open(BulkSetReadingProfileModalComponent, { scrollable: true, size: 'md', fullscreen: 'md' }); + this.readingListModalRef.componentInstance.libraryId = library.id; + this.readingListModalRef.componentInstance.title = "" + + this.readingListModalRef.closed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(true); + } + }); + this.readingListModalRef.dismissed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(false); + } + }); + } + } diff --git a/UI/Web/src/app/_services/filter.service.ts b/UI/Web/src/app/_services/filter.service.ts index e76c1926f..2b9681e90 100644 --- a/UI/Web/src/app/_services/filter.service.ts +++ b/UI/Web/src/app/_services/filter.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@angular/core'; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {Injectable} from '@angular/core'; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import {environment} from "../../environments/environment"; -import { HttpClient } from "@angular/common/http"; -import {JumpKey} from "../_models/jumpbar/jump-key"; +import {HttpClient} from "@angular/common/http"; import {SmartFilter} from "../_models/metadata/v2/smart-filter"; @Injectable({ @@ -13,7 +12,7 @@ export class FilterService { baseUrl = environment.apiUrl; constructor(private httpClient: HttpClient) { } - saveFilter(filter: SeriesFilterV2) { + saveFilter(filter: FilterV2) { return this.httpClient.post(this.baseUrl + 'filter/update', filter); } getAllFilters() { @@ -26,5 +25,4 @@ export class FilterService { renameSmartFilter(filter: SmartFilter) { return this.httpClient.post(this.baseUrl + `filter/rename?filterId=${filter.id}&name=${filter.name.trim()}`, {}); } - } diff --git a/UI/Web/src/app/_services/jumpbar.service.ts b/UI/Web/src/app/_services/jumpbar.service.ts index d9919ff57..48ca08705 100644 --- a/UI/Web/src/app/_services/jumpbar.service.ts +++ b/UI/Web/src/app/_services/jumpbar.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@angular/core'; -import { JumpKey } from '../_models/jumpbar/jump-key'; +import {Injectable} from '@angular/core'; +import {JumpKey} from '../_models/jumpbar/jump-key'; const keySize = 25; // Height of the JumpBar button @@ -105,14 +105,18 @@ export class JumpbarService { getJumpKeys(data :Array, keySelector: (data: any) => string) { const keys: {[key: string]: number} = {}; data.forEach(obj => { - let ch = keySelector(obj).charAt(0).toUpperCase(); - if (/\d|\#|!|%|@|\(|\)|\^|\.|_|\*/g.test(ch)) { - ch = '#'; + try { + let ch = keySelector(obj).charAt(0).toUpperCase(); + if (/\d|\#|!|%|@|\(|\)|\^|\.|_|\*/g.test(ch)) { + ch = '#'; + } + if (!keys.hasOwnProperty(ch)) { + keys[ch] = 0; + } + keys[ch] += 1; + } catch (e) { + console.error('Failed to calculate jump key for ', obj, e); } - if (!keys.hasOwnProperty(ch)) { - keys[ch] = 0; - } - keys[ch] += 1; }); return Object.keys(keys).map(k => { k = k.toUpperCase(); diff --git a/UI/Web/src/app/_services/metadata.service.ts b/UI/Web/src/app/_services/metadata.service.ts index 314e5c37b..fe0702219 100644 --- a/UI/Web/src/app/_services/metadata.service.ts +++ b/UI/Web/src/app/_services/metadata.service.ts @@ -1,33 +1,54 @@ -import {HttpClient} from '@angular/common/http'; -import {Injectable} from '@angular/core'; +import {HttpClient, HttpParams} from '@angular/common/http'; +import {inject, Injectable} from '@angular/core'; import {tap} from 'rxjs/operators'; -import {of} from 'rxjs'; +import {map, of} from 'rxjs'; import {environment} from 'src/environments/environment'; import {Genre} from '../_models/metadata/genre'; import {AgeRatingDto} from '../_models/metadata/age-rating-dto'; import {Language} from '../_models/metadata/language'; import {PublicationStatusDto} from '../_models/metadata/publication-status-dto'; -import {Person, PersonRole} from '../_models/metadata/person'; +import {allPeopleRoles, Person, PersonRole} from '../_models/metadata/person'; import {Tag} from '../_models/tag'; import {FilterComparison} from '../_models/metadata/v2/filter-comparison'; import {FilterField} from '../_models/metadata/v2/filter-field'; -import {SortField} from "../_models/metadata/series-filter"; +import {mangaFormatFilters, SortField} from "../_models/metadata/series-filter"; import {FilterCombination} from "../_models/metadata/v2/filter-combination"; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import {FilterStatement} from "../_models/metadata/v2/filter-statement"; import {SeriesDetailPlus} from "../_models/series-detail/series-detail-plus"; import {LibraryType} from "../_models/library/library"; import {IHasCast} from "../_models/common/i-has-cast"; import {TextResonse} from "../_types/text-response"; import {QueryContext} from "../_models/metadata/v2/query-context"; +import {AgeRatingPipe} from "../_pipes/age-rating.pipe"; +import {MangaFormatPipe} from "../_pipes/manga-format.pipe"; +import {TranslocoService} from "@jsverse/transloco"; +import {LibraryService} from './library.service'; +import {CollectionTagService} from "./collection-tag.service"; +import {PaginatedResult} from "../_models/pagination"; +import {UtilityService} from "../shared/_services/utility.service"; +import {BrowseGenre} from "../_models/metadata/browse/browse-genre"; +import {BrowseTag} from "../_models/metadata/browse/browse-tag"; +import {ValidFilterEntity} from "../metadata-filter/filter-settings"; +import {PersonFilterField} from "../_models/metadata/v2/person-filter-field"; +import {PersonRolePipe} from "../_pipes/person-role.pipe"; +import {PersonSortField} from "../_models/metadata/v2/person-sort-field"; @Injectable({ providedIn: 'root' }) export class MetadataService { + private readonly translocoService = inject(TranslocoService); + private readonly libraryService = inject(LibraryService); + private readonly collectionTagService = inject(CollectionTagService); + private readonly utilityService = inject(UtilityService); + baseUrl = environment.apiUrl; private validLanguages: Array = []; + private ageRatingPipe = new AgeRatingPipe(); + private mangaFormatPipe = new MangaFormatPipe(this.translocoService); + private personRolePipe = new PersonRolePipe(); constructor(private httpClient: HttpClient) { } @@ -74,6 +95,28 @@ export class MetadataService { return this.httpClient.get>(this.baseUrl + method); } + getGenreWithCounts(pageNum?: number, itemsPerPage?: number) { + let params = new HttpParams(); + params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); + + return this.httpClient.post>(this.baseUrl + 'metadata/genres-with-counts', {}, {observe: 'response', params}).pipe( + map((response: any) => { + return this.utilityService.createPaginatedResult(response) as PaginatedResult; + }) + ); + } + + getTagWithCounts(pageNum?: number, itemsPerPage?: number) { + let params = new HttpParams(); + params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); + + return this.httpClient.post>(this.baseUrl + 'metadata/tags-with-counts', {}, {observe: 'response', params}).pipe( + map((response: any) => { + return this.utilityService.createPaginatedResult(response) as PaginatedResult; + }) + ); + } + getAllLanguages(libraries?: Array) { let method = 'metadata/languages' if (libraries != undefined && libraries.length > 0) { @@ -110,19 +153,28 @@ export class MetadataService { return this.httpClient.get>(this.baseUrl + 'metadata/people-by-role?role=' + role); } - createDefaultFilterDto(): SeriesFilterV2 { + createDefaultFilterDto(entityType: ValidFilterEntity): FilterV2 { return { - statements: [] as FilterStatement[], + statements: [] as FilterStatement[], combination: FilterCombination.And, limitTo: 0, sortOptions: { isAscending: true, - sortField: SortField.SortName + sortField: (entityType === 'series' ? SortField.SortName : PersonSortField.Name) as TSort } }; } - createDefaultFilterStatement(field: FilterField = FilterField.SeriesName, comparison = FilterComparison.Equal, value = '') { + createDefaultFilterStatement(entityType: ValidFilterEntity) { + switch (entityType) { + case 'series': + return this.createFilterStatement(FilterField.SeriesName); + case 'person': + return this.createFilterStatement(PersonFilterField.Role, FilterComparison.Contains, `${PersonRole.CoverArtist},${PersonRole.Writer}`); + } + } + + createFilterStatement(field: T, comparison = FilterComparison.Equal, value = '') { return { comparison: comparison, field: field, @@ -130,7 +182,7 @@ export class MetadataService { }; } - updateFilter(arr: Array, index: number, filterStmt: FilterStatement) { + updateFilter(arr: Array>, index: number, filterStmt: FilterStatement) { arr[index].comparison = filterStmt.comparison; arr[index].field = filterStmt.field; arr[index].value = filterStmt.value ? filterStmt.value + '' : ''; @@ -140,8 +192,6 @@ export class MetadataService { switch (role) { case PersonRole.Other: break; - case PersonRole.Artist: - break; case PersonRole.CoverArtist: entity.coverArtists = persons; break; @@ -183,4 +233,85 @@ export class MetadataService { break; } } + + /** + * Used to get the underlying Options (for Metadata Filter Dropdowns) + * @param filterField + * @param entityType + */ + getOptionsForFilterField(filterField: T, entityType: ValidFilterEntity) { + + switch (entityType) { + case 'series': + return this.getSeriesOptionsForFilterField(filterField as FilterField); + case 'person': + return this.getPersonOptionsForFilterField(filterField as PersonFilterField); + } + } + + private getPersonOptionsForFilterField(field: PersonFilterField) { + switch (field) { + case PersonFilterField.Role: + return of(allPeopleRoles.map(r => {return {value: r, label: this.personRolePipe.transform(r)}})); + } + return of([]) + } + + private getSeriesOptionsForFilterField(field: FilterField) { + switch (field) { + case FilterField.PublicationStatus: + return this.getAllPublicationStatus().pipe(map(pubs => pubs.map(pub => { + return {value: pub.value, label: pub.title} + }))); + case FilterField.AgeRating: + return this.getAllAgeRatings().pipe(map(ratings => ratings.map(rating => { + return {value: rating.value, label: this.ageRatingPipe.transform(rating.value)} + }))); + case FilterField.Genres: + return this.getAllGenres().pipe(map(genres => genres.map(genre => { + return {value: genre.id, label: genre.title} + }))); + case FilterField.Languages: + return this.getAllLanguages().pipe(map(statuses => statuses.map(status => { + return {value: status.isoCode, label: status.title + ` (${status.isoCode})`} + }))); + case FilterField.Formats: + return of(mangaFormatFilters).pipe(map(statuses => statuses.map(status => { + return {value: status.value, label: this.mangaFormatPipe.transform(status.value)} + }))); + case FilterField.Libraries: + return this.libraryService.getLibraries().pipe(map(libs => libs.map(lib => { + return {value: lib.id, label: lib.name} + }))); + case FilterField.Tags: + return this.getAllTags().pipe(map(statuses => statuses.map(status => { + return {value: status.id, label: status.title} + }))); + case FilterField.CollectionTags: + return this.collectionTagService.allCollections().pipe(map(statuses => statuses.map(status => { + return {value: status.id, label: status.title} + }))); + case FilterField.Characters: return this.getPersonOptions(PersonRole.Character); + case FilterField.Colorist: return this.getPersonOptions(PersonRole.Colorist); + case FilterField.CoverArtist: return this.getPersonOptions(PersonRole.CoverArtist); + case FilterField.Editor: return this.getPersonOptions(PersonRole.Editor); + case FilterField.Inker: return this.getPersonOptions(PersonRole.Inker); + case FilterField.Letterer: return this.getPersonOptions(PersonRole.Letterer); + case FilterField.Penciller: return this.getPersonOptions(PersonRole.Penciller); + case FilterField.Publisher: return this.getPersonOptions(PersonRole.Publisher); + case FilterField.Imprint: return this.getPersonOptions(PersonRole.Imprint); + case FilterField.Team: return this.getPersonOptions(PersonRole.Team); + case FilterField.Location: return this.getPersonOptions(PersonRole.Location); + case FilterField.Translators: return this.getPersonOptions(PersonRole.Translator); + case FilterField.Writers: return this.getPersonOptions(PersonRole.Writer); + } + + return of([]); + } + + private getPersonOptions(role: PersonRole) { + return this.getAllPeopleByRole(role).pipe(map(people => people.map(person => { + return {value: person.id, label: person.name} + }))); + } } diff --git a/UI/Web/src/app/_services/person.service.ts b/UI/Web/src/app/_services/person.service.ts index 0ac58b178..fc9148135 100644 --- a/UI/Web/src/app/_services/person.service.ts +++ b/UI/Web/src/app/_services/person.service.ts @@ -6,9 +6,12 @@ import {PaginatedResult} from "../_models/pagination"; import {Series} from "../_models/series"; import {map} from "rxjs/operators"; import {UtilityService} from "../shared/_services/utility.service"; -import {BrowsePerson} from "../_models/person/browse-person"; +import {BrowsePerson} from "../_models/metadata/browse/browse-person"; import {StandaloneChapter} from "../_models/standalone-chapter"; import {TextResonse} from "../_types/text-response"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; +import {PersonFilterField} from "../_models/metadata/v2/person-filter-field"; +import {PersonSortField} from "../_models/metadata/v2/person-sort-field"; @Injectable({ providedIn: 'root' @@ -43,17 +46,28 @@ export class PersonService { return this.httpClient.get>(this.baseUrl + `person/chapters-by-role?personId=${personId}&role=${role}`); } - getAuthorsToBrowse(pageNum?: number, itemsPerPage?: number) { + getAuthorsToBrowse(filter: FilterV2, pageNum?: number, itemsPerPage?: number) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); - return this.httpClient.post>(this.baseUrl + 'person/all', {}, {observe: 'response', params}).pipe( + return this.httpClient.post>(this.baseUrl + `person/all`, filter, {observe: 'response', params}).pipe( map((response: any) => { return this.utilityService.createPaginatedResult(response) as PaginatedResult; }) ); } + // getAuthorsToBrowse(filter: BrowsePersonFilter, pageNum?: number, itemsPerPage?: number) { + // let params = new HttpParams(); + // params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); + // + // return this.httpClient.post>(this.baseUrl + `person/all`, filter, {observe: 'response', params}).pipe( + // map((response: any) => { + // return this.utilityService.createPaginatedResult(response) as PaginatedResult; + // }) + // ); + // } + downloadCover(personId: number) { return this.httpClient.post(this.baseUrl + 'person/fetch-cover?personId=' + personId, {}, TextResonse); } diff --git a/UI/Web/src/app/_services/reader.service.ts b/UI/Web/src/app/_services/reader.service.ts index 9941cd005..05958ee61 100644 --- a/UI/Web/src/app/_services/reader.service.ts +++ b/UI/Web/src/app/_services/reader.service.ts @@ -16,13 +16,14 @@ import {TextResonse} from '../_types/text-response'; import {AccountService} from './account.service'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {PersonalToC} from "../_models/readers/personal-toc"; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import NoSleep from 'nosleep.js'; import {FullProgress} from "../_models/readers/full-progress"; import {Volume} from "../_models/volume"; import {UtilityService} from "../shared/_services/utility.service"; import {translate} from "@jsverse/transloco"; import {ToastrService} from "ngx-toastr"; +import {FilterField} from "../_models/metadata/v2/filter-field"; export const CHAPTER_ID_DOESNT_EXIST = -1; @@ -107,7 +108,7 @@ export class ReaderService { return this.httpClient.post(this.baseUrl + 'reader/unbookmark', {seriesId, volumeId, chapterId, page}); } - getAllBookmarks(filter: SeriesFilterV2 | undefined) { + getAllBookmarks(filter: FilterV2 | undefined) { return this.httpClient.post(this.baseUrl + 'reader/all-bookmarks', filter); } diff --git a/UI/Web/src/app/_services/reading-profile.service.ts b/UI/Web/src/app/_services/reading-profile.service.ts new file mode 100644 index 000000000..e8be8b6ab --- /dev/null +++ b/UI/Web/src/app/_services/reading-profile.service.ts @@ -0,0 +1,70 @@ +import {inject, Injectable} from '@angular/core'; +import {HttpClient} from "@angular/common/http"; +import {environment} from "../../environments/environment"; +import {ReadingProfile} from "../_models/preferences/reading-profiles"; + +@Injectable({ + providedIn: 'root' +}) +export class ReadingProfileService { + + private readonly httpClient = inject(HttpClient); + baseUrl = environment.apiUrl; + + getForSeries(seriesId: number, skipImplicit: boolean = false) { + return this.httpClient.get(this.baseUrl + `reading-profile/${seriesId}?skipImplicit=${skipImplicit}`); + } + + getForLibrary(libraryId: number) { + return this.httpClient.get(this.baseUrl + `reading-profile/library?libraryId=${libraryId}`); + } + + updateProfile(profile: ReadingProfile) { + return this.httpClient.post(this.baseUrl + 'reading-profile', profile); + } + + updateParentProfile(seriesId: number, profile: ReadingProfile) { + return this.httpClient.post(this.baseUrl + `reading-profile/update-parent?seriesId=${seriesId}`, profile); + } + + createProfile(profile: ReadingProfile) { + return this.httpClient.post(this.baseUrl + 'reading-profile/create', profile); + } + + promoteProfile(profileId: number) { + return this.httpClient.post(this.baseUrl + "reading-profile/promote?profileId=" + profileId, {}); + } + + updateImplicit(profile: ReadingProfile, seriesId: number) { + return this.httpClient.post(this.baseUrl + "reading-profile/series?seriesId="+seriesId, profile); + } + + getAllProfiles() { + return this.httpClient.get(this.baseUrl + 'reading-profile/all'); + } + + delete(id: number) { + return this.httpClient.delete(this.baseUrl + `reading-profile?profileId=${id}`); + } + + addToSeries(id: number, seriesId: number) { + return this.httpClient.post(this.baseUrl + `reading-profile/series/${seriesId}?profileId=${id}`, {}); + } + + clearSeriesProfiles(seriesId: number) { + return this.httpClient.delete(this.baseUrl + `reading-profile/series/${seriesId}`, {}); + } + + addToLibrary(id: number, libraryId: number) { + return this.httpClient.post(this.baseUrl + `reading-profile/library/${libraryId}?profileId=${id}`, {}); + } + + clearLibraryProfiles(libraryId: number) { + return this.httpClient.delete(this.baseUrl + `reading-profile/library/${libraryId}`, {}); + } + + bulkAddToSeries(id: number, seriesIds: number[]) { + return this.httpClient.post(this.baseUrl + `reading-profile/bulk?profileId=${id}`, seriesIds); + } + +} diff --git a/UI/Web/src/app/_services/series.service.ts b/UI/Web/src/app/_services/series.service.ts index b440b1eb7..39e3b720b 100644 --- a/UI/Web/src/app/_services/series.service.ts +++ b/UI/Web/src/app/_services/series.service.ts @@ -1,28 +1,26 @@ -import { HttpClient, HttpParams } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { environment } from 'src/environments/environment'; -import { UtilityService } from '../shared/_services/utility.service'; -import { Chapter } from '../_models/chapter'; -import { PaginatedResult } from '../_models/pagination'; -import { Series } from '../_models/series'; -import { RelatedSeries } from '../_models/series-detail/related-series'; -import { SeriesDetail } from '../_models/series-detail/series-detail'; -import { SeriesGroup } from '../_models/series-group'; -import { SeriesMetadata } from '../_models/metadata/series-metadata'; -import { Volume } from '../_models/volume'; -import { ImageService } from './image.service'; -import { TextResonse } from '../_types/text-response'; -import { SeriesFilterV2 } from '../_models/metadata/v2/series-filter-v2'; -import {UserReview} from "../_single-module/review-card/user-review"; +import {HttpClient, HttpParams} from '@angular/common/http'; +import {Injectable} from '@angular/core'; +import {Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; +import {environment} from 'src/environments/environment'; +import {UtilityService} from '../shared/_services/utility.service'; +import {Chapter} from '../_models/chapter'; +import {PaginatedResult} from '../_models/pagination'; +import {Series} from '../_models/series'; +import {RelatedSeries} from '../_models/series-detail/related-series'; +import {SeriesDetail} from '../_models/series-detail/series-detail'; +import {SeriesGroup} from '../_models/series-group'; +import {SeriesMetadata} from '../_models/metadata/series-metadata'; +import {Volume} from '../_models/volume'; +import {TextResonse} from '../_types/text-response'; +import {FilterV2} from '../_models/metadata/v2/filter-v2'; import {Rating} from "../_models/rating"; import {Recommendation} from "../_models/series-detail/recommendation"; import {ExternalSeriesDetail} from "../_models/series-detail/external-series-detail"; import {NextExpectedChapter} from "../_models/series-detail/next-expected-chapter"; import {QueryContext} from "../_models/metadata/v2/query-context"; -import {ExternalSeries} from "../_models/series-detail/external-series"; import {ExternalSeriesMatch} from "../_models/series-detail/external-series-match"; +import {FilterField} from "../_models/metadata/v2/filter-field"; @Injectable({ providedIn: 'root' @@ -33,10 +31,9 @@ export class SeriesService { paginatedResults: PaginatedResult = new PaginatedResult(); paginatedSeriesForTagsResults: PaginatedResult = new PaginatedResult(); - constructor(private httpClient: HttpClient, private imageService: ImageService, - private utilityService: UtilityService) { } + constructor(private httpClient: HttpClient, private utilityService: UtilityService) { } - getAllSeriesV2(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2, context: QueryContext = QueryContext.None) { + getAllSeriesV2(pageNum?: number, itemsPerPage?: number, filter?: FilterV2, context: QueryContext = QueryContext.None) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -48,7 +45,7 @@ export class SeriesService { ); } - getSeriesForLibraryV2(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2) { + getSeriesForLibraryV2(pageNum?: number, itemsPerPage?: number, filter?: FilterV2) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -100,7 +97,7 @@ export class SeriesService { return this.httpClient.post(this.baseUrl + 'reader/mark-unread', {seriesId}); } - getRecentlyAdded(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2) { + getRecentlyAdded(pageNum?: number, itemsPerPage?: number, filter?: FilterV2) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); @@ -116,7 +113,7 @@ export class SeriesService { return this.httpClient.post(this.baseUrl + 'series/recently-updated-series', {}); } - getWantToRead(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2): Observable> { + getWantToRead(pageNum?: number, itemsPerPage?: number, filter?: FilterV2): Observable> { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -134,7 +131,7 @@ export class SeriesService { })); } - getOnDeck(libraryId: number = 0, pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2) { + getOnDeck(libraryId: number = 0, pageNum?: number, itemsPerPage?: number, filter?: FilterV2) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -230,5 +227,4 @@ export class SeriesService { updateDontMatch(seriesId: number, dontMatch: boolean) { return this.httpClient.post(this.baseUrl + `series/dont-match?seriesId=${seriesId}&dontMatch=${dontMatch}`, {}, TextResonse); } - } diff --git a/UI/Web/src/app/_services/toggle.service.ts b/UI/Web/src/app/_services/toggle.service.ts index 8b335394a..0ad9813e3 100644 --- a/UI/Web/src/app/_services/toggle.service.ts +++ b/UI/Web/src/app/_services/toggle.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@angular/core'; -import { NavigationStart, Router } from '@angular/router'; -import { filter, ReplaySubject, take } from 'rxjs'; +import {Injectable} from '@angular/core'; +import {NavigationStart, Router} from '@angular/router'; +import {filter, ReplaySubject, take} from 'rxjs'; @Injectable({ providedIn: 'root' @@ -29,7 +29,7 @@ export class ToggleService { this.toggleState = !state; this.toggleStateSource.next(this.toggleState); }); - + } set(state: boolean) { diff --git a/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html b/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html index caf8bf683..7573c554a 100644 --- a/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html +++ b/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html @@ -15,7 +15,7 @@
@for (action of currentItems; track action.title) { - @if (willRenderAction(action)) { + @if (willRenderAction(action, user!)) { + diff --git a/UI/Web/src/app/_single-module/sort-button/sort-button.component.scss b/UI/Web/src/app/_single-module/sort-button/sort-button.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/UI/Web/src/app/_single-module/sort-button/sort-button.component.ts b/UI/Web/src/app/_single-module/sort-button/sort-button.component.ts new file mode 100644 index 000000000..230a0ee6f --- /dev/null +++ b/UI/Web/src/app/_single-module/sort-button/sort-button.component.ts @@ -0,0 +1,21 @@ +import {ChangeDetectionStrategy, Component, input, model} from '@angular/core'; +import {TranslocoDirective} from "@jsverse/transloco"; + +@Component({ + selector: 'app-sort-button', + imports: [ + TranslocoDirective + ], + templateUrl: './sort-button.component.html', + styleUrl: './sort-button.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class SortButtonComponent { + + disabled = input(false); + isAscending = model(true); + + updateSortOrder() { + this.isAscending.set(!this.isAscending()); + } +} diff --git a/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html b/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html index 60f494f38..2ae9ea45b 100644 --- a/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html +++ b/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html @@ -3,8 +3,17 @@
-
- +
+ + +
+
+ - - +@if (readingProfile !== null) { + + + +
+
+

+ +

+
+
+ +
+
+
+ + +
-
-
- - +
+ + -
+
-
- - - 1x - - 2.5x +
+ + + {{t('line-spacing-min-label')}} + + {{t('line-spacing-max-label')}} -
+
-
- - +
+ + -
+
-
- +
+ +
-
- + +
+
-
+
+

+ +

+
+
+ +
+ + +
+
+ + {{t('writing-style-tooltip')}} + + -
-

- -

-
-
- -
- - -
-
- - {{t('writing-style-tooltip')}} - - - -
-
- - {{t('tap-to-paginate-tooltip')}} -
+
+ + {{t('tap-to-paginate-tooltip')}} + -
- - +
+ + +
-
-
- - {{t('immersive-mode-tooltip')}} -
-
-
-

- +

+
+
+ +
+ + + +
+ +
+
+
+ +
+ + - -
-
- -
- - - -
- -
-
-
- - + +
+ + + +} diff --git a/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts index e28d44bbf..52c067a16 100644 --- a/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts +++ b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts @@ -1,32 +1,46 @@ -import { DOCUMENT, NgFor, NgTemplateOutlet, NgIf, NgClass, NgStyle, TitleCasePipe } from '@angular/common'; +import {DOCUMENT, NgClass, NgFor, NgIf, NgStyle, NgTemplateOutlet, TitleCasePipe} from '@angular/common'; import { ChangeDetectionStrategy, ChangeDetectorRef, - Component, DestroyRef, + Component, + DestroyRef, EventEmitter, inject, Inject, + Input, OnInit, Output } from '@angular/core'; -import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; -import { take } from 'rxjs'; -import { BookPageLayoutMode } from 'src/app/_models/readers/book-page-layout-mode'; -import { BookTheme } from 'src/app/_models/preferences/book-theme'; -import { ReadingDirection } from 'src/app/_models/preferences/reading-direction'; -import { WritingStyle } from 'src/app/_models/preferences/writing-style'; -import { ThemeProvider } from 'src/app/_models/preferences/site-theme'; -import { User } from 'src/app/_models/user'; -import { AccountService } from 'src/app/_services/account.service'; -import { ThemeService } from 'src/app/_services/theme.service'; -import { FontFamily, BookService } from '../../_services/book.service'; -import { BookBlackTheme } from '../../_models/book-black-theme'; -import { BookDarkTheme } from '../../_models/book-dark-theme'; -import { BookWhiteTheme } from '../../_models/book-white-theme'; -import { BookPaperTheme } from '../../_models/book-paper-theme'; +import {FormControl, FormGroup, ReactiveFormsModule} from '@angular/forms'; +import {skip, take} from 'rxjs'; +import {BookPageLayoutMode} from 'src/app/_models/readers/book-page-layout-mode'; +import {BookTheme} from 'src/app/_models/preferences/book-theme'; +import {ReadingDirection} from 'src/app/_models/preferences/reading-direction'; +import {WritingStyle} from 'src/app/_models/preferences/writing-style'; +import {ThemeProvider} from 'src/app/_models/preferences/site-theme'; +import {User} from 'src/app/_models/user'; +import {AccountService} from 'src/app/_services/account.service'; +import {ThemeService} from 'src/app/_services/theme.service'; +import {BookService, FontFamily} from '../../_services/book.service'; +import {BookBlackTheme} from '../../_models/book-black-theme'; +import {BookDarkTheme} from '../../_models/book-dark-theme'; +import {BookWhiteTheme} from '../../_models/book-white-theme'; +import {BookPaperTheme} from '../../_models/book-paper-theme'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; -import { NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionToggle, NgbAccordionButton, NgbCollapse, NgbAccordionCollapse, NgbAccordionBody, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; -import {TranslocoDirective} from "@jsverse/transloco"; +import { + NgbAccordionBody, + NgbAccordionButton, + NgbAccordionCollapse, + NgbAccordionDirective, + NgbAccordionHeader, + NgbAccordionItem, + NgbTooltip +} from '@ng-bootstrap/ng-bootstrap'; +import {translate, TranslocoDirective} from "@jsverse/transloco"; +import {ReadingProfileService} from "../../../_services/reading-profile.service"; +import {ReadingProfile, ReadingProfileKind} from "../../../_models/preferences/reading-profiles"; +import {debounceTime, distinctUntilChanged, tap} from "rxjs/operators"; +import {ToastrService} from "ngx-toastr"; /** * Used for book reader. Do not use for other components @@ -89,9 +103,13 @@ const mobileBreakpointMarginOverride = 700; templateUrl: './reader-settings.component.html', styleUrls: ['./reader-settings.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ReactiveFormsModule, NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionToggle, NgbAccordionButton, NgbCollapse, NgbAccordionCollapse, NgbAccordionBody, NgFor, NgbTooltip, NgTemplateOutlet, NgIf, NgClass, NgStyle, TitleCasePipe, TranslocoDirective] + imports: [ReactiveFormsModule, NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionButton, + NgbAccordionCollapse, NgbAccordionBody, NgFor, NgbTooltip, NgTemplateOutlet, NgIf, NgClass, NgStyle, + TitleCasePipe, TranslocoDirective] }) export class ReaderSettingsComponent implements OnInit { + @Input({required:true}) seriesId!: number; + @Input({required:true}) readingProfile!: ReadingProfile; /** * Outputs when clickToPaginate is changed */ @@ -147,6 +165,11 @@ export class ReaderSettingsComponent implements OnInit { settingsForm: FormGroup = new FormGroup({}); + /** + * The reading profile itself, unless readingProfile is implicit + */ + parentReadingProfile: ReadingProfile | null = null; + /** * System provided themes */ @@ -166,136 +189,169 @@ export class ReaderSettingsComponent implements OnInit { return WritingStyle; } - - constructor(private bookService: BookService, private accountService: AccountService, @Inject(DOCUMENT) private document: Document, private themeService: ThemeService, - private readonly cdRef: ChangeDetectorRef) {} + private readonly cdRef: ChangeDetectorRef, private readingProfileService: ReadingProfileService, + private toastr: ToastrService) {} ngOnInit(): void { + if (this.readingProfile.kind === ReadingProfileKind.Implicit) { + this.readingProfileService.getForSeries(this.seriesId, true).subscribe(parent => { + this.parentReadingProfile = parent; + this.cdRef.markForCheck(); + }) + } else { + this.parentReadingProfile = this.readingProfile; + this.cdRef.markForCheck(); + } this.fontFamilies = this.bookService.getFontFamilies(); this.fontOptions = this.fontFamilies.map(f => f.title); + + + this.cdRef.markForCheck(); + this.setupSettings(); + + this.setTheme(this.readingProfile.bookReaderThemeName || this.themeService.defaultBookTheme, false); + this.cdRef.markForCheck(); + + // Emit first time so book reader gets the setting + this.readingDirection.emit(this.readingDirectionModel); + this.bookReaderWritingStyle.emit(this.writingStyleModel); + this.clickToPaginateChanged.emit(this.readingProfile.bookReaderTapToPaginate); + this.layoutModeUpdate.emit(this.readingProfile.bookReaderLayoutMode); + this.immersiveMode.emit(this.readingProfile.bookReaderImmersiveMode); + this.accountService.currentUser$.pipe(take(1)).subscribe(user => { if (user) { this.user = user; - - if (this.user.preferences.bookReaderFontFamily === undefined) { - this.user.preferences.bookReaderFontFamily = 'default'; - } - if (this.user.preferences.bookReaderFontSize === undefined || this.user.preferences.bookReaderFontSize < 50) { - this.user.preferences.bookReaderFontSize = 100; - } - if (this.user.preferences.bookReaderLineSpacing === undefined || this.user.preferences.bookReaderLineSpacing < 100) { - this.user.preferences.bookReaderLineSpacing = 100; - } - if (this.user.preferences.bookReaderMargin === undefined) { - this.user.preferences.bookReaderMargin = 0; - } - if (this.user.preferences.bookReaderReadingDirection === undefined) { - this.user.preferences.bookReaderReadingDirection = ReadingDirection.LeftToRight; - } - if (this.user.preferences.bookReaderWritingStyle === undefined) { - this.user.preferences.bookReaderWritingStyle = WritingStyle.Horizontal; - } - this.readingDirectionModel = this.user.preferences.bookReaderReadingDirection; - this.writingStyleModel = this.user.preferences.bookReaderWritingStyle; - - - - this.settingsForm.addControl('bookReaderFontFamily', new FormControl(this.user.preferences.bookReaderFontFamily, [])); - this.settingsForm.get('bookReaderFontFamily')!.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(fontName => { - const familyName = this.fontFamilies.filter(f => f.title === fontName)[0].family; - if (familyName === 'default') { - this.pageStyles['font-family'] = 'inherit'; - } else { - this.pageStyles['font-family'] = "'" + familyName + "'"; - } - - this.styleUpdate.emit(this.pageStyles); - }); - - this.settingsForm.addControl('bookReaderFontSize', new FormControl(this.user.preferences.bookReaderFontSize, [])); - this.settingsForm.get('bookReaderFontSize')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { - this.pageStyles['font-size'] = value + '%'; - this.styleUpdate.emit(this.pageStyles); - }); - - this.settingsForm.addControl('bookReaderTapToPaginate', new FormControl(this.user.preferences.bookReaderTapToPaginate, [])); - this.settingsForm.get('bookReaderTapToPaginate')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { - this.clickToPaginateChanged.emit(value); - }); - - this.settingsForm.addControl('bookReaderLineSpacing', new FormControl(this.user.preferences.bookReaderLineSpacing, [])); - this.settingsForm.get('bookReaderLineSpacing')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { - this.pageStyles['line-height'] = value + '%'; - this.styleUpdate.emit(this.pageStyles); - }); - - this.settingsForm.addControl('bookReaderMargin', new FormControl(this.user.preferences.bookReaderMargin, [])); - this.settingsForm.get('bookReaderMargin')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { - this.pageStyles['margin-left'] = value + 'vw'; - this.pageStyles['margin-right'] = value + 'vw'; - this.styleUpdate.emit(this.pageStyles); - }); - - - - this.settingsForm.addControl('layoutMode', new FormControl(this.user.preferences.bookReaderLayoutMode || BookPageLayoutMode.Default, [])); - this.settingsForm.get('layoutMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((layoutMode: BookPageLayoutMode) => { - this.layoutModeUpdate.emit(layoutMode); - }); - - this.settingsForm.addControl('bookReaderImmersiveMode', new FormControl(this.user.preferences.bookReaderImmersiveMode, [])); - this.settingsForm.get('bookReaderImmersiveMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((immersiveMode: boolean) => { - if (immersiveMode) { - this.settingsForm.get('bookReaderTapToPaginate')?.setValue(true); - } - this.immersiveMode.emit(immersiveMode); - }); - - - this.setTheme(this.user.preferences.bookReaderThemeName || this.themeService.defaultBookTheme); - this.cdRef.markForCheck(); - - // Emit first time so book reader gets the setting - this.readingDirection.emit(this.readingDirectionModel); - this.bookReaderWritingStyle.emit(this.writingStyleModel); - this.clickToPaginateChanged.emit(this.user.preferences.bookReaderTapToPaginate); - this.layoutModeUpdate.emit(this.user.preferences.bookReaderLayoutMode); - this.immersiveMode.emit(this.user.preferences.bookReaderImmersiveMode); - - this.resetSettings(); - } else { - this.resetSettings(); } - + // User needs to be loaded before we call this + this.resetSettings(); }); } + setupSettings() { + if (!this.readingProfile) return; + + if (this.readingProfile.bookReaderFontFamily === undefined) { + this.readingProfile.bookReaderFontFamily = 'default'; + } + if (this.readingProfile.bookReaderFontSize === undefined || this.readingProfile.bookReaderFontSize < 50) { + this.readingProfile.bookReaderFontSize = 100; + } + if (this.readingProfile.bookReaderLineSpacing === undefined || this.readingProfile.bookReaderLineSpacing < 100) { + this.readingProfile.bookReaderLineSpacing = 100; + } + if (this.readingProfile.bookReaderMargin === undefined) { + this.readingProfile.bookReaderMargin = 0; + } + if (this.readingProfile.bookReaderReadingDirection === undefined) { + this.readingProfile.bookReaderReadingDirection = ReadingDirection.LeftToRight; + } + if (this.readingProfile.bookReaderWritingStyle === undefined) { + this.readingProfile.bookReaderWritingStyle = WritingStyle.Horizontal; + } + this.readingDirectionModel = this.readingProfile.bookReaderReadingDirection; + this.writingStyleModel = this.readingProfile.bookReaderWritingStyle; + + this.settingsForm.addControl('bookReaderFontFamily', new FormControl(this.readingProfile.bookReaderFontFamily, [])); + this.settingsForm.get('bookReaderFontFamily')!.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(fontName => { + const familyName = this.fontFamilies.filter(f => f.title === fontName)[0].family; + if (familyName === 'default') { + this.pageStyles['font-family'] = 'inherit'; + } else { + this.pageStyles['font-family'] = "'" + familyName + "'"; + } + + this.styleUpdate.emit(this.pageStyles); + }); + + this.settingsForm.addControl('bookReaderFontSize', new FormControl(this.readingProfile.bookReaderFontSize, [])); + this.settingsForm.get('bookReaderFontSize')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { + this.pageStyles['font-size'] = value + '%'; + this.styleUpdate.emit(this.pageStyles); + }); + + this.settingsForm.addControl('bookReaderTapToPaginate', new FormControl(this.readingProfile.bookReaderTapToPaginate, [])); + this.settingsForm.get('bookReaderTapToPaginate')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { + this.clickToPaginateChanged.emit(value); + }); + + this.settingsForm.addControl('bookReaderLineSpacing', new FormControl(this.readingProfile.bookReaderLineSpacing, [])); + this.settingsForm.get('bookReaderLineSpacing')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { + this.pageStyles['line-height'] = value + '%'; + this.styleUpdate.emit(this.pageStyles); + }); + + this.settingsForm.addControl('bookReaderMargin', new FormControl(this.readingProfile.bookReaderMargin, [])); + this.settingsForm.get('bookReaderMargin')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => { + this.pageStyles['margin-left'] = value + 'vw'; + this.pageStyles['margin-right'] = value + 'vw'; + this.styleUpdate.emit(this.pageStyles); + }); + + this.settingsForm.addControl('layoutMode', new FormControl(this.readingProfile.bookReaderLayoutMode, [])); + this.settingsForm.get('layoutMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((layoutMode: BookPageLayoutMode) => { + this.layoutModeUpdate.emit(layoutMode); + }); + + this.settingsForm.addControl('bookReaderImmersiveMode', new FormControl(this.readingProfile.bookReaderImmersiveMode, [])); + this.settingsForm.get('bookReaderImmersiveMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((immersiveMode: boolean) => { + if (immersiveMode) { + this.settingsForm.get('bookReaderTapToPaginate')?.setValue(true); + } + this.immersiveMode.emit(immersiveMode); + }); + + // Update implicit reading profile while changing settings + this.settingsForm.valueChanges.pipe( + debounceTime(300), + distinctUntilChanged(), + skip(1), // Skip the initial creation of the form, we do not want an implicit profile of this snapshot + takeUntilDestroyed(this.destroyRef), + tap(_ => this.updateImplicit()) + ).subscribe(); + } + resetSettings() { + if (!this.readingProfile) return; + if (this.user) { - this.setPageStyles(this.user.preferences.bookReaderFontFamily, this.user.preferences.bookReaderFontSize + '%', this.user.preferences.bookReaderMargin + 'vw', this.user.preferences.bookReaderLineSpacing + '%'); + this.setPageStyles(this.readingProfile.bookReaderFontFamily, this.readingProfile.bookReaderFontSize + '%', this.readingProfile.bookReaderMargin + 'vw', this.readingProfile.bookReaderLineSpacing + '%'); } else { this.setPageStyles(); } - this.settingsForm.get('bookReaderFontFamily')?.setValue(this.user.preferences.bookReaderFontFamily); - this.settingsForm.get('bookReaderFontSize')?.setValue(this.user.preferences.bookReaderFontSize); - this.settingsForm.get('bookReaderLineSpacing')?.setValue(this.user.preferences.bookReaderLineSpacing); - this.settingsForm.get('bookReaderMargin')?.setValue(this.user.preferences.bookReaderMargin); - this.settingsForm.get('bookReaderReadingDirection')?.setValue(this.user.preferences.bookReaderReadingDirection); - this.settingsForm.get('bookReaderTapToPaginate')?.setValue(this.user.preferences.bookReaderTapToPaginate); - this.settingsForm.get('bookReaderLayoutMode')?.setValue(this.user.preferences.bookReaderLayoutMode); - this.settingsForm.get('bookReaderImmersiveMode')?.setValue(this.user.preferences.bookReaderImmersiveMode); - this.settingsForm.get('bookReaderWritingStyle')?.setValue(this.user.preferences.bookReaderWritingStyle); + this.settingsForm.get('bookReaderFontFamily')?.setValue(this.readingProfile.bookReaderFontFamily); + this.settingsForm.get('bookReaderFontSize')?.setValue(this.readingProfile.bookReaderFontSize); + this.settingsForm.get('bookReaderLineSpacing')?.setValue(this.readingProfile.bookReaderLineSpacing); + this.settingsForm.get('bookReaderMargin')?.setValue(this.readingProfile.bookReaderMargin); + this.settingsForm.get('bookReaderReadingDirection')?.setValue(this.readingProfile.bookReaderReadingDirection); + this.settingsForm.get('bookReaderTapToPaginate')?.setValue(this.readingProfile.bookReaderTapToPaginate); + this.settingsForm.get('bookReaderLayoutMode')?.setValue(this.readingProfile.bookReaderLayoutMode); + this.settingsForm.get('bookReaderImmersiveMode')?.setValue(this.readingProfile.bookReaderImmersiveMode); + this.settingsForm.get('bookReaderWritingStyle')?.setValue(this.readingProfile.bookReaderWritingStyle); + this.cdRef.detectChanges(); this.styleUpdate.emit(this.pageStyles); } + updateImplicit() { + this.readingProfileService.updateImplicit(this.packReadingProfile(), this.seriesId).subscribe({ + next: newProfile => { + this.readingProfile = newProfile; + this.cdRef.markForCheck(); + }, + error: err => { + console.error(err); + } + }) + } + /** * Internal method to be used by resetSettings. Pass items in with quantifiers */ @@ -318,11 +374,15 @@ export class ReaderSettingsComponent implements OnInit { }; } - setTheme(themeName: string) { + setTheme(themeName: string, update: boolean = true) { const theme = this.themes.find(t => t.name === themeName); this.activeTheme = theme; this.cdRef.markForCheck(); this.colorThemeUpdate.emit(theme); + + if (update) { + this.updateImplicit(); + } } toggleReadingDirection() { @@ -334,6 +394,7 @@ export class ReaderSettingsComponent implements OnInit { this.cdRef.markForCheck(); this.readingDirection.emit(this.readingDirectionModel); + this.updateImplicit(); } toggleWritingStyle() { @@ -345,6 +406,7 @@ export class ReaderSettingsComponent implements OnInit { this.cdRef.markForCheck(); this.bookReaderWritingStyle.emit(this.writingStyleModel); + this.updateImplicit(); } toggleFullscreen() { @@ -352,4 +414,53 @@ export class ReaderSettingsComponent implements OnInit { this.cdRef.markForCheck(); this.fullscreen.emit(); } + + // menu only code + updateParentPref() { + if (this.readingProfile.kind !== ReadingProfileKind.Implicit) { + return; + } + + this.readingProfileService.updateParentProfile(this.seriesId, this.packReadingProfile()).subscribe(newProfile => { + this.readingProfile = newProfile; + this.toastr.success(translate('manga-reader.reading-profile-updated')); + this.cdRef.markForCheck(); + }); + } + + createNewProfileFromImplicit() { + if (this.readingProfile.kind !== ReadingProfileKind.Implicit) { + return; + } + + this.readingProfileService.promoteProfile(this.readingProfile.id).subscribe(newProfile => { + this.readingProfile = newProfile; + this.parentReadingProfile = newProfile; // profile is no longer implicit + this.cdRef.markForCheck(); + + this.toastr.success(translate("manga-reader.reading-profile-promoted")); + }); + } + + private packReadingProfile(): ReadingProfile { + const modelSettings = this.settingsForm.getRawValue(); + const data = {...this.readingProfile!}; + data.bookReaderFontFamily = modelSettings.bookReaderFontFamily; + data.bookReaderFontSize = modelSettings.bookReaderFontSize + data.bookReaderLineSpacing = modelSettings.bookReaderLineSpacing; + data.bookReaderMargin = modelSettings.bookReaderMargin; + data.bookReaderTapToPaginate = modelSettings.bookReaderTapToPaginate; + data.bookReaderLayoutMode = modelSettings.layoutMode; + data.bookReaderImmersiveMode = modelSettings.bookReaderImmersiveMode; + + data.bookReaderReadingDirection = this.readingDirectionModel; + data.bookReaderWritingStyle = this.writingStyleModel; + if (this.activeTheme) { + data.bookReaderThemeName = this.activeTheme.name; + } + + return data; + } + + protected readonly ReadingProfileKind = ReadingProfileKind; } diff --git a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html index 585f3af42..ead8b3540 100644 --- a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html +++ b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html @@ -17,12 +17,12 @@ } @else { @for (chapterGroup of chapters; track chapterGroup.title + chapterGroup.children.length) {
    -
  • +
  • {{chapterGroup.title}}
    • @for(chapter of chapterGroup.children; track chapter.title + chapter.part) { diff --git a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss index e556f0e78..ca8e747f4 100644 --- a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss +++ b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss @@ -3,9 +3,10 @@ &.active { font-weight: bold; + color: var(--primary-color); } } .chapter-title { padding-inline-start: 1rem; -} \ No newline at end of file +} diff --git a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts index cb6417874..ce3a180ed 100644 --- a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts +++ b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts @@ -31,9 +31,8 @@ export class TableOfContentsComponent implements OnChanges { @Output() loadChapter: EventEmitter<{pageNum: number, part: string}> = new EventEmitter(); ngOnChanges(changes: SimpleChanges) { - console.log('Current Page: ', this.pageNum, this.currentPageAnchor); + //console.log('Current Page: ', this.pageNum, this.currentPageAnchor); this.cdRef.markForCheck(); - } cleanIdSelector(id: string) { @@ -47,4 +46,30 @@ export class TableOfContentsComponent implements OnChanges { loadChapterPage(pageNum: number, part: string) { this.loadChapter.emit({pageNum, part}); } + + isChapterSelected(chapterGroup: BookChapterItem) { + if (chapterGroup.page === this.pageNum) { + return true; + } + + const idx = this.chapters.indexOf(chapterGroup); + if (idx < 0) { + return false; // should never happen + } + + const nextIdx = idx + 1; + // Last chapter + if (nextIdx >= this.chapters.length) { + return chapterGroup.page < this.pageNum; + } + + // Passed chapter, and next chapter has not been reached + const next = this.chapters[nextIdx]; + return chapterGroup.page < this.pageNum && next.page > this.pageNum; + } + + isAnchorSelected(chapter: BookChapterItem) { + return this.cleanIdSelector(chapter.part) === this.currentPageAnchor + } + } diff --git a/UI/Web/src/app/book-reader/_models/book-paper-theme.ts b/UI/Web/src/app/book-reader/_models/book-paper-theme.ts index 41c7958e1..9b6a5d461 100644 --- a/UI/Web/src/app/book-reader/_models/book-paper-theme.ts +++ b/UI/Web/src/app/book-reader/_models/book-paper-theme.ts @@ -48,6 +48,7 @@ export const BookPaperTheme = ` --btn-disabled-bg-color: #343a40; --btn-disabled-text-color: #efefef; --btn-disabled-border-color: #6c757d; + --btn-outline-primary-text-color: black; /* Inputs */ --input-bg-color: white; @@ -89,6 +90,8 @@ export const BookPaperTheme = ` /* Custom variables */ --theme-bg-color: #fff3c9; + + --bs-secondary-bg: darkgrey; } .reader-container { diff --git a/UI/Web/src/app/book-reader/_models/book-white-theme.ts b/UI/Web/src/app/book-reader/_models/book-white-theme.ts index 1b4bab274..a209b954f 100644 --- a/UI/Web/src/app/book-reader/_models/book-white-theme.ts +++ b/UI/Web/src/app/book-reader/_models/book-white-theme.ts @@ -51,6 +51,7 @@ export const BookWhiteTheme = ` --btn-disabled-bg-color: #343a40; --btn-disabled-text-color: #efefef; --btn-disabled-border-color: #6c757d; + --btn-outline-primary-text-color: black; /* Inputs */ --input-bg-color: white; diff --git a/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts index f3b638ce9..3f76c9cf2 100644 --- a/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts +++ b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts @@ -1,9 +1,16 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, inject, OnInit} from '@angular/core'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + DestroyRef, + EventEmitter, + inject, + OnInit +} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {ToastrService} from 'ngx-toastr'; import {take} from 'rxjs'; import {BulkSelectionService} from 'src/app/cards/bulk-selection.service'; -import {FilterSettings} from 'src/app/metadata-filter/filter-settings'; import {ConfirmService} from 'src/app/shared/confirm.service'; import {DownloadService} from 'src/app/shared/_services/download.service'; import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service'; @@ -11,7 +18,7 @@ import {JumpKey} from 'src/app/_models/jumpbar/jump-key'; import {PageBookmark} from 'src/app/_models/readers/page-bookmark'; import {Pagination} from 'src/app/_models/pagination'; import {Series} from 'src/app/_models/series'; -import {FilterEvent} from 'src/app/_models/metadata/series-filter'; +import {FilterEvent, SortField} from 'src/app/_models/metadata/series-filter'; import {Action, ActionFactoryService, ActionItem} from 'src/app/_services/action-factory.service'; import {ImageService} from 'src/app/_services/image.service'; import {JumpbarService} from 'src/app/_services/jumpbar.service'; @@ -24,9 +31,14 @@ import { SideNavCompanionBarComponent } from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component'; import {translate, TranslocoDirective, TranslocoService} from "@jsverse/transloco"; -import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../../../_models/metadata/v2/filter-v2"; import {Title} from "@angular/platform-browser"; import {WikiLink} from "../../../_models/wiki"; +import {FilterField} from "../../../_models/metadata/v2/filter-field"; +import {SeriesFilterSettings} from "../../../metadata-filter/filter-settings"; +import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; +import {FilterStatement} from "../../../_models/metadata/v2/filter-statement"; +import {MetadataService} from "../../../_services/metadata.service"; @Component({ selector: 'app-bookmarks', @@ -51,6 +63,8 @@ export class BookmarksComponent implements OnInit { private readonly titleService = inject(Title); public readonly bulkSelectionService = inject(BulkSelectionService); public readonly imageService = inject(ImageService); + public readonly metadataService = inject(MetadataService); + public readonly destroyRef = inject(DestroyRef); protected readonly WikiLink = WikiLink; @@ -63,27 +77,34 @@ export class BookmarksComponent implements OnInit { jumpbarKeys: Array = []; pagination: Pagination = new Pagination(); - filter: SeriesFilterV2 | undefined = undefined; - filterSettings: FilterSettings = new FilterSettings(); + filter: FilterV2 | undefined = undefined; + filterSettings: SeriesFilterSettings = new SeriesFilterSettings(); filterOpen: EventEmitter = new EventEmitter(); filterActive: boolean = false; - filterActiveCheck!: SeriesFilterV2; + filterActiveCheck!: FilterV2; trackByIdentity = (index: number, item: Series) => `${item.name}_${item.localizedName}_${item.pagesRead}`; refresh: EventEmitter = new EventEmitter(); constructor() { - this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => { - this.filter = filter; - this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter(); - this.filterActiveCheck!.statements.push(this.filterUtilityService.createSeriesV2DefaultStatement()); + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.filter = data['filter'] as FilterV2; + + if (this.filter == null) { + this.filter = this.metadataService.createDefaultFilterDto('series'); + this.filter.statements.push(this.metadataService.createDefaultFilterStatement('series') as FilterStatement); + } + + this.filterActiveCheck = this.metadataService.createDefaultFilterDto('series'); + this.filterActiveCheck.statements.push(this.metadataService.createDefaultFilterStatement('series') as FilterStatement); this.filterSettings.presetsV2 = this.filter; this.filterSettings.statementLimit = 1; this.cdRef.markForCheck(); }); + this.titleService.setTitle('Kavita - ' + translate('bookmarks.title')); } @@ -190,7 +211,7 @@ export class BookmarksComponent implements OnInit { this.downloadService.download('bookmark', this.bookmarks.filter(bmk => bmk.seriesId === series.id)); } - updateFilter(data: FilterEvent) { + updateFilter(data: FilterEvent) { if (data.filterV2 === undefined) return; this.filter = data.filterV2; diff --git a/UI/Web/src/app/browse-people/browse-authors.component.ts b/UI/Web/src/app/browse-people/browse-authors.component.ts deleted file mode 100644 index 9a9114f52..000000000 --- a/UI/Web/src/app/browse-people/browse-authors.component.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { - ChangeDetectionStrategy, - ChangeDetectorRef, - Component, - DestroyRef, - EventEmitter, - inject, - OnInit -} from '@angular/core'; -import { - SideNavCompanionBarComponent -} from "../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component"; -import {CardDetailLayoutComponent} from "../cards/card-detail-layout/card-detail-layout.component"; -import {DecimalPipe} from "@angular/common"; -import {Series} from "../_models/series"; -import {Pagination} from "../_models/pagination"; -import {JumpKey} from "../_models/jumpbar/jump-key"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Title} from "@angular/platform-browser"; -import {ActionFactoryService} from "../_services/action-factory.service"; -import {ActionService} from "../_services/action.service"; -import {MessageHubService} from "../_services/message-hub.service"; -import {UtilityService} from "../shared/_services/utility.service"; -import {PersonService} from "../_services/person.service"; -import {BrowsePerson} from "../_models/person/browse-person"; -import {JumpbarService} from "../_services/jumpbar.service"; -import {PersonCardComponent} from "../cards/person-card/person-card.component"; -import {ImageService} from "../_services/image.service"; -import {TranslocoDirective} from "@jsverse/transloco"; -import {CompactNumberPipe} from "../_pipes/compact-number.pipe"; - - -@Component({ - selector: 'app-browse-authors', - imports: [ - SideNavCompanionBarComponent, - TranslocoDirective, - CardDetailLayoutComponent, - DecimalPipe, - PersonCardComponent, - CompactNumberPipe, - ], - templateUrl: './browse-authors.component.html', - styleUrl: './browse-authors.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class BrowseAuthorsComponent implements OnInit { - - private readonly destroyRef = inject(DestroyRef); - private readonly cdRef = inject(ChangeDetectorRef); - private readonly route = inject(ActivatedRoute); - private readonly router = inject(Router); - private readonly titleService = inject(Title); - private readonly actionFactoryService = inject(ActionFactoryService); - private readonly actionService = inject(ActionService); - private readonly hubService = inject(MessageHubService); - private readonly utilityService = inject(UtilityService); - private readonly personService = inject(PersonService); - private readonly jumpbarService = inject(JumpbarService); - protected readonly imageService = inject(ImageService); - - - series: Series[] = []; - isLoading = false; - authors: Array = []; - pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0}; - refresh: EventEmitter = new EventEmitter(); - jumpKeys: Array = []; - trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`; - - ngOnInit() { - this.isLoading = true; - this.cdRef.markForCheck(); - this.personService.getAuthorsToBrowse(undefined, undefined).subscribe(d => { - this.authors = d.result; - this.pagination = d.pagination; - this.jumpKeys = this.jumpbarService.getJumpKeys(this.authors, d => d.name); - this.isLoading = false; - this.cdRef.markForCheck(); - }); - } - - goToPerson(person: BrowsePerson) { - this.router.navigate(['person', person.name]); - } - -} diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.html b/UI/Web/src/app/browse/browse-genres/browse-genres.component.html new file mode 100644 index 000000000..5eef2c91f --- /dev/null +++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.html @@ -0,0 +1,34 @@ +
    + + +

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

    +
    {{t('genre-count', {num: pagination.totalItems | number})}}
    + +     + + + + +
    +
    {{ item.title }}
    +
    + {{t('series-count', {num: item.seriesCount | compactNumber})}} + {{t('issue-count', {num: item.chapterCount | compactNumber})}} +
    +
    + +     +     + +     +
    diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.scss b/UI/Web/src/app/browse/browse-genres/browse-genres.component.scss new file mode 100644 index 000000000..90c313b37 --- /dev/null +++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.scss @@ -0,0 +1 @@ +@use '../../../tag-card-common'; diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts b/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts new file mode 100644 index 000000000..02c2a8ead --- /dev/null +++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts @@ -0,0 +1,68 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, inject, OnInit} from '@angular/core'; +import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component"; +import {DecimalPipe} from "@angular/common"; +import { + SideNavCompanionBarComponent +} from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component"; +import {translate, TranslocoDirective} from "@jsverse/transloco"; +import {JumpbarService} from "../../_services/jumpbar.service"; +import {BrowsePerson} from "../../_models/metadata/browse/browse-person"; +import {Pagination} from "../../_models/pagination"; +import {JumpKey} from "../../_models/jumpbar/jump-key"; +import {MetadataService} from "../../_services/metadata.service"; +import {BrowseGenre} from "../../_models/metadata/browse/browse-genre"; +import {FilterField} from "../../_models/metadata/v2/filter-field"; +import {FilterComparison} from "../../_models/metadata/v2/filter-comparison"; +import {FilterUtilitiesService} from "../../shared/_services/filter-utilities.service"; +import {CompactNumberPipe} from "../../_pipes/compact-number.pipe"; +import {Title} from "@angular/platform-browser"; + +@Component({ + selector: 'app-browse-genres', + imports: [ + CardDetailLayoutComponent, + DecimalPipe, + SideNavCompanionBarComponent, + TranslocoDirective, + CompactNumberPipe + ], + templateUrl: './browse-genres.component.html', + styleUrl: './browse-genres.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class BrowseGenresComponent implements OnInit { + + protected readonly FilterField = FilterField; + + private readonly cdRef = inject(ChangeDetectorRef); + private readonly metadataService = inject(MetadataService); + private readonly jumpbarService = inject(JumpbarService); + private readonly filterUtilityService = inject(FilterUtilitiesService); + private readonly titleService = inject(Title); + + isLoading = false; + genres: Array = []; + pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0}; + refresh: EventEmitter = new EventEmitter(); + jumpKeys: Array = []; + trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`; + + ngOnInit() { + this.isLoading = true; + this.cdRef.markForCheck(); + + this.titleService.setTitle('Kavita - ' + translate('browse-genres.title')); + + this.metadataService.getGenreWithCounts(undefined, undefined).subscribe(d => { + this.genres = d.result; + this.pagination = d.pagination; + this.jumpKeys = this.jumpbarService.getJumpKeys(this.genres, (d: BrowseGenre) => d.title); + this.isLoading = false; + this.cdRef.markForCheck(); + }); + } + + openFilter(field: FilterField, value: string | number) { + this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${value}`).subscribe(); + } +} diff --git a/UI/Web/src/app/browse-people/browse-authors.component.html b/UI/Web/src/app/browse/browse-people/browse-people.component.html similarity index 60% rename from UI/Web/src/app/browse-people/browse-authors.component.html rename to UI/Web/src/app/browse/browse-people/browse-people.component.html index 600f7c71c..683a5c97b 100644 --- a/UI/Web/src/app/browse-people/browse-authors.component.html +++ b/UI/Web/src/app/browse/browse-people/browse-people.component.html @@ -1,6 +1,6 @@
    - - + +

    {{t('title')}}

    @@ -16,13 +16,16 @@ [jumpBarKeys]="jumpKeys" [filteringDisabled]="true" [refresh]="refresh" + [filterSettings]="filterSettings" + [filterOpen]="filterOpen" + (applyFilter)="updateFilter($event)" > -
    -
    {{item.seriesCount | compactNumber}} series
    -
    {{item.issueCount | compactNumber}} issues
    +
    +
    {{t('series-count', {num: item.seriesCount | compactNumber})}}
    +
    {{t('issue-count', {num: item.chapterCount | compactNumber})}}
    diff --git a/UI/Web/src/app/browse-people/browse-authors.component.scss b/UI/Web/src/app/browse/browse-people/browse-people.component.scss similarity index 64% rename from UI/Web/src/app/browse-people/browse-authors.component.scss rename to UI/Web/src/app/browse/browse-people/browse-people.component.scss index dc52bc49c..e7dfb8d01 100644 --- a/UI/Web/src/app/browse-people/browse-authors.component.scss +++ b/UI/Web/src/app/browse/browse-people/browse-people.component.scss @@ -1,3 +1,5 @@ +@use '../../../tag-card-common'; + .main-container { margin-top: 10px; padding: 0 0 0 10px; diff --git a/UI/Web/src/app/browse/browse-people/browse-people.component.ts b/UI/Web/src/app/browse/browse-people/browse-people.component.ts new file mode 100644 index 000000000..182222879 --- /dev/null +++ b/UI/Web/src/app/browse/browse-people/browse-people.component.ts @@ -0,0 +1,128 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, EventEmitter, inject} from '@angular/core'; +import { + SideNavCompanionBarComponent +} from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component"; +import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component"; +import {DecimalPipe} from "@angular/common"; +import {Pagination} from "../../_models/pagination"; +import {JumpKey} from "../../_models/jumpbar/jump-key"; +import {ActivatedRoute, Router} from "@angular/router"; +import {PersonService} from "../../_services/person.service"; +import {BrowsePerson} from "../../_models/metadata/browse/browse-person"; +import {JumpbarService} from "../../_services/jumpbar.service"; +import {PersonCardComponent} from "../../cards/person-card/person-card.component"; +import {ImageService} from "../../_services/image.service"; +import {TranslocoDirective} from "@jsverse/transloco"; +import {CompactNumberPipe} from "../../_pipes/compact-number.pipe"; +import {ReactiveFormsModule} from "@angular/forms"; +import {PersonSortField} from "../../_models/metadata/v2/person-sort-field"; +import {PersonFilterField} from "../../_models/metadata/v2/person-filter-field"; +import {FilterUtilitiesService} from "../../shared/_services/filter-utilities.service"; +import {FilterV2} from "../../_models/metadata/v2/filter-v2"; +import {PersonFilterSettings} from "../../metadata-filter/filter-settings"; +import {FilterEvent} from "../../_models/metadata/series-filter"; +import {PersonRole} from "../../_models/metadata/person"; +import {FilterComparison} from "../../_models/metadata/v2/filter-comparison"; +import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; +import {MetadataService} from "../../_services/metadata.service"; +import {FilterStatement} from "../../_models/metadata/v2/filter-statement"; + + +@Component({ + selector: 'app-browse-people', + imports: [ + SideNavCompanionBarComponent, + TranslocoDirective, + CardDetailLayoutComponent, + DecimalPipe, + PersonCardComponent, + CompactNumberPipe, + ReactiveFormsModule, + + ], + templateUrl: './browse-people.component.html', + styleUrl: './browse-people.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class BrowsePeopleComponent { + protected readonly PersonSortField = PersonSortField; + + private readonly cdRef = inject(ChangeDetectorRef); + private readonly destroyRef = inject(DestroyRef); + private readonly router = inject(Router); + private readonly personService = inject(PersonService); + private readonly jumpbarService = inject(JumpbarService); + private readonly route = inject(ActivatedRoute); + private readonly filterUtilityService = inject(FilterUtilitiesService); + protected readonly imageService = inject(ImageService); + protected readonly metadataService = inject(MetadataService); + + isLoading = false; + authors: Array = []; + pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0}; + refresh: EventEmitter = new EventEmitter(); + jumpKeys: Array = []; + trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`; + filterSettings: PersonFilterSettings = new PersonFilterSettings(); + filterActive: boolean = false; + filterOpen: EventEmitter = new EventEmitter(); + filter: FilterV2 | undefined = undefined; + filterActiveCheck!: FilterV2; + + + constructor() { + this.isLoading = true; + this.cdRef.markForCheck(); + + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.filter = data['filter'] as FilterV2; + + if (this.filter == null) { + this.filter = this.metadataService.createDefaultFilterDto('person'); + this.filter.statements.push(this.metadataService.createDefaultFilterStatement('person') as FilterStatement); + } + + this.filterActiveCheck = this.filterUtilityService.createPersonV2Filter(); + this.filterActiveCheck!.statements.push({value: `${PersonRole.Writer},${PersonRole.CoverArtist}`, field: PersonFilterField.Role, comparison: FilterComparison.Contains}); + this.filterSettings.presetsV2 = this.filter; + + this.cdRef.markForCheck(); + this.loadData(); + }); + } + + + loadData() { + if (!this.filter) { + this.filter = this.metadataService.createDefaultFilterDto('person'); + this.filter.statements.push(this.metadataService.createDefaultFilterStatement('person') as FilterStatement); + this.cdRef.markForCheck(); + } + + this.personService.getAuthorsToBrowse(this.filter!).subscribe(d => { + this.authors = [...d.result]; + this.pagination = d.pagination; + this.jumpKeys = this.jumpbarService.getJumpKeys(this.authors, d => d.name); + this.isLoading = false; + this.cdRef.markForCheck(); + }); + } + + goToPerson(person: BrowsePerson) { + this.router.navigate(['person', person.name]); + } + + updateFilter(data: FilterEvent) { + if (data.filterV2 === undefined) return; + this.filter = data.filterV2; + + if (data.isFirst) { + this.loadData(); + return; + } + + this.filterUtilityService.updateUrlFromFilter(this.filter).subscribe((_) => { + this.loadData(); + }); + } +} diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.html b/UI/Web/src/app/browse/browse-tags/browse-tags.component.html new file mode 100644 index 000000000..dcd59bb1f --- /dev/null +++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.html @@ -0,0 +1,34 @@ +
    + + +

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

    +
    {{t('genre-count', {num: pagination.totalItems | number})}}
    + +     + + + + +
    +
    {{ item.title }}
    +
    + {{t('series-count', {num: item.seriesCount | compactNumber})}} + {{t('issue-count', {num: item.chapterCount | compactNumber})}} +
    +
    + +     +     + +     +
    diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.scss b/UI/Web/src/app/browse/browse-tags/browse-tags.component.scss new file mode 100644 index 000000000..90c313b37 --- /dev/null +++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.scss @@ -0,0 +1 @@ +@use '../../../tag-card-common'; diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts b/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts new file mode 100644 index 000000000..92910b0b9 --- /dev/null +++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts @@ -0,0 +1,67 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, inject, OnInit} from '@angular/core'; +import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component"; +import {DecimalPipe} from "@angular/common"; +import { + SideNavCompanionBarComponent +} from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component"; +import {translate, TranslocoDirective} from "@jsverse/transloco"; +import {MetadataService} from "../../_services/metadata.service"; +import {JumpbarService} from "../../_services/jumpbar.service"; +import {FilterUtilitiesService} from "../../shared/_services/filter-utilities.service"; +import {BrowseGenre} from "../../_models/metadata/browse/browse-genre"; +import {Pagination} from "../../_models/pagination"; +import {JumpKey} from "../../_models/jumpbar/jump-key"; +import {BrowsePerson} from "../../_models/metadata/browse/browse-person"; +import {FilterField} from "../../_models/metadata/v2/filter-field"; +import {FilterComparison} from "../../_models/metadata/v2/filter-comparison"; +import {BrowseTag} from "../../_models/metadata/browse/browse-tag"; +import {CompactNumberPipe} from "../../_pipes/compact-number.pipe"; +import {Title} from "@angular/platform-browser"; + +@Component({ + selector: 'app-browse-tags', + imports: [ + CardDetailLayoutComponent, + DecimalPipe, + SideNavCompanionBarComponent, + TranslocoDirective, + CompactNumberPipe + ], + templateUrl: './browse-tags.component.html', + styleUrl: './browse-tags.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class BrowseTagsComponent implements OnInit { + protected readonly FilterField = FilterField; + + private readonly cdRef = inject(ChangeDetectorRef); + private readonly metadataService = inject(MetadataService); + private readonly jumpbarService = inject(JumpbarService); + protected readonly filterUtilityService = inject(FilterUtilitiesService); + private readonly titleService = inject(Title); + + isLoading = false; + tags: Array = []; + pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0}; + refresh: EventEmitter = new EventEmitter(); + jumpKeys: Array = []; + trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`; + + ngOnInit() { + this.isLoading = true; + this.cdRef.markForCheck(); + this.titleService.setTitle('Kavita - ' + translate('browse-tags.title')); + + this.metadataService.getTagWithCounts(undefined, undefined).subscribe(d => { + this.tags = d.result; + this.pagination = d.pagination; + this.jumpKeys = this.jumpbarService.getJumpKeys(this.tags, (d: BrowseGenre) => d.title); + this.isLoading = false; + this.cdRef.markForCheck(); + }); + } + + openFilter(field: FilterField, value: string | number) { + this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${value}`).subscribe(); + } +} diff --git a/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.html b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.html new file mode 100644 index 000000000..d9dbb0715 --- /dev/null +++ b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.html @@ -0,0 +1,56 @@ + + +
    + + +
    +
    +
    + @if (profiles.length >= MaxItems) { +
    + +
    + + +
    +
    + } + +
      + @for(profile of profiles | filter: filterList; let i = $index; track profile.name) { +
    • +
      + +
      {{profile.name | sentenceCase}}
      + + @if (currentProfile && currentProfile.name === profile.name) { + {{t('bound')}} + } +
      +
      • + } + + @if (profiles.length === 0 && !isLoading) { +
    • {{t('no-data')}}
      • + } + + @if (isLoading) { +
    • + +
      • + } +
    +
    + +
    + +
    +
    + + + + + +     diff --git a/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.scss b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.scss new file mode 100644 index 000000000..0974b1867 --- /dev/null +++ b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.scss @@ -0,0 +1,14 @@ +.clickable:hover, .clickable:focus { + background-color: var(--list-group-hover-bg-color, --primary-color); +} + +.pill { + font-size: .8rem; + background-color: var(--card-bg-color); + border-radius: 0.375rem; + color: var(--badge-text-color); + + &.active { + background-color : var(--primary-color); + } +} diff --git a/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.ts b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.ts new file mode 100644 index 000000000..484fe7e75 --- /dev/null +++ b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.ts @@ -0,0 +1,120 @@ +import {AfterViewInit, ChangeDetectorRef, Component, ElementRef, inject, Input, OnInit, ViewChild} from '@angular/core'; +import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; +import {ToastrService} from "ngx-toastr"; +import {FormControl, FormGroup, ReactiveFormsModule} from "@angular/forms"; +import {translate, TranslocoDirective} from "@jsverse/transloco"; +import {ReadingProfileService} from "../../../_services/reading-profile.service"; +import {ReadingProfile, ReadingProfileKind} from "../../../_models/preferences/reading-profiles"; +import {FilterPipe} from "../../../_pipes/filter.pipe"; +import {SentenceCasePipe} from "../../../_pipes/sentence-case.pipe"; + +@Component({ + selector: 'app-bulk-set-reading-profile-modal', + imports: [ + ReactiveFormsModule, + FilterPipe, + TranslocoDirective, + SentenceCasePipe + ], + templateUrl: './bulk-set-reading-profile-modal.component.html', + styleUrl: './bulk-set-reading-profile-modal.component.scss' +}) +export class BulkSetReadingProfileModalComponent implements OnInit, AfterViewInit { + private readonly modal = inject(NgbActiveModal); + private readonly readingProfileService = inject(ReadingProfileService); + private readonly toastr = inject(ToastrService); + private readonly cdRef = inject(ChangeDetectorRef); + protected readonly MaxItems = 8; + + /** + * Modal Header - since this code is used for multiple flows + */ + @Input({required: true}) title!: string; + /** + * Series Ids to add to Reading Profile + */ + @Input() seriesIds: Array = []; + @Input() libraryId: number | undefined; + @ViewChild('title') inputElem!: ElementRef; + + currentProfile: ReadingProfile | null = null; + profiles: Array = []; + isLoading: boolean = false; + profileForm: FormGroup = new FormGroup({ + filterQuery: new FormControl('', []), // Used for inline filtering when too many RPs + }); + + ngOnInit(): void { + + this.profileForm.addControl('title', new FormControl(this.title, [])); + + this.isLoading = true; + this.cdRef.markForCheck(); + + if (this.libraryId !== undefined) { + this.readingProfileService.getForLibrary(this.libraryId).subscribe(profile => { + this.currentProfile = profile; + this.cdRef.markForCheck(); + }); + } else if (this.seriesIds.length === 1) { + this.readingProfileService.getForSeries(this.seriesIds[0], true).subscribe(profile => { + this.currentProfile = profile; + this.cdRef.markForCheck(); + }); + } + + + this.readingProfileService.getAllProfiles().subscribe(profiles => { + this.profiles = profiles; + this.isLoading = false; + this.cdRef.markForCheck(); + }); + } + + ngAfterViewInit() { + // Shift focus to input + if (this.inputElem) { + this.inputElem.nativeElement.select(); + this.cdRef.markForCheck(); + } + } + + close() { + this.modal.close(); + } + + addToProfile(profile: ReadingProfile) { + if (this.seriesIds.length == 1) { + this.readingProfileService.addToSeries(profile.id, this.seriesIds[0]).subscribe(() => { + this.toastr.success(translate('toasts.series-bound-to-reading-profile', {name: profile.name})); + this.modal.close(); + }); + return; + } + + if (this.seriesIds.length > 1) { + this.readingProfileService.bulkAddToSeries(profile.id, this.seriesIds).subscribe(() => { + this.toastr.success(translate('toasts.series-bound-to-reading-profile', {name: profile.name})); + this.modal.close(); + }); + return; + } + + if (this.libraryId) { + this.readingProfileService.addToLibrary(profile.id, this.libraryId).subscribe(() => { + this.toastr.success(translate('toasts.library-bound-to-reading-profile', {name: profile.name})); + this.modal.close(); + }); + } + } + + filterList = (listItem: ReadingProfile) => { + return listItem.name.toLowerCase().indexOf((this.profileForm.value.filterQuery || '').toLowerCase()) >= 0; + } + + clear() { + this.profileForm.get('filterQuery')?.setValue(''); + } + + protected readonly ReadingProfileKind = ReadingProfileKind; +} diff --git a/UI/Web/src/app/cards/bulk-selection.service.ts b/UI/Web/src/app/cards/bulk-selection.service.ts index ff80a0288..2fa84b50d 100644 --- a/UI/Web/src/app/cards/bulk-selection.service.ts +++ b/UI/Web/src/app/cards/bulk-selection.service.ts @@ -144,7 +144,7 @@ export class BulkSelectionService { */ getActions(callback: (action: ActionItem, data: any) => void) { const allowedActions = [Action.AddToReadingList, Action.MarkAsRead, Action.MarkAsUnread, Action.AddToCollection, - Action.Delete, Action.AddToWantToReadList, Action.RemoveFromWantToReadList]; + Action.Delete, Action.AddToWantToReadList, Action.RemoveFromWantToReadList, Action.SetReadingProfile]; if (Object.keys(this.selectedCards).filter(item => item === 'series').length > 0) { return this.applyFilterToList(this.actionFactory.getSeriesActions(callback), allowedActions); diff --git a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html index 1981efdab..2bf0a2608 100644 --- a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html +++ b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html @@ -1,18 +1,18 @@ - @if (header.length > 0) { + @if (header().length > 0) {

    - @if (actions.length > 0) { + @if (actions().length > 0) { -   +   } - {{header}}  + {{header()}}  @if (pagination) { {{pagination.totalItems}} @@ -24,7 +24,10 @@

    } - + @if (filterSettings) { + + } +
    @@ -34,13 +37,14 @@
    -
    - -
    + @for (item of scroll.viewPortItems; track trackByIdentity(i, item); let i = $index) { +
    + +
    + }
    @@ -54,9 +58,11 @@
    +
    +
    diff --git a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts index ddc9b5564..183081409 100644 --- a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts +++ b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts @@ -3,6 +3,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, + computed, ContentChild, DestroyRef, ElementRef, @@ -10,20 +11,22 @@ import { HostListener, inject, Inject, + input, Input, OnChanges, OnInit, Output, + signal, + Signal, SimpleChange, SimpleChanges, TemplateRef, TrackByFunction, - ViewChild + ViewChild, + WritableSignal } from '@angular/core'; import {NavigationStart, Router} from '@angular/router'; import {VirtualScrollerComponent, VirtualScrollerModule} from '@iharbeck/ngx-virtual-scroller'; -import {FilterSettings} from 'src/app/metadata-filter/filter-settings'; -import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service'; import {Breakpoint, UtilityService} from 'src/app/shared/_services/utility.service'; import {JumpKey} from 'src/app/_models/jumpbar/jump-key'; import {Library} from 'src/app/_models/library/library'; @@ -35,43 +38,59 @@ import {LoadingComponent} from "../../shared/loading/loading.component"; import {MetadataFilterComponent} from "../../metadata-filter/metadata-filter.component"; import {TranslocoDirective} from "@jsverse/transloco"; import {CardActionablesComponent} from "../../_single-module/card-actionables/card-actionables.component"; -import {SeriesFilterV2} from "../../_models/metadata/v2/series-filter-v2"; import {filter, map} from "rxjs/operators"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {tap} from "rxjs"; +import {FilterV2} from "../../_models/metadata/v2/filter-v2"; +import {FilterSettingsBase, ValidFilterEntity} from "../../metadata-filter/filter-settings"; const ANIMATION_TIME_MS = 0; +/** + * Provides a virtualized card layout, jump bar, and metadata filter bar. + * + * How to use: + * - For filtering: + * - pass a filterSettings which will bootstrap the filtering bar + * - pass a jumpbar method binding to calc the count for the entity (not implemented yet) + * - For card layout + * - Pass an identity function for trackby + * - Pass a pagination object for the total count + * - Pass the items + * - + */ @Component({ selector: 'app-card-detail-layout', imports: [LoadingComponent, VirtualScrollerModule, CardActionablesComponent, MetadataFilterComponent, TranslocoDirective, NgTemplateOutlet, NgClass, NgForOf], templateUrl: './card-detail-layout.component.html', styleUrls: ['./card-detail-layout.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true }) -export class CardDetailLayoutComponent implements OnInit, OnChanges { +export class CardDetailLayoutComponent implements OnInit, OnChanges { - private readonly filterUtilityService = inject(FilterUtilitiesService); protected readonly utilityService = inject(UtilityService); private readonly cdRef = inject(ChangeDetectorRef); private readonly jumpbarService = inject(JumpbarService); private readonly router = inject(Router); private readonly destroyRef = inject(DestroyRef); - protected readonly Breakpoint = Breakpoint; - @Input() header: string = ''; + + header: Signal = input(''); @Input() isLoading: boolean = false; - @Input() items: any[] = []; @Input() pagination!: Pagination; + @Input() items: any[] = []; + + /** * Parent scroll for virtualize pagination */ @Input() parentScroll!: Element | Window; - // Filter Code + // We need to pass filterOpen from the grandfather to the metadata filter due to the filter button being in a separate component @Input() filterOpen!: EventEmitter; /** * Should filtering be shown on the page @@ -80,15 +99,20 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges { /** * Any actions to exist on the header for the parent collection (library, collection) */ - @Input() actions: ActionItem[] = []; + actions: Signal[]> = input([]); /** * A trackBy to help with rendering. This is required as without it there are issues when scrolling */ @Input({required: true}) trackByIdentity!: TrackByFunction; - @Input() filterSettings!: FilterSettings; + @Input() filterSettings: FilterSettingsBase | undefined = undefined; + entityType = input(); @Input() refresh!: EventEmitter; + /** + * Will force the jumpbar to be disabled - in cases where you're not using a traditional filter config + */ + customSort = input(false); @Input() jumpBarKeys: Array = []; // This is approx 784 pixels tall, original keys jumpBarKeysToRender: Array = []; // What is rendered on screen @@ -101,13 +125,21 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges { @ViewChild(VirtualScrollerComponent) private virtualScroller!: VirtualScrollerComponent; - filter: SeriesFilterV2 = this.filterUtilityService.createSeriesV2Filter(); libraries: Array> = []; updateApplied: number = 0; bufferAmount: number = 1; + filterSignal: WritableSignal | undefined> = signal(undefined); + hasCustomSort = computed(() => { + if (this.customSort()) return true; + if (this.filteringDisabled) return false; + + const filter = this.filterSignal(); + return filter?.sortOptions?.sortField != SortField.SortName || !filter?.sortOptions.isAscending; + }); + constructor(@Inject(DOCUMENT) private document: Document) {} @@ -122,16 +154,12 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges { ngOnInit(): void { if (this.trackByIdentity === undefined) { - this.trackByIdentity = (_: number, item: any) => `${this.header}_${this.updateApplied}_${item?.libraryId}`; - } - - if (this.filterSettings === undefined) { - this.filterSettings = new FilterSettings(); - this.cdRef.markForCheck(); + this.trackByIdentity = (_: number, item: any) => `${this.header()}_${this.updateApplied}_${item?.id}`; } if (this.pagination === undefined) { - this.pagination = {currentPage: 1, itemsPerPage: this.items.length, totalItems: this.items.length, totalPages: 1}; + const items = this.items; + this.pagination = {currentPage: 1, itemsPerPage: items.length, totalItems: items.length, totalPages: 1}; this.cdRef.markForCheck(); } @@ -170,24 +198,16 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges { } } - hasCustomSort() { - if (this.filteringDisabled) return false; - const hasCustomSort = this.filter?.sortOptions?.sortField != SortField.SortName || !this.filter?.sortOptions.isAscending; - //const hasNonDefaultSortField = this.filterSettings?.presetsV2?.sortOptions?.sortField != SortField.SortName; - - return hasCustomSort; - } - performAction(action: ActionItem) { if (typeof action.callback === 'function') { action.callback(action, undefined); } } - applyMetadataFilter(event: FilterEvent) { - this.applyFilter.emit(event); + applyMetadataFilter(event: FilterEvent) { + this.applyFilter.emit(event as FilterEvent); this.updateApplied++; - this.filter = event.filterV2; + this.filterSignal.set(event.filterV2); this.cdRef.markForCheck(); } @@ -208,4 +228,6 @@ export class CardDetailLayoutComponent implements OnInit, OnChanges { tryToSaveJumpKey() { this.jumpbarService.saveResumePosition(this.router.url, this.virtualScroller.viewPortInfo.startIndex); } + + protected readonly Breakpoint = Breakpoint; } 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 dc89c563c..c0a4c0890 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 @@ -94,7 +94,7 @@ @if (actions && actions.length > 0) { - + }
    diff --git a/UI/Web/src/app/cards/card-item/card-item.component.ts b/UI/Web/src/app/cards/card-item/card-item.component.ts index 6bdbcaf18..c01fbca98 100644 --- a/UI/Web/src/app/cards/card-item/card-item.component.ts +++ b/UI/Web/src/app/cards/card-item/card-item.component.ts @@ -26,7 +26,7 @@ import {Series} from 'src/app/_models/series'; import {User} from 'src/app/_models/user'; import {Volume} from 'src/app/_models/volume'; import {AccountService} from 'src/app/_services/account.service'; -import {Action, ActionFactoryService, ActionItem} from 'src/app/_services/action-factory.service'; +import {Action, ActionableEntity, ActionFactoryService, ActionItem} from 'src/app/_services/action-factory.service'; import {ImageService} from 'src/app/_services/image.service'; import {LibraryService} from 'src/app/_services/library.service'; import {EVENTS, MessageHubService} from 'src/app/_services/message-hub.service'; @@ -46,7 +46,7 @@ import {NextExpectedChapter} from "../../_models/series-detail/next-expected-cha import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; import {PromotedIconComponent} from "../../shared/_components/promoted-icon/promoted-icon.component"; import {SeriesFormatComponent} from "../../shared/series-format/series-format.component"; -import {BrowsePerson} from "../../_models/person/browse-person"; +import {BrowsePerson} from "../../_models/metadata/browse/browse-person"; import {CompactNumberPipe} from "../../_pipes/compact-number.pipe"; export type CardEntity = Series | Volume | Chapter | UserCollection | PageBookmark | RecentlyAddedItem | NextExpectedChapter | BrowsePerson; @@ -118,6 +118,10 @@ export class CardItemComponent implements OnInit { * This is the entity we are representing. It will be returned if an action is executed. */ @Input({required: true}) entity!: CardEntity; + /** + * An optional entity to be used in the action callback + */ + @Input() actionEntity: ActionableEntity | null = null; /** * If the entity is selected or not. */ diff --git a/UI/Web/src/app/cards/person-card/person-card.component.ts b/UI/Web/src/app/cards/person-card/person-card.component.ts index 4d50c9926..2e06ed1ad 100644 --- a/UI/Web/src/app/cards/person-card/person-card.component.ts +++ b/UI/Web/src/app/cards/person-card/person-card.component.ts @@ -19,7 +19,7 @@ import {ScrollService} from "../../_services/scroll.service"; import {NgbTooltip} from "@ng-bootstrap/ng-bootstrap"; import {CardActionablesComponent} from "../../_single-module/card-actionables/card-actionables.component"; import {NgTemplateOutlet} from "@angular/common"; -import {BrowsePerson} from "../../_models/person/browse-person"; +import {BrowsePerson} from "../../_models/metadata/browse/browse-person"; import {Person} from "../../_models/metadata/person"; import {FormsModule} from "@angular/forms"; import {ImageComponent} from "../../shared/image/image.component"; diff --git a/UI/Web/src/app/cards/series-card/series-card.component.ts b/UI/Web/src/app/cards/series-card/series-card.component.ts index c6cfa825f..052f71107 100644 --- a/UI/Web/src/app/cards/series-card/series-card.component.ts +++ b/UI/Web/src/app/cards/series-card/series-card.component.ts @@ -24,7 +24,7 @@ import {RelationKind} from 'src/app/_models/series-detail/relation-kind'; import {DecimalPipe} from "@angular/common"; import {RelationshipPipe} from "../../_pipes/relationship.pipe"; import {Device} from "../../_models/device/device"; -import {translate, TranslocoDirective} from "@jsverse/transloco"; +import {translate, TranslocoDirective, TranslocoService} from "@jsverse/transloco"; import {SeriesPreviewDrawerComponent} from "../../_single-module/series-preview-drawer/series-preview-drawer.component"; import {CardActionablesComponent} from "../../_single-module/card-actionables/card-actionables.component"; import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; @@ -41,6 +41,7 @@ import {ScrollService} from "../../_services/scroll.service"; import {ReaderService} from "../../_services/reader.service"; import {SeriesFormatComponent} from "../../shared/series-format/series-format.component"; import {DefaultModalOptions} from "../../_models/default-modal-options"; +import {ReadingProfileService} from "../../_services/reading-profile.service"; function deepClone(obj: any): any { if (obj === null || typeof obj !== 'object') { @@ -92,6 +93,8 @@ export class SeriesCardComponent implements OnInit, OnChanges { private readonly downloadService = inject(DownloadService); private readonly scrollService = inject(ScrollService); private readonly readerService = inject(ReaderService); + private readonly readingProfilesService = inject(ReadingProfileService); + private readonly translocoService = inject(TranslocoService); @Input({required: true}) series!: Series; @Input() libraryId = 0; @@ -276,6 +279,14 @@ export class SeriesCardComponent implements OnInit, OnChanges { case Action.Download: this.downloadService.download('series', this.series); break; + case Action.SetReadingProfile: + this.actionService.setReadingProfileForMultiple([series]); + break; + case Action.ClearReadingProfile: + this.readingProfilesService.clearSeriesProfiles(series.id).subscribe(() => { + this.toastr.success(this.translocoService.translate('actionable.cleared-profile')); + }); + break; default: break; } diff --git a/UI/Web/src/app/collections/_components/all-collections/all-collections.component.html b/UI/Web/src/app/collections/_components/all-collections/all-collections.component.html index 09923b239..599d1c156 100644 --- a/UI/Web/src/app/collections/_components/all-collections/all-collections.component.html +++ b/UI/Web/src/app/collections/_components/all-collections/all-collections.component.html @@ -14,7 +14,7 @@ [trackByIdentity]="trackByIdentity" > - { if (!user) return; - this.collectionTagActions = this.actionFactoryService.getCollectionTagActions(this.handleCollectionActionCallback.bind(this)) + this.collectionTagActions = this.actionFactoryService.getCollectionTagActions( + this.handleCollectionActionCallback.bind(this), this.shouldRenderCollection.bind(this)) .filter(action => this.collectionService.actionListFilter(action, user)); this.cdRef.markForCheck(); }); } + shouldRenderCollection(action: ActionItem, entity: UserCollection, user: User) { + switch (action.action) { + case Action.Promote: + return !entity.promoted; + case Action.UnPromote: + return entity.promoted; + default: + return true; + } + } + loadCollection(item: UserCollection) { this.router.navigate(['collections', item.id]); } 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 927316f99..1fad4b6e8 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,7 +11,7 @@ } -
    {{t('item-count', {num: series.length})}}
    +
    {{t('item-count', {num: series.length})}}
    } diff --git a/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts index ceb539718..9b3f55240 100644 --- a/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts +++ b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts @@ -19,7 +19,6 @@ import {ToastrService} from 'ngx-toastr'; import {debounceTime, take} from 'rxjs/operators'; import {BulkSelectionService} from 'src/app/cards/bulk-selection.service'; import {EditCollectionTagsComponent} from 'src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component'; -import {FilterSettings} from 'src/app/metadata-filter/filter-settings'; import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service'; import {Breakpoint, UtilityService} from 'src/app/shared/_services/utility.service'; import {UserCollection} from 'src/app/_models/collection-tag'; @@ -27,7 +26,7 @@ import {SeriesAddedToCollectionEvent} from 'src/app/_models/events/series-added- import {JumpKey} from 'src/app/_models/jumpbar/jump-key'; import {Pagination} from 'src/app/_models/pagination'; import {Series} from 'src/app/_models/series'; -import {FilterEvent} from 'src/app/_models/metadata/series-filter'; +import {FilterEvent, SortField} from 'src/app/_models/metadata/series-filter'; import {Action, ActionFactoryService, ActionItem} from 'src/app/_services/action-factory.service'; import {ActionService} from 'src/app/_services/action.service'; import {CollectionTagService} from 'src/app/_services/collection-tag.service'; @@ -49,8 +48,7 @@ import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {translate, TranslocoDirective, TranslocoService} from "@jsverse/transloco"; import {CardActionablesComponent} from "../../../_single-module/card-actionables/card-actionables.component"; import {FilterField} from "../../../_models/metadata/v2/filter-field"; -import {FilterComparison} from "../../../_models/metadata/v2/filter-comparison"; -import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../../../_models/metadata/v2/filter-v2"; import {AccountService} from "../../../_services/account.service"; import {User} from "../../../_models/user"; import {ScrobbleProvider} from "../../../_services/scrobbling.service"; @@ -62,6 +60,10 @@ import { import {DefaultModalOptions} from "../../../_models/default-modal-options"; import {ScrobbleProviderNamePipe} from "../../../_pipes/scrobble-provider-name.pipe"; import {PromotedIconComponent} from "../../../shared/_components/promoted-icon/promoted-icon.component"; +import {FilterStatement} from "../../../_models/metadata/v2/filter-statement"; +import {SeriesFilterSettings} from "../../../metadata-filter/filter-settings"; +import {MetadataService} from "../../../_services/metadata.service"; +import {FilterComparison} from "../../../_models/metadata/v2/filter-comparison"; @Component({ selector: 'app-collection-detail', @@ -95,6 +97,7 @@ export class CollectionDetailComponent implements OnInit, AfterContentChecked { protected readonly utilityService = inject(UtilityService); private readonly cdRef = inject(ChangeDetectorRef); private readonly scrollService = inject(ScrollService); + private readonly metadataService = inject(MetadataService); protected readonly ScrobbleProvider = ScrobbleProvider; protected readonly Breakpoint = Breakpoint; @@ -109,13 +112,13 @@ export class CollectionDetailComponent implements OnInit, AfterContentChecked { series: Array = []; pagination: Pagination = new Pagination(); collectionTagActions: ActionItem[] = []; - filter: SeriesFilterV2 | undefined = undefined; - filterSettings: FilterSettings = new FilterSettings(); + filter: FilterV2 | undefined = undefined; + filterSettings: SeriesFilterSettings = new SeriesFilterSettings(); summary: string = ''; user!: User; actionInProgress: boolean = false; - filterActiveCheck!: SeriesFilterV2; + filterActiveCheck!: FilterV2; filterActive: boolean = false; jumpbarKeys: Array = []; @@ -188,18 +191,26 @@ export class CollectionDetailComponent implements OnInit, AfterContentChecked { } const tagId = parseInt(routeId, 10); - this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => { - this.filter = filter; + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.filter = data['filter'] as FilterV2; - if (this.filter.statements.filter(stmt => stmt.field === FilterField.CollectionTags).length === 0) { - this.filter!.statements.push({field: FilterField.CollectionTags, value: tagId + '', comparison: FilterComparison.Equal}); + const defaultStmt = {field: FilterField.CollectionTags, value: tagId + '', comparison: FilterComparison.Equal}; + + if (this.filter == null) { + this.filter = this.metadataService.createDefaultFilterDto('series'); + this.filter.statements.push(defaultStmt); } - this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter(); - this.filterActiveCheck!.statements.push({field: FilterField.CollectionTags, value: tagId + '', comparison: FilterComparison.Equal}); + + if (this.filter.statements.filter((stmt: FilterStatement) => stmt.field === FilterField.CollectionTags).length === 0) { + this.filter!.statements.push(defaultStmt); + } + + this.filterActiveCheck = this.metadataService.createDefaultFilterDto('series'); + this.filterActiveCheck!.statements.push(defaultStmt); this.filterSettings.presetsV2 = this.filter; - this.cdRef.markForCheck(); this.updateTag(tagId); + this.cdRef.markForCheck(); }); } @@ -207,7 +218,8 @@ export class CollectionDetailComponent implements OnInit, AfterContentChecked { this.accountService.currentUser$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(user => { if (!user) return; this.user = user; - this.collectionTagActions = this.actionFactoryService.getCollectionTagActions(this.handleCollectionActionCallback.bind(this)) + this.collectionTagActions = this.actionFactoryService.getCollectionTagActions( + this.handleCollectionActionCallback.bind(this), this.shouldRenderCollection.bind(this)) .filter(action => this.collectionService.actionListFilter(action, user)); this.cdRef.markForCheck(); }); @@ -225,6 +237,17 @@ export class CollectionDetailComponent implements OnInit, AfterContentChecked { }); } + shouldRenderCollection(action: ActionItem, entity: UserCollection, user: User) { + switch (action.action) { + case Action.Promote: + return !entity.promoted; + case Action.UnPromote: + return entity.promoted; + default: + return true; + } + } + ngAfterContentChecked(): void { this.scrollService.setScrollContainer(this.scrollingBlock); } @@ -259,7 +282,7 @@ export class CollectionDetailComponent implements OnInit, AfterContentChecked { }); } - updateFilter(data: FilterEvent) { + updateFilter(data: FilterEvent) { if (data.filterV2 === undefined) return; this.filter = data.filterV2; diff --git a/UI/Web/src/app/dashboard/_components/dashboard.component.ts b/UI/Web/src/app/dashboard/_components/dashboard.component.ts index 73fd10e89..12f763313 100644 --- a/UI/Web/src/app/dashboard/_components/dashboard.component.ts +++ b/UI/Web/src/app/dashboard/_components/dashboard.component.ts @@ -219,7 +219,7 @@ export class DashboardComponent implements OnInit { const params: any = {}; params['page'] = 1; params['title'] = translate('dashboard.recently-updated-title'); - const filter = this.filterUtilityService.createSeriesV2Filter(); + const filter = this.metadataService.createDefaultFilterDto('series'); if (filter.sortOptions) { filter.sortOptions.sortField = SortField.LastChapterAdded; filter.sortOptions.isAscending = false; @@ -230,7 +230,7 @@ export class DashboardComponent implements OnInit { params['page'] = 1; params['title'] = translate('dashboard.on-deck-title'); - const filter = this.filterUtilityService.createSeriesV2Filter(); + const filter = this.metadataService.createDefaultFilterDto('series'); filter.statements.push({field: FilterField.ReadProgress, comparison: FilterComparison.GreaterThan, value: '0'}); filter.statements.push({field: FilterField.ReadProgress, comparison: FilterComparison.NotEqual, value: '100'}); if (filter.sortOptions) { @@ -242,7 +242,7 @@ export class DashboardComponent implements OnInit { const params: any = {}; params['page'] = 1; params['title'] = translate('dashboard.recently-added-title'); - const filter = this.filterUtilityService.createSeriesV2Filter(); + const filter = this.metadataService.createDefaultFilterDto('series'); if (filter.sortOptions) { filter.sortOptions.sortField = SortField.Created; filter.sortOptions.isAscending = false; @@ -252,7 +252,7 @@ export class DashboardComponent implements OnInit { const params: any = {}; params['page'] = 1; params['title'] = translate('dashboard.more-in-genre-title', {genre: this.genre?.title}); - const filter = this.filterUtilityService.createSeriesV2Filter(); + const filter = this.metadataService.createDefaultFilterDto('series'); filter.statements.push({field: FilterField.Genres, value: this.genre?.id + '', comparison: FilterComparison.MustContains}); this.filterUtilityService.applyFilterWithParams(['all-series'], filter, params).subscribe(); } diff --git a/UI/Web/src/app/library-detail/library-detail.component.ts b/UI/Web/src/app/library-detail/library-detail.component.ts index 8b816fc1c..62a60fa7b 100644 --- a/UI/Web/src/app/library-detail/library-detail.component.ts +++ b/UI/Web/src/app/library-detail/library-detail.component.ts @@ -17,7 +17,7 @@ import {SeriesAddedEvent} from '../_models/events/series-added-event'; import {Library} from '../_models/library/library'; import {Pagination} from '../_models/pagination'; import {Series} from '../_models/series'; -import {FilterEvent} from '../_models/metadata/series-filter'; +import {FilterEvent, SortField} from '../_models/metadata/series-filter'; import {Action, ActionFactoryService, ActionItem} from '../_services/action-factory.service'; import {ActionService} from '../_services/action.service'; import {LibraryService} from '../_services/library.service'; @@ -25,7 +25,6 @@ import {EVENTS, MessageHubService} from '../_services/message-hub.service'; import {SeriesService} from '../_services/series.service'; import {NavService} from '../_services/nav.service'; import {FilterUtilitiesService} from '../shared/_services/filter-utilities.service'; -import {FilterSettings} from '../metadata-filter/filter-settings'; import {JumpKey} from '../_models/jumpbar/jump-key'; import {SeriesRemovedEvent} from '../_models/events/series-removed-event'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; @@ -37,12 +36,14 @@ import { SideNavCompanionBarComponent } from '../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component'; import {TranslocoDirective} from "@jsverse/transloco"; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import {FilterComparison} from "../_models/metadata/v2/filter-comparison"; import {FilterField} from "../_models/metadata/v2/filter-field"; import {CardActionablesComponent} from "../_single-module/card-actionables/card-actionables.component"; import {LoadingComponent} from "../shared/loading/loading.component"; import {debounceTime, ReplaySubject, tap} from "rxjs"; +import {SeriesFilterSettings} from "../metadata-filter/filter-settings"; +import {MetadataService} from "../_services/metadata.service"; @Component({ selector: 'app-library-detail', @@ -68,6 +69,7 @@ export class LibraryDetailComponent implements OnInit { private readonly filterUtilityService = inject(FilterUtilitiesService); public readonly navService = inject(NavService); public readonly bulkSelectionService = inject(BulkSelectionService); + public readonly metadataService = inject(MetadataService); libraryId!: number; libraryName = ''; @@ -75,11 +77,11 @@ export class LibraryDetailComponent implements OnInit { loadingSeries = false; pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0}; actions: ActionItem[] = []; - filter: SeriesFilterV2 | undefined = undefined; - filterSettings: FilterSettings = new FilterSettings(); + filter: FilterV2 | undefined = undefined; + filterSettings: SeriesFilterSettings = new SeriesFilterSettings(); filterOpen: EventEmitter = new EventEmitter(); filterActive: boolean = false; - filterActiveCheck!: SeriesFilterV2; + filterActiveCheck!: FilterV2; refresh: EventEmitter = new EventEmitter(); jumpKeys: Array = []; bulkLoader: boolean = false; @@ -149,6 +151,14 @@ export class LibraryDetailComponent implements OnInit { this.loadPage(); }); break; + case Action.SetReadingProfile: + this.actionService.setReadingProfileForMultiple(selectedSeries, (success) => { + this.bulkLoader = false; + this.cdRef.markForCheck(); + if (!success) return; + this.bulkSelectionService.deselectAll(); + this.loadPage(); + }) } } @@ -176,16 +186,19 @@ export class LibraryDetailComponent implements OnInit { this.actions = this.actionFactoryService.getLibraryActions(this.handleAction.bind(this)); - this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => { - this.filter = filter; + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.filter = data['filter'] as FilterV2; - if (this.filter.statements.filter(stmt => stmt.field === FilterField.Libraries).length === 0) { - this.filter!.statements.push({field: FilterField.Libraries, value: this.libraryId + '', comparison: FilterComparison.Equal}); + const defaultStmt = {field: FilterField.Libraries, value: this.libraryId + '', comparison: FilterComparison.Equal}; + + if (this.filter == null) { + this.filter = this.metadataService.createDefaultFilterDto('series'); + this.filter.statements.push(defaultStmt); } - this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter(); - this.filterActiveCheck.statements.push({field: FilterField.Libraries, value: this.libraryId + '', comparison: FilterComparison.Equal}); + this.filterActiveCheck = this.metadataService.createDefaultFilterDto('series'); + this.filterActiveCheck!.statements.push(defaultStmt); this.filterSettings.presetsV2 = this.filter; this.loadPage$.pipe(takeUntilDestroyed(this.destroyRef), debounceTime(100), tap(_ => this.loadPage())).subscribe(); @@ -303,7 +316,7 @@ export class LibraryDetailComponent implements OnInit { } } - updateFilter(data: FilterEvent) { + updateFilter(data: FilterEvent) { if (data.filterV2 === undefined) return; this.filter = data.filterV2; diff --git a/UI/Web/src/app/manga-reader/_components/infinite-scroller/infinite-scroller.component.html b/UI/Web/src/app/manga-reader/_components/infinite-scroller/infinite-scroller.component.html index 09e84ba6f..98dc26ba4 100644 --- a/UI/Web/src/app/manga-reader/_components/infinite-scroller/infinite-scroller.component.html +++ b/UI/Web/src/app/manga-reader/_components/infinite-scroller/infinite-scroller.component.html @@ -33,8 +33,9 @@
    @for(item of webtoonImages | async; let index = $index; track item.src) { - image string; @Input({required: true}) readerSettings$!: Observable; + @Input({required: true}) readingProfile!: ReadingProfile; @Output() pageNumberChange: EventEmitter = new EventEmitter(); @Output() loadNextChapter: EventEmitter = new EventEmitter(); @Output() loadPrevChapter: EventEmitter = new EventEmitter(); @@ -174,13 +179,8 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy, */ debugLogFilter: Array = ['[PREFETCH]', '[Intersection]', '[Visibility]', '[Image Load]']; - /** - * Width override for manual width control - * 2 observables needed to avoid flickering, probably due to data races, when changing the width - * this allows to precisely define execution order - */ - widthOverride$ : Observable = new Observable(); - widthSliderValue$ : Observable = new Observable(); + readerSettings!: Signal; + widthOverride!: Signal; get minPageLoaded() { return Math.min(...Object.values(this.imagesLoaded)); @@ -240,30 +240,37 @@ export class InfiniteScrollerComponent implements OnInit, OnChanges, OnDestroy, takeUntilDestroyed(this.destroyRef) ); + // We need the injector as toSignal is only allowed in injection context + // https://angular.dev/guide/signals#injection-context + this.readerSettings = toSignal(this.readerSettings$, {injector: this.injector, requireSync: true}); - this.widthSliderValue$ = this.readerSettings$.pipe( - map(values => (parseInt(values.widthSlider) <= 0) ? '' : values.widthSlider + '%'), - takeUntilDestroyed(this.destroyRef) - ); + // Automatically updates when the breakpoint changes, or when reader settings changes + this.widthOverride = computed(() => { + const breakpoint = this.utilityService.activeUserBreakpoint(); + const value = this.readerSettings().widthSlider; - this.widthOverride$ = this.widthSliderValue$; + if (breakpoint <= this.readingProfile.disableWidthOverride) { + return ''; + } + return (parseInt(value) <= 0) ? '' : value + '%'; + }); //perform jump so the page stays in view - this.widthSliderValue$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(val => { + effect(() => { + const width = this.widthOverride(); // needs to be at the top for effect to work this.currentPageElem = this.document.querySelector('img#page-' + this.pageNum); if(!this.currentPageElem) return; let images = Array.from(document.querySelectorAll('img[id^="page-"]')) as HTMLImageElement[]; images.forEach((img) => { - this.renderer.setStyle(img, "width", val); + this.renderer.setStyle(img, "width", width); }); - this.widthOverride$ = this.widthSliderValue$; this.prevScrollPosition = this.currentPageElem.getBoundingClientRect().top; this.currentPageElem.scrollIntoView(); this.cdRef.markForCheck(); - }); + }, {injector: this.injector}); if (this.goToPage) { this.goToPage.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(page => { diff --git a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html index 195b66b2b..89041956c 100644 --- a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html +++ b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html @@ -53,7 +53,6 @@
    - @if (readerMode !== ReaderMode.Webtoon) {
    + [showClickOverlay$]="showClickOverlay$" + [readingProfile]="readingProfile"> + [readerSettings$]="readerSettings$" + [readingProfile]="readingProfile">
    } @@ -311,7 +312,17 @@
    - + +
    diff --git a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts index 595ae6079..9483afdb3 100644 --- a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts +++ b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts @@ -32,7 +32,7 @@ import { import {ChangeContext, LabelType, NgxSliderModule, Options} from '@angular-slider/ngx-slider'; import {animate, state, style, transition, trigger} from '@angular/animations'; import {FormBuilder, FormControl, FormGroup, ReactiveFormsModule} from '@angular/forms'; -import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {NgbModal, NgbTooltip} from '@ng-bootstrap/ng-bootstrap'; import {ToastrService} from 'ngx-toastr'; import {ShortcutsModalComponent} from 'src/app/reader-shared/_modals/shortcuts-modal/shortcuts-modal.component'; import {Stack} from 'src/app/shared/data-structures/stack'; @@ -40,7 +40,6 @@ import {Breakpoint, KEY_CODES, UtilityService} from 'src/app/shared/_services/ut import {LibraryType} from 'src/app/_models/library/library'; import {MangaFormat} from 'src/app/_models/manga-format'; import {PageSplitOption} from 'src/app/_models/preferences/page-split-option'; -import {layoutModes, pageSplitOptions} from 'src/app/_models/preferences/preferences'; import {ReaderMode} from 'src/app/_models/preferences/reader-mode'; import {ReadingDirection} from 'src/app/_models/preferences/reading-direction'; import {ScalingOption} from 'src/app/_models/preferences/scaling-option'; @@ -70,6 +69,14 @@ import {LoadingComponent} from '../../../shared/loading/loading.component'; import {translate, TranslocoDirective} from "@jsverse/transloco"; import {shareReplay} from "rxjs/operators"; import {DblClickDirective} from "../../../_directives/dbl-click.directive"; +import { + layoutModes, + pageSplitOptions, + ReadingProfile, + ReadingProfileKind +} from "../../../_models/preferences/reading-profiles"; +import {ReadingProfileService} from "../../../_services/reading-profile.service"; +import {ConfirmService} from "../../../shared/confirm.service"; const PREFETCH_PAGES = 10; @@ -122,10 +129,10 @@ enum KeyDirection { ]) ]) ], - imports: [NgStyle, LoadingComponent, SwipeDirective, CanvasRendererComponent, SingleRendererComponent, - DoubleRendererComponent, DoubleReverseRendererComponent, DoubleNoCoverRendererComponent, InfiniteScrollerComponent, - NgxSliderModule, ReactiveFormsModule, FittingIconPipe, ReaderModeIconPipe, - FullscreenIconPipe, TranslocoDirective, PercentPipe, NgClass, AsyncPipe, DblClickDirective] + imports: [NgStyle, LoadingComponent, SwipeDirective, CanvasRendererComponent, SingleRendererComponent, + DoubleRendererComponent, DoubleReverseRendererComponent, DoubleNoCoverRendererComponent, InfiniteScrollerComponent, + NgxSliderModule, ReactiveFormsModule, FittingIconPipe, ReaderModeIconPipe, + FullscreenIconPipe, TranslocoDirective, PercentPipe, NgClass, AsyncPipe, DblClickDirective, NgbTooltip] }) export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { @@ -150,9 +157,12 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { private readonly modalService = inject(NgbModal); private readonly cdRef = inject(ChangeDetectorRef); private readonly toastr = inject(ToastrService); - public readonly readerService = inject(ReaderService); - public readonly utilityService = inject(UtilityService); - public readonly mangaReaderService = inject(MangaReaderService); + private readonly readingProfileService = inject(ReadingProfileService); + private readonly confirmService = inject(ConfirmService); + protected readonly readerService = inject(ReaderService); + protected readonly utilityService = inject(UtilityService); + protected readonly mangaReaderService = inject(MangaReaderService); + protected readonly KeyDirection = KeyDirection; protected readonly ReaderMode = ReaderMode; @@ -194,6 +204,11 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { totalSeriesPages = 0; totalSeriesPagesRead = 0; user!: User; + readingProfile!: ReadingProfile; + /** + * The reading profile itself, unless readingProfile is implicit + */ + parentReadingProfile: ReadingProfile | null = null; generalSettingsForm!: FormGroup; readingDirection = ReadingDirection.LeftToRight; @@ -488,6 +503,17 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { this.incognitoMode = this.route.snapshot.queryParamMap.get('incognitoMode') === 'true'; this.bookmarkMode = this.route.snapshot.queryParamMap.get('bookmarkMode') === 'true'; + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.readingProfile = data['readingProfile']; + if (this.readingProfile == null) { + this.router.navigateByUrl('/home'); + return; + } + // Requires seriesId to be set + this.setupReaderSettings(); + this.cdRef.markForCheck(); + }); + const readingListId = this.route.snapshot.queryParamMap.get('readingListId'); if (readingListId != null) { this.readingListMode = true; @@ -502,101 +528,9 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { return; } + this.user = user; this.hasBookmarkRights = this.accountService.hasBookmarkRole(user) || this.accountService.hasAdminRole(user); - this.readingDirection = this.user.preferences.readingDirection; - this.scalingOption = this.user.preferences.scalingOption; - this.pageSplitOption = this.user.preferences.pageSplitOption; - this.autoCloseMenu = this.user.preferences.autoCloseMenu; - this.readerMode = this.user.preferences.readerMode; - this.layoutMode = this.user.preferences.layoutMode || LayoutMode.Single; - this.backgroundColor = this.user.preferences.backgroundColor || '#000000'; - this.readerService.setOverrideStyles(this.backgroundColor); - - this.generalSettingsForm = this.formBuilder.nonNullable.group({ - autoCloseMenu: new FormControl(this.autoCloseMenu), - pageSplitOption: new FormControl(this.pageSplitOption), - fittingOption: new FormControl(this.mangaReaderService.translateScalingOption(this.scalingOption)), - widthSlider: new FormControl('none'), - layoutMode: new FormControl(this.layoutMode), - darkness: new FormControl(100), - emulateBook: new FormControl(this.user.preferences.emulateBook), - swipeToPaginate: new FormControl(this.user.preferences.swipeToPaginate) - }); - - this.readerModeSubject.next(this.readerMode); - this.pagingDirectionSubject.next(this.pagingDirection); - - // We need a mergeMap when page changes - this.readerSettings$ = merge(this.generalSettingsForm.valueChanges, this.pagingDirection$, this.readerMode$).pipe( - map(_ => this.createReaderSettingsUpdate()), - takeUntilDestroyed(this.destroyRef), - ); - - this.updateForm(); - - this.pagingDirection$.pipe( - distinctUntilChanged(), - tap(dir => { - this.pagingDirection = dir; - this.cdRef.markForCheck(); - }), - takeUntilDestroyed(this.destroyRef) - ).subscribe(() => {}); - - this.readerMode$.pipe( - distinctUntilChanged(), - tap(mode => { - this.readerMode = mode; - this.disableDoubleRendererIfScreenTooSmall(); - this.cdRef.markForCheck(); - }), - takeUntilDestroyed(this.destroyRef) - ).subscribe(() => {}); - - this.setupWidthOverrideTriggers(); - - this.generalSettingsForm.get('layoutMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(val => { - - const changeOccurred = parseInt(val, 10) !== this.layoutMode; - this.layoutMode = parseInt(val, 10); - - if (this.layoutMode === LayoutMode.Single) { - this.generalSettingsForm.get('pageSplitOption')?.setValue(this.user.preferences.pageSplitOption); - this.generalSettingsForm.get('pageSplitOption')?.enable(); - this.generalSettingsForm.get('widthSlider')?.enable(); - this.generalSettingsForm.get('fittingOption')?.enable(); - this.generalSettingsForm.get('emulateBook')?.enable(); - } else { - this.generalSettingsForm.get('pageSplitOption')?.setValue(PageSplitOption.NoSplit); - this.generalSettingsForm.get('pageSplitOption')?.disable(); - this.generalSettingsForm.get('widthSlider')?.disable(); - this.generalSettingsForm.get('fittingOption')?.setValue(this.mangaReaderService.translateScalingOption(ScalingOption.FitToHeight)); - this.generalSettingsForm.get('fittingOption')?.disable(); - this.generalSettingsForm.get('emulateBook')?.enable(); - } - this.cdRef.markForCheck(); - - // Re-render the current page when we switch layouts - if (changeOccurred) { - this.setPageNum(this.adjustPagesForDoubleRenderer(this.pageNum)); - this.loadPage(); - } - }); - - this.generalSettingsForm.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => { - this.autoCloseMenu = this.generalSettingsForm.get('autoCloseMenu')?.value; - this.pageSplitOption = parseInt(this.generalSettingsForm.get('pageSplitOption')?.value, 10); - - const needsSplitting = this.mangaReaderService.isWidePage(this.readerService.imageUrlToPageNum(this.canvasImage.src)); - // If we need to split on a menu change, then we need to re-render. - if (needsSplitting) { - // If we need to re-render, to ensure things layout properly, let's update paging direction & reset render - this.pagingDirectionSubject.next(PAGING_DIRECTION.FORWARD); - this.canvasRenderer.reset(); - this.loadPage(); - } - }); this.memberService.hasReadingProgress(this.libraryId).pipe(take(1)).subscribe(progress => { if (!progress) { @@ -604,9 +538,29 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { this.toastr.info(translate('manga-reader.first-time-reading-manga')); } }); - }); - this.init(); + this.init(); + + // Update implicit reading profile while changing settings + this.generalSettingsForm.valueChanges.pipe( + debounceTime(300), + distinctUntilChanged(), + takeUntilDestroyed(this.destroyRef), + map(_ => this.packReadingProfile()), + distinctUntilChanged(), + tap(newProfile => { + this.readingProfileService.updateImplicit(newProfile, this.seriesId).subscribe({ + next: updatedProfile => { + this.readingProfile = updatedProfile; + this.cdRef.markForCheck(); + }, + error: err => { + console.error(err); + } + }) + }) + ).subscribe(); + }); } ngAfterViewInit() { @@ -647,7 +601,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { } @HostListener('window:keyup', ['$event']) - handleKeyPress(event: KeyboardEvent) { + async handleKeyPress(event: KeyboardEvent) { switch (this.readerMode) { case ReaderMode.LeftRight: if (event.key === KEY_CODES.RIGHT_ARROW) { @@ -682,7 +636,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { } else if (event.key === KEY_CODES.SPACE) { this.toggleMenu(); } else if (event.key === KEY_CODES.G) { - const goToPageNum = this.promptForPage(); + const goToPageNum = await this.promptForPage(); if (goToPageNum === null) { return; } this.goToPage(parseInt(goToPageNum.trim(), 10)); } else if (event.key === KEY_CODES.B) { @@ -694,6 +648,114 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { } } + setupReaderSettings() { + + if (this.readingProfile.kind === ReadingProfileKind.Implicit) { + this.readingProfileService.getForSeries(this.seriesId, true).subscribe(parent => { + this.parentReadingProfile = parent; + this.cdRef.markForCheck(); + }) + } else { + this.parentReadingProfile = this.readingProfile; + } + + this.readingDirection = this.readingProfile.readingDirection; + this.scalingOption = this.readingProfile.scalingOption; + this.pageSplitOption = this.readingProfile.pageSplitOption; + this.autoCloseMenu = this.readingProfile.autoCloseMenu; + this.readerMode = this.readingProfile.readerMode; + this.layoutMode = this.readingProfile.layoutMode || LayoutMode.Single; + this.backgroundColor = this.readingProfile.backgroundColor || '#000000'; + this.readerService.setOverrideStyles(this.backgroundColor); + + this.generalSettingsForm = this.formBuilder.nonNullable.group({ + autoCloseMenu: new FormControl(this.autoCloseMenu), + pageSplitOption: new FormControl(this.pageSplitOption), + fittingOption: new FormControl(this.mangaReaderService.translateScalingOption(this.scalingOption)), + widthSlider: new FormControl(this.readingProfile.widthOverride ?? 'none'), + layoutMode: new FormControl(this.layoutMode), + darkness: new FormControl(100), + emulateBook: new FormControl(this.readingProfile.emulateBook), + swipeToPaginate: new FormControl(this.readingProfile.swipeToPaginate) + }); + + this.readerModeSubject.next(this.readerMode); + this.pagingDirectionSubject.next(this.pagingDirection); + + // We need a mergeMap when page changes + this.readerSettings$ = merge(this.generalSettingsForm.valueChanges, this.pagingDirection$, this.readerMode$).pipe( + map(_ => this.createReaderSettingsUpdate()), + takeUntilDestroyed(this.destroyRef), + ); + + this.updateForm(); + + this.pagingDirection$.pipe( + distinctUntilChanged(), + tap(dir => { + this.pagingDirection = dir; + this.cdRef.markForCheck(); + }), + takeUntilDestroyed(this.destroyRef) + ).subscribe(() => {}); + + this.readerMode$.pipe( + distinctUntilChanged(), + tap(mode => { + this.readerMode = mode; + this.disableDoubleRendererIfScreenTooSmall(); + this.cdRef.markForCheck(); + }), + takeUntilDestroyed(this.destroyRef) + ).subscribe(() => {}); + + this.setupWidthOverrideTriggers(); + + this.generalSettingsForm.get('layoutMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(val => { + + const changeOccurred = parseInt(val, 10) !== this.layoutMode; + this.layoutMode = parseInt(val, 10); + + if (this.layoutMode === LayoutMode.Single) { + this.generalSettingsForm.get('pageSplitOption')?.setValue(this.readingProfile!.pageSplitOption); + this.generalSettingsForm.get('pageSplitOption')?.enable(); + this.generalSettingsForm.get('widthSlider')?.enable(); + this.generalSettingsForm.get('fittingOption')?.enable(); + this.generalSettingsForm.get('emulateBook')?.enable(); + } else { + this.generalSettingsForm.get('pageSplitOption')?.setValue(PageSplitOption.NoSplit); + this.generalSettingsForm.get('pageSplitOption')?.disable(); + this.generalSettingsForm.get('widthSlider')?.disable(); + this.generalSettingsForm.get('fittingOption')?.setValue(this.mangaReaderService.translateScalingOption(ScalingOption.FitToHeight)); + this.generalSettingsForm.get('fittingOption')?.disable(); + this.generalSettingsForm.get('emulateBook')?.enable(); + } + this.cdRef.markForCheck(); + + // Re-render the current page when we switch layouts + if (changeOccurred) { + this.setPageNum(this.adjustPagesForDoubleRenderer(this.pageNum)); + this.loadPage(); + } + }); + + this.generalSettingsForm.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => { + this.autoCloseMenu = this.generalSettingsForm.get('autoCloseMenu')?.value; + this.pageSplitOption = parseInt(this.generalSettingsForm.get('pageSplitOption')?.value, 10); + + const needsSplitting = this.mangaReaderService.isWidePage(this.readerService.imageUrlToPageNum(this.canvasImage.src)); + // If we need to split on a menu change, then we need to re-render. + if (needsSplitting) { + // If we need to re-render, to ensure things layout properly, let's update paging direction & reset render + this.pagingDirectionSubject.next(PAGING_DIRECTION.FORWARD); + this.canvasRenderer.reset(); + this.loadPage(); + } + }); + + this.cdRef.markForCheck(); + } + /** * Width override is only valid under the following conditions: * Image Scaling is Width @@ -747,7 +809,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { ).subscribe(); // Set the default override to 0 - widthOverrideControl.setValue(0); + //widthOverrideControl.setValue(0); //send the current width override value to the label this.widthOverrideLabel$ = this.readerSettings$?.pipe( @@ -780,7 +842,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { switchToWebtoonReaderIfPagesLikelyWebtoon() { if (this.readerMode === ReaderMode.Webtoon) return; - if (!this.user.preferences.allowAutomaticWebtoonReaderDetection) return; + if (!this.readingProfile!.allowAutomaticWebtoonReaderDetection) return; if (this.mangaReaderService.shouldBeWebtoonMode()) { this.readerMode = ReaderMode.Webtoon; @@ -792,7 +854,9 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { disableDoubleRendererIfScreenTooSmall() { if (window.innerWidth > window.innerHeight) { - this.generalSettingsForm.get('layoutMode')?.enable(); + if (this.generalSettingsForm.get('layoutMode')?.disabled) { + this.generalSettingsForm.get('layoutMode')?.enable(); + } this.cdRef.markForCheck(); return; } @@ -1219,8 +1283,19 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { } } + /** + * Calls the correct prev- or nextPage method based on the direction, readingDirection, and readerMode + * + * readingDirection is ignored when readerMode is Webtoon or UpDown + * + * KeyDirection.Right: right or bottom click + * KeyDirection.Left: left or top click + * @param event + * @param direction + */ handlePageChange(event: any, direction: KeyDirection) { - if (this.readerMode === ReaderMode.Webtoon) { + // Webtoons and UpDown reading mode should not take ReadingDirection into account + if (this.readerMode === ReaderMode.Webtoon || this.readerMode === ReaderMode.UpDown) { if (direction === KeyDirection.Right) { this.nextPage(event); } else { @@ -1228,6 +1303,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { } return; } + if (direction === KeyDirection.Right) { this.readingDirection === ReadingDirection.LeftToRight ? this.nextPage(event) : this.prevPage(event); } else if (direction === KeyDirection.Left) { @@ -1460,7 +1536,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { this.readingDirection = ReadingDirection.LeftToRight; } - if (this.menuOpen && this.user.preferences.showScreenHints) { + if (this.menuOpen && this.readingProfile!.showScreenHints) { this.showClickOverlay = true; this.showClickOverlaySubject.next(true); setTimeout(() => { @@ -1593,9 +1669,16 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { } // This is menu only code - promptForPage() { - const question = translate('book-reader.go-to-page-prompt', {totalPages: this.maxPages}); - const goToPageNum = window.prompt(question, ''); + async promptForPage() { + // const question = translate('book-reader.go-to-page-prompt', {totalPages: this.maxPages}); + // const goToPageNum = window.prompt(question, ''); + + const promptConfig = {...this.confirmService.defaultPrompt}; + promptConfig.header = translate('book-reader.go-to-page'); + promptConfig.content = translate('book-reader.go-to-page-prompt', {totalPages: this.maxPages}); + + const goToPageNum = await this.confirmService.prompt(undefined, promptConfig); + if (goToPageNum === null || goToPageNum.trim().length === 0) { return null; } return goToPageNum; } @@ -1730,28 +1813,28 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { } // menu only code - savePref() { - const modelSettings = this.generalSettingsForm.getRawValue(); - // Get latest preferences from user, overwrite with what we manage in this UI, then save - this.accountService.currentUser$.pipe(take(1)).subscribe(user => { - if (!user) return; - const data = {...user.preferences}; - data.layoutMode = parseInt(modelSettings.layoutMode, 10); - data.readerMode = this.readerMode; - data.autoCloseMenu = this.autoCloseMenu; - data.readingDirection = this.readingDirection; - data.emulateBook = modelSettings.emulateBook; - data.swipeToPaginate = modelSettings.swipeToPaginate; - data.pageSplitOption = parseInt(modelSettings.pageSplitOption, 10); - data.locale = data.locale || 'en'; + updateParentPref() { + if (this.readingProfile.kind !== ReadingProfileKind.Implicit) { + return; + } - this.accountService.updatePreferences(data).subscribe(updatedPrefs => { - this.toastr.success(translate('manga-reader.user-preferences-updated')); - if (this.user) { - this.user.preferences = updatedPrefs; - this.cdRef.markForCheck(); - } - }) + this.readingProfileService.updateParentProfile(this.seriesId, this.packReadingProfile()).subscribe(newProfile => { + this.readingProfile = newProfile; + this.toastr.success(translate('manga-reader.reading-profile-updated')); + this.cdRef.markForCheck(); + }); + } + + createNewProfileFromImplicit() { + if (this.readingProfile.kind !== ReadingProfileKind.Implicit) { + return; + } + + this.readingProfileService.promoteProfile(this.readingProfile.id).subscribe(newProfile => { + this.readingProfile = newProfile; + this.parentReadingProfile = newProfile; // Profile is no longer implicit + this.toastr.success(translate("manga-reader.reading-profile-promoted")); + this.cdRef.markForCheck(); }); } @@ -1761,4 +1844,21 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { return d; } + private packReadingProfile(): ReadingProfile { + const modelSettings = this.generalSettingsForm.getRawValue(); + const data = {...this.readingProfile!}; + + data.layoutMode = parseInt(modelSettings.layoutMode, 10); + data.readerMode = this.readerMode; + data.autoCloseMenu = this.autoCloseMenu; + data.readingDirection = this.readingDirection; + data.emulateBook = modelSettings.emulateBook; + data.swipeToPaginate = modelSettings.swipeToPaginate; + data.pageSplitOption = parseInt(modelSettings.pageSplitOption, 10); + data.widthOverride = modelSettings.widthSlider === 'none' ? null : modelSettings.widthSlider; + + return data; + } + + protected readonly ReadingProfileKind = ReadingProfileKind; } diff --git a/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.html b/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.html index a0ebb4abc..2dcb81889 100644 --- a/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.html +++ b/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.html @@ -3,7 +3,7 @@ [style.filter]="(darkness$ | async) ?? '' | safeStyle" [style.height]="(imageContainerHeight$ | async) ?? '' | safeStyle"> @if(currentImage) { ; + @Input({required: true}) readingProfile!: ReadingProfile; @Input({required: true}) image$!: Observable; @Input({required: true}) bookmark$!: Observable; @Input({required: true}) showClickOverlay$!: Observable; @@ -52,16 +58,14 @@ export class SingleRendererComponent implements OnInit, ImageRenderer { pageNum: number = 0; maxPages: number = 1; - /** - * Width override for maunal width control - */ - widthOverride$ : Observable = new Observable(); + readerSettings!: Signal; + widthOverride!: Signal; get ReaderMode() {return ReaderMode;} get LayoutMode() {return LayoutMode;} constructor(private readonly cdRef: ChangeDetectorRef, public mangaReaderService: MangaReaderService, - @Inject(DOCUMENT) private document: Document) { } + @Inject(DOCUMENT) private document: Document) {} ngOnInit(): void { this.readerModeClass$ = this.readerSettings$.pipe( @@ -71,12 +75,16 @@ export class SingleRendererComponent implements OnInit, ImageRenderer { takeUntilDestroyed(this.destroyRef) ); - //handle manual width - this.widthOverride$ = this.readerSettings$.pipe( - map(values => (parseInt(values.widthSlider) <= 0) ? '' : values.widthSlider + '%'), - takeUntilDestroyed(this.destroyRef) - ); + this.readerSettings = toSignal(this.readerSettings$, {injector: this.injector, requireSync: true}); + this.widthOverride = computed(() => { + const breakpoint = this.utilityService.activeUserBreakpoint(); + const value = this.readerSettings().widthSlider; + if (breakpoint <= this.readingProfile.disableWidthOverride) { + return ''; + } + return (parseInt(value) <= 0) ? '' : value + '%'; + }); this.emulateBookClass$ = this.readerSettings$.pipe( map(data => data.emulateBook), diff --git a/UI/Web/src/app/metadata-filter/_components/metadata-builder/metadata-builder.component.html b/UI/Web/src/app/metadata-filter/_components/metadata-builder/metadata-builder.component.html index 907944aeb..1fe4aca29 100644 --- a/UI/Web/src/app/metadata-filter/_components/metadata-builder/metadata-builder.component.html +++ b/UI/Web/src/app/metadata-filter/_components/metadata-builder/metadata-builder.component.html @@ -24,7 +24,7 @@ @for (filterStmt of filter.statements; track filterStmt; let i = $index) {
    - +
    @if (i < (filter.statements.length - 1) && filter.statements.length > 1) { +
    -
    - - -
    + + @if (filterSettings().supportsSmartFilter) { +
    + + +
    + } + @if (utilityService.getActiveBreakpoint() > Breakpoint.Tablet) { @@ -82,7 +80,7 @@
    - diff --git a/UI/Web/src/app/metadata-filter/metadata-filter.component.ts b/UI/Web/src/app/metadata-filter/metadata-filter.component.ts index c65bb5c16..d1fc264ef 100644 --- a/UI/Web/src/app/metadata-filter/metadata-filter.component.ts +++ b/UI/Web/src/app/metadata-filter/metadata-filter.component.ts @@ -2,55 +2,61 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, + computed, ContentChild, DestroyRef, + effect, EventEmitter, inject, + input, Input, OnInit, - Output + Output, + Signal } from '@angular/core'; import {FormControl, FormGroup, FormsModule, ReactiveFormsModule} from '@angular/forms'; import {NgbCollapse} from '@ng-bootstrap/ng-bootstrap'; import {Breakpoint, UtilityService} from '../shared/_services/utility.service'; import {Library} from '../_models/library/library'; -import {allSortFields, FilterEvent, FilterItem, SortField} from '../_models/metadata/series-filter'; +import {FilterEvent, FilterItem} from '../_models/metadata/series-filter'; import {ToggleService} from '../_services/toggle.service'; -import {FilterSettings} from './filter-settings'; -import {SeriesFilterV2} from '../_models/metadata/v2/series-filter-v2'; +import {FilterV2} from '../_models/metadata/v2/filter-v2'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {DrawerComponent} from '../shared/drawer/drawer.component'; import {AsyncPipe, NgClass, NgTemplateOutlet} from '@angular/common'; import {translate, TranslocoModule, TranslocoService} from "@jsverse/transloco"; -import {SortFieldPipe} from "../_pipes/sort-field.pipe"; import {MetadataBuilderComponent} from "./_components/metadata-builder/metadata-builder.component"; -import {allFields} from "../_models/metadata/v2/filter-field"; import {FilterService} from "../_services/filter.service"; import {ToastrService} from "ngx-toastr"; import {animate, style, transition, trigger} from "@angular/animations"; +import {SortButtonComponent} from "../_single-module/sort-button/sort-button.component"; +import {FilterSettingsBase} from "./filter-settings"; +import {FilterUtilitiesService} from "../shared/_services/filter-utilities.service"; + @Component({ - selector: 'app-metadata-filter', - templateUrl: './metadata-filter.component.html', - styleUrls: ['./metadata-filter.component.scss'], - animations: [ - trigger('inOutAnimation', [ - transition(':enter', [ - style({ height: 0, opacity: 0 }), - animate('.5s ease-out', style({ height: 300, opacity: 1 })) - ]), - transition(':leave', [ - style({ height: 300, opacity: 1 }), - animate('.5s ease-in', style({ height: 0, opacity: 0 })) - ]) - ]), - ], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [NgTemplateOutlet, DrawerComponent, - ReactiveFormsModule, FormsModule, AsyncPipe, TranslocoModule, - MetadataBuilderComponent, NgClass] + selector: 'app-metadata-filter', + templateUrl: './metadata-filter.component.html', + styleUrls: ['./metadata-filter.component.scss'], + animations: [ + trigger('inOutAnimation', [ + transition(':enter', [ + style({ height: 0, opacity: 0 }), + animate('.5s ease-out', style({ height: 300, opacity: 1 })) + ]), + transition(':leave', [ + style({ height: 300, opacity: 1 }), + animate('.5s ease-in', style({ height: 0, opacity: 0 })) + ]) + ]), + ], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [NgTemplateOutlet, DrawerComponent, + ReactiveFormsModule, FormsModule, AsyncPipe, TranslocoModule, + MetadataBuilderComponent, NgClass, SortButtonComponent] }) -export class MetadataFilterComponent implements OnInit { +export class MetadataFilterComponent implements OnInit { + private readonly destroyRef = inject(DestroyRef); public readonly utilityService = inject(UtilityService); @@ -59,18 +65,16 @@ export class MetadataFilterComponent implements OnInit { private readonly filterService = inject(FilterService); protected readonly toggleService = inject(ToggleService); protected readonly translocoService = inject(TranslocoService); - private readonly sortFieldPipe = new SortFieldPipe(this.translocoService); + protected readonly filterUtilitiesService = inject(FilterUtilitiesService); /** * This toggles the opening/collapsing of the metadata filter code */ @Input() filterOpen: EventEmitter = new EventEmitter(); - /** - * Should filtering be shown on the page - */ - @Input() filteringDisabled: boolean = false; - @Input({required: true}) filterSettings!: FilterSettings; - @Output() applyFilter: EventEmitter = new EventEmitter(); + + filterSettings = input.required>(); + + @Output() applyFilter: EventEmitter> = new EventEmitter(); @ContentChild('[ngbCollapse]') collapse!: NgbCollapse; @@ -86,20 +90,23 @@ export class MetadataFilterComponent implements OnInit { updateApplied: number = 0; fullyLoaded: boolean = false; - filterV2: SeriesFilterV2 | undefined; + filterV2: FilterV2 | undefined; + sortFieldOptions: Signal<{title: string, value: number}[]> = computed(() => []); + filterFieldOptions: Signal<{title: string, value: number}[]> = computed(() => []); + + constructor() { + effect(() => { + const settings = this.filterSettings(); + if (settings?.presetsV2) { + this.filterV2 = this.deepClone(settings.presetsV2); + this.cdRef.markForCheck(); + } + }) + } - protected readonly allSortFields = allSortFields.map(f => { - return {title: this.sortFieldPipe.transform(f), value: f}; - }).sort((a, b) => a.title.localeCompare(b.title)); - protected readonly allFilterFields = allFields; ngOnInit(): void { - if (this.filterSettings === undefined) { - this.filterSettings = new FilterSettings(); - this.cdRef.markForCheck(); - } - if (this.filterOpen) { this.filterOpen.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(openState => { this.filteringCollapsed = !openState; @@ -109,42 +116,19 @@ export class MetadataFilterComponent implements OnInit { } + this.filterFieldOptions = computed(() => { + return this.filterUtilitiesService.getFilterFields(this.filterSettings().type); + }); + + this.sortFieldOptions = computed(() => { + return this.filterUtilitiesService.getSortFields(this.filterSettings().type); + }); + + this.loadFromPresetsAndSetup(); } - // loadSavedFilter(event: Select2UpdateEvent) { - // // Load the filter from the backend and update the screen - // if (event.value === undefined || typeof(event.value) === 'string') return; - // const smartFilter = event.value as SmartFilter; - // this.filterV2 = this.filterUtilitiesService.decodeSeriesFilter(smartFilter.filter); - // this.cdRef.markForCheck(); - // console.log('update event: ', event); - // } - // - // createFilterValue(event: Select2AutoCreateEvent) { - // // Create a new name and filter - // if (!this.filterV2) return; - // this.filterV2.name = event.value; - // this.filterService.saveFilter(this.filterV2).subscribe(() => { - // - // const item = { - // value: { - // filter: this.filterUtilitiesService.encodeSeriesFilter(this.filterV2!), - // name: event.value, - // } as SmartFilter, - // label: event.value - // }; - // this.smartFilters.push(item); - // this.sortGroup.get('name')?.setValue(item); - // this.cdRef.markForCheck(); - // this.toastr.success(translate('toasts.smart-filter-updated')); - // this.apply(); - // }); - // - // console.log('create event: ', event); - // } - close() { this.filterOpen.emit(false); @@ -177,7 +161,7 @@ export class MetadataFilterComponent implements OnInit { return clonedObj; } - handleFilters(filter: SeriesFilterV2) { + handleFilters(filter: FilterV2) { this.filterV2 = filter; } @@ -185,29 +169,34 @@ export class MetadataFilterComponent implements OnInit { loadFromPresetsAndSetup() { this.fullyLoaded = false; - this.filterV2 = this.deepClone(this.filterSettings.presetsV2); + const currentFilterSettings = this.filterSettings(); + this.filterV2 = this.deepClone(currentFilterSettings.presetsV2); + + const defaultSortField = this.sortFieldOptions()[0].value; this.sortGroup = new FormGroup({ - sortField: new FormControl({value: this.filterV2?.sortOptions?.sortField || SortField.SortName, disabled: this.filterSettings.sortDisabled}, []), + sortField: new FormControl({value: this.filterV2?.sortOptions?.sortField || defaultSortField, disabled: this.filterSettings().sortDisabled}, []), limitTo: new FormControl(this.filterV2?.limitTo || 0, []), name: new FormControl(this.filterV2?.name || '', []) }); - if (this.filterSettings?.presetsV2?.sortOptions) { - this.isAscendingSort = this.filterSettings?.presetsV2?.sortOptions!.isAscending; + + if (this.filterSettings()?.presetsV2?.sortOptions) { + this.isAscendingSort = this.filterSettings()?.presetsV2?.sortOptions!.isAscending || true; } + this.cdRef.markForCheck(); this.sortGroup.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => { - if (this.filterV2?.sortOptions === null) { - this.filterV2.sortOptions = { - isAscending: this.isAscendingSort, - sortField: parseInt(this.sortGroup.get('sortField')?.value, 10) - }; - } - this.filterV2!.sortOptions!.sortField = parseInt(this.sortGroup.get('sortField')?.value, 10); - this.filterV2!.limitTo = Math.max(parseInt(this.sortGroup.get('limitTo')?.value || '0', 10), 0); - this.filterV2!.name = this.sortGroup.get('name')?.value || ''; - this.cdRef.markForCheck(); + if (this.filterV2?.sortOptions === null) { + this.filterV2.sortOptions = { + isAscending: this.isAscendingSort, + sortField: parseInt(this.sortGroup.get('sortField')?.value, 10) as TSort + }; + } + this.filterV2!.sortOptions!.sortField = parseInt(this.sortGroup.get('sortField')?.value, 10) as TSort; + this.filterV2!.limitTo = Math.max(parseInt(this.sortGroup.get('limitTo')?.value || '0', 10), 0); + this.filterV2!.name = this.sortGroup.get('name')?.value || ''; + this.cdRef.markForCheck(); }); this.fullyLoaded = true; @@ -215,13 +204,16 @@ export class MetadataFilterComponent implements OnInit { } - updateSortOrder() { - if (this.filterSettings.sortDisabled) return; - this.isAscendingSort = !this.isAscendingSort; + updateSortOrder(isAscending: boolean) { + if (this.filterSettings().sortDisabled) return; + this.isAscendingSort = isAscending; + if (this.filterV2?.sortOptions === null) { + const defaultSortField = this.sortFieldOptions()[0].value as TSort; + this.filterV2.sortOptions = { isAscending: this.isAscendingSort, - sortField: SortField.SortName + sortField: defaultSortField } } @@ -235,7 +227,7 @@ export class MetadataFilterComponent implements OnInit { } apply() { - this.applyFilter.emit({isFirst: this.updateApplied === 0, filterV2: this.filterV2!}); + this.applyFilter.emit({isFirst: this.updateApplied === 0, filterV2: this.filterV2!} as FilterEvent); if (this.utilityService.getActiveBreakpoint() === Breakpoint.Mobile && this.updateApplied !== 0) { this.toggleSelected(); @@ -259,9 +251,6 @@ export class MetadataFilterComponent implements OnInit { this.cdRef.markForCheck(); } - setToggle(event: any) { - this.toggleService.set(!this.filteringCollapsed); - } protected readonly Breakpoint = Breakpoint; } diff --git a/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.html b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.html index 6f36e9b5a..4a51435fc 100644 --- a/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.html +++ b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.html @@ -16,7 +16,7 @@ } } @else { -
    +
    Ctrl+K
    } diff --git a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html index 9e0f26a0a..089262875 100644 --- a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html +++ b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html @@ -206,6 +206,8 @@
    {{t('all-filters')}} + {{t('browse-genres')}} + {{t('browse-tags')}} {{t('announcements')}} {{t('help')}} {{t('logout')}} diff --git a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts index 980a1be55..fd4af01f0 100644 --- a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts +++ b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts @@ -47,6 +47,7 @@ import {SettingsTabId} from "../../../sidenav/preference-nav/preference-nav.comp import {Breakpoint, UtilityService} from "../../../shared/_services/utility.service"; import {WikiLink} from "../../../_models/wiki"; import {NavLinkModalComponent} from "../nav-link-modal/nav-link-modal.component"; +import {MetadataService} from "../../../_services/metadata.service"; @Component({ selector: 'app-nav-header', @@ -70,6 +71,8 @@ export class NavHeaderComponent implements OnInit { protected readonly imageService = inject(ImageService); protected readonly utilityService = inject(UtilityService); protected readonly modalService = inject(NgbModal); + protected readonly metadataService = inject(MetadataService); + protected readonly FilterField = FilterField; protected readonly WikiLink = WikiLink; @@ -159,9 +162,9 @@ export class NavHeaderComponent implements OnInit { }); } - goTo(statement: FilterStatement) { + goTo(statement: FilterStatement) { let params: any = {}; - const filter = this.filterUtilityService.createSeriesV2Filter(); + const filter = this.metadataService.createDefaultFilterDto('series'); filter.statements = [statement]; params['page'] = 1; this.clearSearch(); diff --git a/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.ts b/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.ts index b6e99b5ca..c6b7c0494 100644 --- a/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.ts +++ b/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.ts @@ -34,6 +34,9 @@ import {PdfSpreadMode} from "../../../_models/preferences/pdf-spread-mode"; import {SpreadType} from "ngx-extended-pdf-viewer/lib/options/spread-type"; import {PdfScrollModeTypePipe} from "../../_pipe/pdf-scroll-mode.pipe"; import {PdfSpreadTypePipe} from "../../_pipe/pdf-spread-mode.pipe"; +import {ReadingProfileService} from "../../../_services/reading-profile.service"; +import {ReadingProfile} from "../../../_models/preferences/reading-profiles"; +import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; @Component({ selector: 'app-pdf-reader', @@ -54,6 +57,7 @@ export class PdfReaderComponent implements OnInit, OnDestroy { private readonly themeService = inject(ThemeService); private readonly cdRef = inject(ChangeDetectorRef); public readonly accountService = inject(AccountService); + private readonly readingProfileService = inject(ReadingProfileService); public readonly readerService = inject(ReaderService); public readonly utilityService = inject(UtilityService); public readonly destroyRef = inject(DestroyRef); @@ -69,6 +73,7 @@ export class PdfReaderComponent implements OnInit, OnDestroy { chapterId!: number; chapter!: Chapter; user!: User; + readingProfile!: ReadingProfile; /** * Reading List id. Defaults to -1. @@ -162,6 +167,16 @@ export class PdfReaderComponent implements OnInit, OnDestroy { this.chapterId = parseInt(chapterId, 10); this.incognitoMode = this.route.snapshot.queryParamMap.get('incognitoMode') === 'true'; + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.readingProfile = data['readingProfile']; + if (this.readingProfile == null) { + this.router.navigateByUrl('/home'); + return; + } + this.setupReaderSettings(); + this.cdRef.markForCheck(); + }); + const readingListId = this.route.snapshot.queryParamMap.get('readingListId'); if (readingListId != null) { @@ -234,12 +249,14 @@ export class PdfReaderComponent implements OnInit, OnDestroy { } } - init() { - + setupReaderSettings() { this.pageLayoutMode = this.convertPdfLayoutMode(PdfLayoutMode.Multiple); - this.scrollMode = this.convertPdfScrollMode(this.user.preferences.pdfScrollMode || PdfScrollMode.Vertical); - this.spreadMode = this.convertPdfSpreadMode(this.user.preferences.pdfSpreadMode || PdfSpreadMode.None); - this.theme = this.convertPdfTheme(this.user.preferences.pdfTheme || PdfTheme.Dark); + this.scrollMode = this.convertPdfScrollMode(this.readingProfile.pdfScrollMode || PdfScrollMode.Vertical); + this.spreadMode = this.convertPdfSpreadMode(this.readingProfile.pdfSpreadMode || PdfSpreadMode.None); + this.theme = this.convertPdfTheme(this.readingProfile.pdfTheme || PdfTheme.Dark); + } + + init() { this.backgroundColor = this.themeMap[this.theme].background; this.fontColor = this.themeMap[this.theme].font; // TODO: Move this to an observable or something diff --git a/UI/Web/src/app/person-detail/person-detail.component.ts b/UI/Web/src/app/person-detail/person-detail.component.ts index 31b7f976b..ab3c486bd 100644 --- a/UI/Web/src/app/person-detail/person-detail.component.ts +++ b/UI/Web/src/app/person-detail/person-detail.component.ts @@ -23,7 +23,7 @@ import {PersonRolePipe} from "../_pipes/person-role.pipe"; import {CarouselReelComponent} from "../carousel/_components/carousel-reel/carousel-reel.component"; import {FilterComparison} from "../_models/metadata/v2/filter-comparison"; import {FilterUtilitiesService} from "../shared/_services/filter-utilities.service"; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import {allPeople, FilterField, personRoleForFilterField} from "../_models/metadata/v2/filter-field"; import {Series} from "../_models/series"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; @@ -44,6 +44,7 @@ import {SafeUrlPipe} from "../_pipes/safe-url.pipe"; import {MergePersonModalComponent} from "./_modal/merge-person-modal/merge-person-modal.component"; import {EVENTS, MessageHubService} from "../_services/message-hub.service"; import {BadgeExpanderComponent} from "../shared/badge-expander/badge-expander.component"; +import {MetadataService} from "../_services/metadata.service"; interface PersonMergeEvent { srcId: number, @@ -87,6 +88,7 @@ export class PersonDetailComponent implements OnInit { private readonly themeService = inject(ThemeService); private readonly toastr = inject(ToastrService); private readonly messageHubService = inject(MessageHubService) + private readonly metadataService = inject(MetadataService) protected readonly FilterField = FilterField; @@ -98,7 +100,7 @@ export class PersonDetailComponent implements OnInit { roles$: Observable | null = null; roles: PersonRole[] | null = null; works$: Observable | null = null; - filter: SeriesFilterV2 | null = null; + filter: FilterV2 | null = null; personActions: Array> = this.actionService.getPersonActions(this.handleAction.bind(this)); chaptersByRole: any = {}; anilistUrl: string = ''; @@ -181,7 +183,7 @@ export class PersonDetailComponent implements OnInit { } createFilter(roles: PersonRole[]) { - const filter: SeriesFilterV2 = this.filterUtilityService.createSeriesV2Filter(); + const filter = this.metadataService.createDefaultFilterDto('series'); filter.combination = FilterCombination.Or; filter.limitTo = 20; @@ -217,7 +219,7 @@ export class PersonDetailComponent implements OnInit { params['page'] = 1; params['title'] = translate('person-detail.browse-person-by-role-title', {name: this.person!.name, role: personPipe.transform(role)}); - const searchFilter = this.filterUtilityService.createSeriesV2Filter(); + const searchFilter = this.metadataService.createDefaultFilterDto('series'); searchFilter.limitTo = 0; searchFilter.combination = FilterCombination.Or; 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 9f45cd55a..1d1ce4c7e 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 @@ -83,7 +83,7 @@ } -
    +
    diff --git a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts index 511811fe8..6e8e3b22a 100644 --- a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts +++ b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts @@ -58,6 +58,7 @@ import {DefaultValuePipe} from "../../../_pipes/default-value.pipe"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {DetailsTabComponent} from "../../../_single-module/details-tab/details-tab.component"; import {IHasCast} from "../../../_models/common/i-has-cast"; +import {User} from "../../../_models/user"; enum TabID { Storyline = 'storyline-tab', @@ -251,7 +252,8 @@ export class ReadingListDetailComponent implements OnInit { if (user) { this.isAdmin = this.accountService.hasAdminRole(user); - this.actions = this.actionFactoryService.getReadingListActions(this.handleReadingListActionCallback.bind(this)) + this.actions = this.actionFactoryService + .getReadingListActions(this.handleReadingListActionCallback.bind(this), this.shouldRenderReadingListAction.bind(this)) .filter(action => this.readingListService.actionListFilter(action, readingList, this.isAdmin)); this.isOwnedReadingList = this.actions.filter(a => a.action === Action.Edit).length > 0; this.cdRef.markForCheck(); @@ -307,6 +309,17 @@ export class ReadingListDetailComponent implements OnInit { } } + shouldRenderReadingListAction(action: ActionItem, entity: ReadingList, user: User) { + switch (action.action) { + case Action.Promote: + return !entity.promoted; + case Action.UnPromote: + return entity.promoted; + default: + return true; + } + } + editReadingList(readingList: ReadingList) { this.actionService.editReadingList(readingList, (readingList: ReadingList) => { // Reload information around list diff --git a/UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.html b/UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.html index dd7dcab9a..a66ec008f 100644 --- a/UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.html +++ b/UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.html @@ -21,7 +21,7 @@ [trackByIdentity]="trackByIdentity" > - this.readingListService.actionListFilter(action, readingList, this.isAdmin || this.hasPromote)); - - return this.actionFactoryService.getReadingListActions(this.handleReadingListActionCallback.bind(this)) + return this.actionFactoryService + .getReadingListActions(this.handleReadingListActionCallback.bind(this), this.shouldRenderReadingListAction.bind(this)) .filter(action => this.readingListService.actionListFilter(action, readingList, this.isAdmin || this.hasPromote)); } @@ -172,4 +172,15 @@ export class ReadingListsComponent implements OnInit { break; } } + + shouldRenderReadingListAction(action: ActionItem, entity: ReadingList, user: User) { + switch (action.action) { + case Action.Promote: + return !entity.promoted; + case Action.UnPromote: + return entity.promoted; + default: + return true; + } + } } diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts index 05580bed0..4035f2f41 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts @@ -110,6 +110,7 @@ import {LicenseService} from "../../../_services/license.service"; import {PageBookmark} from "../../../_models/readers/page-bookmark"; import {VolumeRemovedEvent} from "../../../_models/events/volume-removed-event"; import {ReviewsComponent} from "../../../_single-module/reviews/reviews.component"; +import {ReadingProfileService} from "../../../_services/reading-profile.service"; enum TabID { @@ -175,6 +176,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { private readonly cdRef = inject(ChangeDetectorRef); private readonly scrollService = inject(ScrollService); private readonly translocoService = inject(TranslocoService); + private readonly readingProfileService = inject(ReadingProfileService); protected readonly bulkSelectionService = inject(BulkSelectionService); protected readonly utilityService = inject(UtilityService); protected readonly imageService = inject(ImageService); @@ -551,7 +553,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { this.location.replaceState(newUrl) } - handleSeriesActionCallback(action: ActionItem, series: Series) { + async handleSeriesActionCallback(action: ActionItem, series: Series) { this.cdRef.markForCheck(); switch(action.action) { case(Action.MarkAsRead): @@ -565,16 +567,16 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { }); break; case(Action.Scan): - this.actionService.scanSeries(series); + await this.actionService.scanSeries(series); break; case(Action.RefreshMetadata): - this.actionService.refreshSeriesMetadata(series, undefined, true, false); + await this.actionService.refreshSeriesMetadata(series, undefined, true, false); break; case(Action.GenerateColorScape): - this.actionService.refreshSeriesMetadata(series, undefined, false, true); + await this.actionService.refreshSeriesMetadata(series, undefined, false, true); break; case(Action.Delete): - this.deleteSeries(series); + await this.deleteSeries(series); break; case(Action.AddToReadingList): this.actionService.addSeriesToReadingList(series); @@ -609,6 +611,14 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { this.actionService.sendToDevice(chapterIds, device); break; } + case Action.SetReadingProfile: + this.actionService.setReadingProfileForMultiple([this.series]); + break; + case Action.ClearReadingProfile: + this.readingProfileService.clearSeriesProfiles(this.seriesId).subscribe(() => { + this.toastr.success(this.translocoService.translate('actionable.cleared-profile')); + }); + break; default: break; } @@ -645,6 +655,9 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { this.actionService.sendToDevice(volume.chapters.map(c => c.id), device); break; } + case (Action.Download): + this.downloadService.download('volume', volume); + break; default: break; } @@ -679,6 +692,9 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { this.cdRef.markForCheck(); }); break; + case (Action.Download): + this.downloadService.download('chapter', chapter); + break; default: break; } @@ -879,10 +895,6 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { this.cdRef.markForCheck(); } - - - - this.isLoading = false; this.cdRef.markForCheck(); }); @@ -1076,19 +1088,6 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { } - openVolume(volume: Volume) { - if (this.bulkSelectionService.hasSelections()) return; - if (volume.chapters === undefined || volume.chapters?.length === 0) { - this.toastr.error(this.translocoService.translate('series-detail.no-chapters')); - return; - } - - this.router.navigate(['library', this.libraryId, 'series', this.seriesId, 'volume', volume.id]); - return; - - - this.readerService.readVolume(this.libraryId, this.seriesId, volume, false); - } openEditChapter(chapter: Chapter) { const ref = this.modalService.open(EditChapterModalComponent, DefaultModalOptions); diff --git a/UI/Web/src/app/settings/_components/setting-switch/setting-switch.component.ts b/UI/Web/src/app/settings/_components/setting-switch/setting-switch.component.ts index 530fa2ff3..e39b6beee 100644 --- a/UI/Web/src/app/settings/_components/setting-switch/setting-switch.component.ts +++ b/UI/Web/src/app/settings/_components/setting-switch/setting-switch.component.ts @@ -51,7 +51,7 @@ export class SettingSwitchComponent implements AfterContentInit { const inputElement = element.querySelector('input'); // If no id, generate a random id and assign it to the input - inputElement.id = crypto.randomUUID(); + inputElement.id = this.generateId(); if (inputElement && inputElement.id) { this.labelId = inputElement.id; @@ -62,4 +62,13 @@ export class SettingSwitchComponent implements AfterContentInit { }); } + private generateId(): string { + if (crypto && crypto.randomUUID) { + return crypto.randomUUID(); + } + + // Fallback for browsers without crypto.randomUUID (which has happened multiple times in my user base) + return 'id-' + Math.random().toString(36).substr(2, 9) + '-' + Date.now().toString(36); + } + } diff --git a/UI/Web/src/app/settings/_components/settings/settings.component.html b/UI/Web/src/app/settings/_components/settings/settings.component.html index 168c98a85..3e3d4f144 100644 --- a/UI/Web/src/app/settings/_components/settings/settings.component.html +++ b/UI/Web/src/app/settings/_components/settings/settings.component.html @@ -217,6 +217,15 @@
    } } + + @defer (when fragment === SettingsTabId.ReadingProfiles; prefetch on idle) { + @if (fragment === SettingsTabId.ReadingProfiles) { +
    + +
    + } + } + }
    diff --git a/UI/Web/src/app/settings/_components/settings/settings.component.ts b/UI/Web/src/app/settings/_components/settings/settings.component.ts index 84b1bfe0a..d470972d0 100644 --- a/UI/Web/src/app/settings/_components/settings/settings.component.ts +++ b/UI/Web/src/app/settings/_components/settings/settings.component.ts @@ -52,43 +52,47 @@ import {ScrobblingHoldsComponent} from "../../../user-settings/user-holds/scrobb import { ManageMetadataSettingsComponent } from "../../../admin/manage-metadata-settings/manage-metadata-settings.component"; +import { + ManageReadingProfilesComponent +} from "../../../user-settings/manage-reading-profiles/manage-reading-profiles.component"; @Component({ selector: 'app-settings', - imports: [ - ChangeAgeRestrictionComponent, - ChangeEmailComponent, - ChangePasswordComponent, - ManageDevicesComponent, - ManageOpdsComponent, - ManageScrobblingProvidersComponent, - ManageUserPreferencesComponent, - SideNavCompanionBarComponent, - ThemeManagerComponent, - TranslocoDirective, - UserStatsComponent, - AsyncPipe, - LicenseComponent, - ManageEmailSettingsComponent, - ManageLibraryComponent, - ManageMediaSettingsComponent, - ManageSettingsComponent, - ManageSystemComponent, - ManageTasksSettingsComponent, - ManageUsersComponent, - ServerStatsComponent, - SettingFragmentPipe, - ManageScrobblingComponent, - ManageMediaIssuesComponent, - ManageCustomizationComponent, - ImportMalCollectionComponent, - ImportCblComponent, - ManageMatchedMetadataComponent, - ManageUserTokensComponent, - EmailHistoryComponent, - ScrobblingHoldsComponent, - ManageMetadataSettingsComponent - ], + imports: [ + ChangeAgeRestrictionComponent, + ChangeEmailComponent, + ChangePasswordComponent, + ManageDevicesComponent, + ManageOpdsComponent, + ManageScrobblingProvidersComponent, + ManageUserPreferencesComponent, + SideNavCompanionBarComponent, + ThemeManagerComponent, + TranslocoDirective, + UserStatsComponent, + AsyncPipe, + LicenseComponent, + ManageEmailSettingsComponent, + ManageLibraryComponent, + ManageMediaSettingsComponent, + ManageSettingsComponent, + ManageSystemComponent, + ManageTasksSettingsComponent, + ManageUsersComponent, + ServerStatsComponent, + SettingFragmentPipe, + ManageScrobblingComponent, + ManageMediaIssuesComponent, + ManageCustomizationComponent, + ImportMalCollectionComponent, + ImportCblComponent, + ManageMatchedMetadataComponent, + ManageUserTokensComponent, + EmailHistoryComponent, + ScrobblingHoldsComponent, + ManageMetadataSettingsComponent, + ManageReadingProfilesComponent + ], templateUrl: './settings.component.html', styleUrl: './settings.component.scss', changeDetection: ChangeDetectionStrategy.OnPush diff --git a/UI/Web/src/app/shared/_services/download.service.ts b/UI/Web/src/app/shared/_services/download.service.ts index 49d57efbc..184f31094 100644 --- a/UI/Web/src/app/shared/_services/download.service.ts +++ b/UI/Web/src/app/shared/_services/download.service.ts @@ -1,24 +1,16 @@ -import { HttpClient } from '@angular/common/http'; +import {HttpClient} from '@angular/common/http'; import {DestroyRef, inject, Inject, Injectable} from '@angular/core'; -import { Series } from 'src/app/_models/series'; -import { environment } from 'src/environments/environment'; -import { ConfirmService } from '../confirm.service'; -import { Chapter } from 'src/app/_models/chapter'; -import { Volume } from 'src/app/_models/volume'; -import { - asyncScheduler, - BehaviorSubject, - Observable, - tap, - finalize, - of, - filter, -} from 'rxjs'; -import { download, Download } from '../_models/download'; -import { PageBookmark } from 'src/app/_models/readers/page-bookmark'; +import {Series} from 'src/app/_models/series'; +import {environment} from 'src/environments/environment'; +import {ConfirmService} from '../confirm.service'; +import {Chapter} from 'src/app/_models/chapter'; +import {Volume} from 'src/app/_models/volume'; +import {asyncScheduler, BehaviorSubject, filter, finalize, Observable, of, tap,} from 'rxjs'; +import {download, Download} from '../_models/download'; +import {PageBookmark} from 'src/app/_models/readers/page-bookmark'; import {switchMap, take, takeWhile, throttleTime} from 'rxjs/operators'; -import { AccountService } from 'src/app/_services/account.service'; -import { BytesPipe } from 'src/app/_pipes/bytes.pipe'; +import {AccountService} from 'src/app/_services/account.service'; +import {BytesPipe} from 'src/app/_pipes/bytes.pipe'; import {translate} from "@jsverse/transloco"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {SAVER, Saver} from "../../_providers/saver.provider"; @@ -26,7 +18,7 @@ import {UtilityService} from "./utility.service"; import {UserCollection} from "../../_models/collection-tag"; import {RecentlyAddedItem} from "../../_models/recently-added-item"; import {NextExpectedChapter} from "../../_models/series-detail/next-expected-chapter"; -import {BrowsePerson} from "../../_models/person/browse-person"; +import {BrowsePerson} from "../../_models/metadata/browse/browse-person"; export const DEBOUNCE_TIME = 100; diff --git a/UI/Web/src/app/shared/_services/filter-utilities.service.ts b/UI/Web/src/app/shared/_services/filter-utilities.service.ts index a8c615149..559a70ab1 100644 --- a/UI/Web/src/app/shared/_services/filter-utilities.service.ts +++ b/UI/Web/src/app/shared/_services/filter-utilities.service.ts @@ -1,18 +1,27 @@ import {inject, Injectable} from '@angular/core'; -import {ActivatedRouteSnapshot, Params, Router} from '@angular/router'; -import {SortField, SortOptions} from 'src/app/_models/metadata/series-filter'; +import {Params, Router} from '@angular/router'; +import {allSeriesSortFields, SortField} from 'src/app/_models/metadata/series-filter'; import {MetadataService} from "../../_services/metadata.service"; -import {SeriesFilterV2} from "../../_models/metadata/v2/series-filter-v2"; -import {FilterStatement} from "../../_models/metadata/v2/filter-statement"; +import {FilterV2} from "../../_models/metadata/v2/filter-v2"; import {FilterCombination} from "../../_models/metadata/v2/filter-combination"; -import {FilterField} from "../../_models/metadata/v2/filter-field"; +import {allSeriesFilterFields, FilterField} from "../../_models/metadata/v2/filter-field"; import {FilterComparison} from "../../_models/metadata/v2/filter-comparison"; -import { HttpClient } from "@angular/common/http"; +import {HttpClient} from "@angular/common/http"; import {TextResonse} from "../../_types/text-response"; import {environment} from "../../../environments/environment"; import {map, tap} from "rxjs/operators"; -import {of, switchMap} from "rxjs"; -import {Location} from "@angular/common"; +import {switchMap} from "rxjs"; +import {allPersonFilterFields, PersonFilterField} from "../../_models/metadata/v2/person-filter-field"; +import {allPersonSortFields} from "../../_models/metadata/v2/person-sort-field"; +import { + FilterSettingsBase, + PersonFilterSettings, + SeriesFilterSettings, + ValidFilterEntity +} from "../../metadata-filter/filter-settings"; +import {SortFieldPipe} from "../../_pipes/sort-field.pipe"; +import {GenericFilterFieldPipe} from "../../_pipes/generic-filter-field.pipe"; +import {TranslocoService} from "@jsverse/transloco"; @Injectable({ @@ -20,59 +29,64 @@ import {Location} from "@angular/common"; }) export class FilterUtilitiesService { - private readonly location = inject(Location); private readonly router = inject(Router); private readonly metadataService = inject(MetadataService); private readonly http = inject(HttpClient); + private readonly translocoService = inject(TranslocoService); - private apiUrl = environment.apiUrl; + private readonly sortFieldPipe = new SortFieldPipe(this.translocoService); + private readonly genericFilterFieldPipe = new GenericFilterFieldPipe(); - encodeFilter(filter: SeriesFilterV2 | undefined) { + private readonly apiUrl = environment.apiUrl; + + encodeFilter(filter: FilterV2 | undefined) { return this.http.post(this.apiUrl + 'filter/encode', filter, TextResonse); } decodeFilter(encodedFilter: string) { - return this.http.post(this.apiUrl + 'filter/decode', {encodedFilter}).pipe(map(filter => { + return this.http.post(this.apiUrl + 'filter/decode', {encodedFilter}).pipe(map(filter => { if (filter == null) { - filter = this.metadataService.createDefaultFilterDto(); - filter.statements.push(this.createSeriesV2DefaultStatement()); + filter = this.metadataService.createDefaultFilterDto('series'); + filter.statements.push(this.metadataService.createDefaultFilterStatement('series')); } return filter; })) } - updateUrlFromFilter(filter: SeriesFilterV2 | undefined) { + /** + * Encodes the filter and patches into the url + * @param filter + */ + updateUrlFromFilter(filter: FilterV2 | undefined) { return this.encodeFilter(filter).pipe(tap(encodedFilter => { window.history.replaceState(window.location.href, '', window.location.href.split('?')[0]+ '?' + encodedFilter); })); } - filterPresetsFromUrl(snapshot: ActivatedRouteSnapshot) { - const filter = this.metadataService.createDefaultFilterDto(); - filter.statements.push(this.createSeriesV2DefaultStatement()); - if (!window.location.href.includes('?')) return of(filter); - - return this.decodeFilter(window.location.href.split('?')[1]); - } - /** - * Applies and redirects to the passed page with the filter encoded + * Applies and redirects to the passed page with the filter encoded (Series only) * @param page * @param filter * @param comparison * @param value */ applyFilter(page: Array, filter: FilterField, comparison: FilterComparison, value: string) { - const dto = this.createSeriesV2Filter(); - dto.statements.push(this.metadataService.createDefaultFilterStatement(filter, comparison, value + '')); + const dto = this.metadataService.createDefaultFilterDto('series'); + dto.statements.push(this.metadataService.createFilterStatement(filter, comparison, value + '')); return this.encodeFilter(dto).pipe(switchMap(encodedFilter => { return this.router.navigateByUrl(page.join('/') + '?' + encodedFilter); })); } - applyFilterWithParams(page: Array, filter: SeriesFilterV2, extraParams: Params) { + /** + * (Series only) + * @param page + * @param filter + * @param extraParams + */ + applyFilterWithParams(page: Array, filter: FilterV2, extraParams: Params) { return this.encodeFilter(filter).pipe(switchMap(encodedFilter => { let url = page.join('/') + '?' + encodedFilter; url += Object.keys(extraParams).map(k => `&${k}=${extraParams[k]}`).join(''); @@ -81,23 +95,228 @@ export class FilterUtilitiesService { })); } - createSeriesV2Filter(): SeriesFilterV2 { - return { - combination: FilterCombination.And, - statements: [], - limitTo: 0, - sortOptions: { - isAscending: true, - sortField: SortField.SortName - }, - }; + + createPersonV2Filter(): FilterV2 { + return { + combination: FilterCombination.And, + statements: [], + limitTo: 0, + sortOptions: { + isAscending: true, + sortField: SortField.SortName + }, + }; } - createSeriesV2DefaultStatement(): FilterStatement { - return { - comparison: FilterComparison.Equal, - value: '', - field: FilterField.SeriesName - } + /** + * Returns the Sort Fields for the Metadata filter based on the entity. + * @param type + */ + getSortFields(type: ValidFilterEntity) { + switch (type) { + case 'series': + return allSeriesSortFields.map(f => { + return {title: this.sortFieldPipe.transform(f, type), value: f}; + }).sort((a, b) => a.title.localeCompare(b.title)) as unknown as {title: string, value: T}[]; + case 'person': + return allPersonSortFields.map(f => { + return {title: this.sortFieldPipe.transform(f, type), value: f}; + }).sort((a, b) => a.title.localeCompare(b.title)) as unknown as {title: string, value: T}[]; + default: + return [] as {title: string, value: T}[]; + } + } + + /** + * Returns the Filter Fields for the Metadata filter based on the entity. + * @param type + */ + getFilterFields(type: ValidFilterEntity): {title: string, value: T}[] { + switch (type) { + case 'series': + return allSeriesFilterFields.map(f => { + return {title: this.genericFilterFieldPipe.transform(f, type), value: f}; + }).sort((a, b) => a.title.localeCompare(b.title)) as unknown as {title: string, value: T}[]; + case 'person': + return allPersonFilterFields.map(f => { + return {title: this.genericFilterFieldPipe.transform(f, type), value: f}; + }).sort((a, b) => a.title.localeCompare(b.title)) as unknown as {title: string, value: T}[]; + default: + return [] as {title: string, value: T}[]; + } + } + + /** + * Returns the default field for the Series or Person entity aka what should be there if there are no statements + * @param type + */ + getDefaultFilterField(type: ValidFilterEntity) { + switch (type) { + case 'series': + return FilterField.SeriesName as unknown as T; + case 'person': + return PersonFilterField.Role as unknown as T; + } + } + + /** + * Returns the appropriate Dropdown Fields based on the entity type + * @param type + */ + getDropdownFields(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.PublicationStatus, FilterField.Languages, FilterField.AgeRating, + FilterField.Translators, FilterField.Characters, FilterField.Publisher, + FilterField.Editor, FilterField.CoverArtist, FilterField.Letterer, + FilterField.Colorist, FilterField.Inker, FilterField.Penciller, + FilterField.Writers, FilterField.Genres, FilterField.Libraries, + FilterField.Formats, FilterField.CollectionTags, FilterField.Tags, + FilterField.Imprint, FilterField.Team, FilterField.Location + ] as unknown as T[]; + case 'person': + return [ + PersonFilterField.Role + ] as unknown as T[]; + } + } + + /** + * Returns the applicable String fields + * @param type + */ + getStringFields(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.SeriesName, FilterField.Summary, FilterField.Path, FilterField.FilePath, PersonFilterField.Name + ] as unknown as T[]; + case 'person': + return [ + PersonFilterField.Name + ] as unknown as T[]; + } + } + + getNumberFields(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.ReadTime, FilterField.ReleaseYear, FilterField.ReadProgress, + FilterField.UserRating, FilterField.AverageRating, FilterField.ReadLast + ] as unknown as T[]; + case 'person': + return [ + PersonFilterField.ChapterCount, PersonFilterField.SeriesCount + ] as unknown as T[]; + } + } + + getBooleanFields(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.WantToRead + ] as unknown as T[]; + case 'person': + return [ + + ] as unknown as T[]; + } + } + + getDateFields(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.ReadingDate + ] as unknown as T[]; + case 'person': + return [ + + ] as unknown as T[]; + } + } + + getNumberFieldsThatIncludeDateComparisons(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.ReleaseYear + ] as unknown as T[]; + case 'person': + return [ + + ] as unknown as T[]; + } + } + + getDropdownFieldsThatIncludeDateComparisons(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.AgeRating + ] as unknown as T[]; + case 'person': + return [ + + ] as unknown as T[]; + } + } + + getDropdownFieldsWithoutMustContains(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.Libraries, FilterField.Formats, FilterField.AgeRating, FilterField.PublicationStatus + ] as unknown as T[]; + case 'person': + return [ + + ] as unknown as T[]; + } + } + + getDropdownFieldsThatIncludeNumberComparisons(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.AgeRating + ] as unknown as T[]; + case 'person': + return [ + + ] as unknown as T[]; + } + } + + getFieldsThatShouldIncludeIsEmpty(type: ValidFilterEntity) { + switch (type) { + case 'series': + return [ + FilterField.Summary, FilterField.UserRating, FilterField.Genres, + FilterField.CollectionTags, FilterField.Tags, FilterField.ReleaseYear, + FilterField.Translators, FilterField.Characters, FilterField.Publisher, + FilterField.Editor, FilterField.CoverArtist, FilterField.Letterer, + FilterField.Colorist, FilterField.Inker, FilterField.Penciller, + FilterField.Writers, FilterField.Imprint, FilterField.Team, + FilterField.Location + ] as unknown as T[]; + case 'person': + return [] as unknown as T[]; + } + } + + getDefaultSettings(entityType: ValidFilterEntity | "other" | undefined): FilterSettingsBase { + if (entityType === 'other' || entityType === undefined) { + // It doesn't matter, return series type + return new SeriesFilterSettings(); + } + + if (entityType == 'series') return new SeriesFilterSettings(); + if (entityType == 'person') return new PersonFilterSettings(); + + return new SeriesFilterSettings(); } } diff --git a/UI/Web/src/app/shared/_services/utility.service.ts b/UI/Web/src/app/shared/_services/utility.service.ts index afb63ab1d..da90ca412 100644 --- a/UI/Web/src/app/shared/_services/utility.service.ts +++ b/UI/Web/src/app/shared/_services/utility.service.ts @@ -1,5 +1,5 @@ import {HttpParams} from '@angular/common/http'; -import {Injectable} from '@angular/core'; +import {Inject, Injectable, signal, Signal} from '@angular/core'; import {Chapter} from 'src/app/_models/chapter'; import {LibraryType} from 'src/app/_models/library/library'; import {MangaFormat} from 'src/app/_models/manga-format'; @@ -8,6 +8,8 @@ import {Series} from 'src/app/_models/series'; import {Volume} from 'src/app/_models/volume'; import {translate} from "@jsverse/transloco"; import {debounceTime, ReplaySubject, shareReplay} from "rxjs"; +import {DOCUMENT} from "@angular/common"; +import getComputedStyle from "@popperjs/core/lib/dom-utils/getComputedStyle"; export enum KEY_CODES { RIGHT_ARROW = 'ArrowRight', @@ -27,12 +29,37 @@ export enum KEY_CODES { SHIFT = 'Shift' } +/** + * Use {@link UserBreakpoint} and {@link UtilityService.activeUserBreakpoint} for breakpoint that should depend on user settings + */ export enum Breakpoint { Mobile = 768, Tablet = 1280, Desktop = 1440 } +/* +Breakpoints, but they're derived from css vars in the theme + */ +export enum UserBreakpoint { + /** + * This is to be used in the UI/as value to disable the functionality with breakpoint, will not actually be set as a breakpoint + */ + Never = 0, + /** + * --mobile-breakpoint + */ + Mobile = 1, + /** + * --tablet-breakpoint + */ + Tablet = 2, + /** + * --desktop-breakpoint, does not actually matter as everything that's not mobile or tablet will be desktop + */ + Desktop = 3, +} + @Injectable({ providedIn: 'root' @@ -42,11 +69,19 @@ export class UtilityService { public readonly activeBreakpointSource = new ReplaySubject(1); public readonly activeBreakpoint$ = this.activeBreakpointSource.asObservable().pipe(debounceTime(60), shareReplay({bufferSize: 1, refCount: true})); + /** + * The currently active breakpoint, is {@link UserBreakpoint.Never} until the app has loaded + */ + public readonly activeUserBreakpoint = signal(UserBreakpoint.Never); + // TODO: I need an isPhone/Tablet so that I can easily trigger different views mangaFormatKeys: string[] = []; + constructor(@Inject(DOCUMENT) private document: Document) { + } + sortChapters = (a: Chapter, b: Chapter) => { return a.minNumber - b.minNumber; @@ -132,6 +167,34 @@ export class UtilityService { return Breakpoint.Desktop; } + updateUserBreakpoint(): void { + this.activeUserBreakpoint.set(this.getActiveUserBreakpoint()); + } + + private getActiveUserBreakpoint(): UserBreakpoint { + const style = getComputedStyle(this.document.body) + const mobileBreakPoint = this.parseOrDefault(style.getPropertyValue('--setting-mobile-breakpoint'), Breakpoint.Mobile); + const tabletBreakPoint = this.parseOrDefault(style.getPropertyValue('--setting-tablet-breakpoint'), Breakpoint.Tablet); + //const desktopBreakPoint = this.parseOrDefault(style.getPropertyValue('--setting-desktop-breakpoint'), Breakpoint.Desktop); + + if (window.innerWidth <= mobileBreakPoint) { + return UserBreakpoint.Mobile; + } else if (window.innerWidth <= tabletBreakPoint) { + return UserBreakpoint.Tablet; + } + + // Fallback to desktop + return UserBreakpoint.Desktop; + } + + private parseOrDefault(s: string, def: T): T { + const ret = parseInt(s, 10); + if (isNaN(ret)) { + return def; + } + return ret as T; + } + isInViewport(element: Element, additionalTopOffset: number = 0) { const rect = element.getBoundingClientRect(); return ( diff --git a/UI/Web/src/app/shared/confirm-dialog/_models/confirm-config.ts b/UI/Web/src/app/shared/confirm-dialog/_models/confirm-config.ts index 481c9b48c..7cfd257e2 100644 --- a/UI/Web/src/app/shared/confirm-dialog/_models/confirm-config.ts +++ b/UI/Web/src/app/shared/confirm-dialog/_models/confirm-config.ts @@ -1,7 +1,7 @@ -import { ConfirmButton } from './confirm-button'; +import {ConfirmButton} from './confirm-button'; export class ConfirmConfig { - _type: 'confirm' | 'alert' | 'info' = 'confirm'; + _type: 'confirm' | 'alert' | 'info' | 'prompt' = 'confirm'; header: string = 'Confirm'; content: string = ''; buttons: Array = []; diff --git a/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.html b/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.html index 21b741cd3..213c80ceb 100644 --- a/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.html +++ b/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.html @@ -5,8 +5,18 @@ }
    -
    -
    + + @if (config._type === 'prompt') { +
    +
    +
    + +
    +
    + } @else { +
    + } +
    @for(btn of config.buttons; track btn) {
    diff --git a/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.ts b/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.ts index f02ceb770..e8d315d48 100644 --- a/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.ts +++ b/UI/Web/src/app/shared/confirm-dialog/confirm-dialog.component.ts @@ -1,15 +1,15 @@ import {Component, inject, OnInit} from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmButton } from './_models/confirm-button'; -import { ConfirmConfig } from './_models/confirm-config'; -import {CommonModule} from "@angular/common"; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {ConfirmButton} from './_models/confirm-button'; +import {ConfirmConfig} from './_models/confirm-config'; import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; import {TranslocoDirective} from "@jsverse/transloco"; import {ConfirmTranslatePipe} from "../../_pipes/confirm-translate.pipe"; +import {FormControl, FormGroup, ReactiveFormsModule} from "@angular/forms"; @Component({ selector: 'app-confirm-dialog', - imports: [SafeHtmlPipe, TranslocoDirective, ConfirmTranslatePipe], + imports: [SafeHtmlPipe, TranslocoDirective, ConfirmTranslatePipe, ReactiveFormsModule], templateUrl: './confirm-dialog.component.html', styleUrls: ['./confirm-dialog.component.scss'] }) @@ -18,6 +18,9 @@ export class ConfirmDialogComponent implements OnInit { protected readonly modal = inject(NgbActiveModal); config!: ConfirmConfig; + formGroup = new FormGroup({ + 'prompt': new FormControl('', []), + }) ngOnInit(): void { if (this.config) { @@ -37,6 +40,10 @@ export class ConfirmDialogComponent implements OnInit { } clickButton(button: ConfirmButton) { + if (this.config._type === 'prompt') { + this.modal.close(button.type === 'primary' ? this.formGroup.get('prompt')?.value : ''); + return; + } this.modal.close(button.type === 'primary'); } diff --git a/UI/Web/src/app/shared/confirm.service.ts b/UI/Web/src/app/shared/confirm.service.ts index 77944d173..2259b6fd8 100644 --- a/UI/Web/src/app/shared/confirm.service.ts +++ b/UI/Web/src/app/shared/confirm.service.ts @@ -1,10 +1,8 @@ -import { Injectable } from '@angular/core'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { take } from 'rxjs/operators'; -import { ConfirmDialogComponent } from './confirm-dialog/confirm-dialog.component'; -import { ConfirmConfig } from './confirm-dialog/_models/confirm-config'; -import {translate} from "@jsverse/transloco"; -import {ConfirmButton} from "./confirm-dialog/_models/confirm-button"; +import {Injectable} from '@angular/core'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {take} from 'rxjs/operators'; +import {ConfirmDialogComponent} from './confirm-dialog/confirm-dialog.component'; +import {ConfirmConfig} from './confirm-dialog/_models/confirm-config'; @Injectable({ @@ -15,6 +13,7 @@ export class ConfirmService { defaultConfirm = new ConfirmConfig(); defaultAlert = new ConfirmConfig(); defaultInfo = new ConfirmConfig(); + defaultPrompt = new ConfirmConfig(); constructor(private modalService: NgbModal) { this.defaultConfirm.buttons = [ @@ -33,6 +32,13 @@ export class ConfirmService { ]; this.defaultInfo.header = 'confirm.info'; this.defaultInfo._type = 'info'; + + this.defaultPrompt.buttons = [ + {text: 'confirm.cancel', type: 'secondary'}, + {text: 'confirm.ok', type: 'primary'} + ]; + this.defaultPrompt.header = 'confirm.prompt'; + this.defaultPrompt._type = 'prompt'; } public async confirm(content?: string, config?: ConfirmConfig): Promise { @@ -114,4 +120,32 @@ export class ConfirmService { }); }); } + + public async prompt(title: string | undefined = undefined, config: ConfirmConfig | undefined = undefined): Promise { + + return new Promise((resolve, reject) => { + if (title === undefined && config === undefined) { + console.error('Confirm must have either text or a config object passed'); + return reject(false); + } + + if (title !== undefined && config === undefined) { + config = this.defaultPrompt; + config.header = title; + } + if (title !== undefined && title !== '' && config!.header === '') { + config!.header = title; + } + + const modalRef = this.modalService.open(ConfirmDialogComponent); + modalRef.componentInstance.config = config; + modalRef.closed.pipe(take(1)).subscribe(result => { + return resolve(result); + }); + modalRef.dismissed.pipe(take(1)).subscribe(() => { + return resolve(''); + }); + }); + + } } diff --git a/UI/Web/src/app/sidenav/_components/dashboard-stream-list-item/dashboard-stream-list-item.component.ts b/UI/Web/src/app/sidenav/_components/dashboard-stream-list-item/dashboard-stream-list-item.component.ts index acc1ca28c..267c5123c 100644 --- a/UI/Web/src/app/sidenav/_components/dashboard-stream-list-item/dashboard-stream-list-item.component.ts +++ b/UI/Web/src/app/sidenav/_components/dashboard-stream-list-item/dashboard-stream-list-item.component.ts @@ -1,14 +1,13 @@ import {ChangeDetectionStrategy, Component, EventEmitter, inject, Input, Output} from '@angular/core'; -import {APP_BASE_HREF, NgClass, NgIf} from '@angular/common'; +import {APP_BASE_HREF, NgClass} from '@angular/common'; import {TranslocoDirective} from "@jsverse/transloco"; import {DashboardStream} from "../../../_models/dashboard/dashboard-stream"; import {StreamNamePipe} from "../../../_pipes/stream-name.pipe"; -import {SideNavStreamType} from "../../../_models/sidenav/sidenav-stream-type.enum"; import {StreamType} from "../../../_models/dashboard/stream-type.enum"; @Component({ selector: 'app-dashboard-stream-list-item', - imports: [TranslocoDirective, StreamNamePipe, NgClass, NgIf], + imports: [TranslocoDirective, StreamNamePipe, NgClass], templateUrl: './dashboard-stream-list-item.component.html', styleUrls: ['./dashboard-stream-list-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush diff --git a/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.html b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.html index a20571b91..7e3deb5af 100644 --- a/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.html +++ b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.html @@ -76,7 +76,7 @@ @case (SideNavStreamType.BrowseAuthors) { + [cdkDragDisabled]="!editMode" [cdkDragData]="navStream" [editMode]="editMode" icon="fa-users" [title]="t('browse-people')" link="/browse/authors/"> } @case (SideNavStreamType.SmartFilter) { 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 547da378e..be9d841b5 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 @@ -16,7 +16,7 @@ import {AsyncPipe, NgClass} from "@angular/common"; import {SideNavItemComponent} from "../side-nav-item/side-nav-item.component"; import {FilterPipe} from "../../../_pipes/filter.pipe"; import {FormsModule} from "@angular/forms"; -import {translate, TranslocoDirective} from "@jsverse/transloco"; +import {translate, TranslocoDirective, TranslocoService} from "@jsverse/transloco"; import {CardActionablesComponent} from "../../../_single-module/card-actionables/card-actionables.component"; import {SideNavStream} from "../../../_models/sidenav/sidenav-stream"; import {SideNavStreamType} from "../../../_models/sidenav/sidenav-stream-type.enum"; @@ -25,6 +25,7 @@ import {SettingsTabId} from "../../preference-nav/preference-nav.component"; import {LicenseService} from "../../../_services/license.service"; import {CdkDrag, CdkDragDrop, CdkDropList} from "@angular/cdk/drag-drop"; import {ToastrService} from "ngx-toastr"; +import {ReadingProfileService} from "../../../_services/reading-profile.service"; @Component({ selector: 'app-side-nav', @@ -37,7 +38,7 @@ import {ToastrService} from "ngx-toastr"; export class SideNavComponent implements OnInit { protected readonly WikiLink = WikiLink; - protected readonly ItemLimit = 10; + protected readonly ItemLimit = 13; protected readonly SideNavStreamType = SideNavStreamType; protected readonly SettingsTabId = SettingsTabId; protected readonly Breakpoint = Breakpoint; @@ -53,7 +54,9 @@ export class SideNavComponent implements OnInit { protected readonly licenseService = inject(LicenseService); private readonly destroyRef = inject(DestroyRef); private readonly actionFactoryService = inject(ActionFactoryService); - private readonly toastr = inject(ToastrService) + private readonly toastr = inject(ToastrService); + private readonly readingProfilesService = inject(ReadingProfileService); + private readonly translocoService = inject(TranslocoService); cachedData: SideNavStream[] | null = null; @@ -175,6 +178,14 @@ export class SideNavComponent implements OnInit { case (Action.Edit): this.actionService.editLibrary(lib, () => window.scrollTo(0, 0)); break; + case (Action.SetReadingProfile): + this.actionService.setReadingProfileForLibrary(lib); + break; + case (Action.ClearReadingProfile): + this.readingProfilesService.clearLibraryProfiles(lib.id).subscribe(() => { + this.toastr.success(this.translocoService.translate('actionable.cleared-profile')); + }); + break; default: break; } diff --git a/UI/Web/src/app/sidenav/_components/sidenav-stream-list-item/sidenav-stream-list-item.component.ts b/UI/Web/src/app/sidenav/_components/sidenav-stream-list-item/sidenav-stream-list-item.component.ts index 6118eae83..ad86bef89 100644 --- a/UI/Web/src/app/sidenav/_components/sidenav-stream-list-item/sidenav-stream-list-item.component.ts +++ b/UI/Web/src/app/sidenav/_components/sidenav-stream-list-item/sidenav-stream-list-item.component.ts @@ -4,7 +4,6 @@ import {SideNavStream} from "../../../_models/sidenav/sidenav-stream"; import {StreamNamePipe} from "../../../_pipes/stream-name.pipe"; import {TranslocoDirective} from "@jsverse/transloco"; import {SideNavStreamType} from "../../../_models/sidenav/sidenav-stream-type.enum"; -import {RouterLink} from "@angular/router"; @Component({ selector: 'app-sidenav-stream-list-item', diff --git a/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts b/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts index 2333dee25..797124c4f 100644 --- a/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts +++ b/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts @@ -20,7 +20,13 @@ import { } from 'src/app/admin/_modals/directory-picker/directory-picker.component'; import {ConfirmService} from 'src/app/shared/confirm.service'; import {Breakpoint, UtilityService} from 'src/app/shared/_services/utility.service'; -import {allLibraryTypes, Library, LibraryType} from 'src/app/_models/library/library'; +import { + allKavitaPlusMetadataApplicableTypes, + allKavitaPlusScrobbleEligibleTypes, + allLibraryTypes, + Library, + LibraryType +} from 'src/app/_models/library/library'; import {ImageService} from 'src/app/_services/image.service'; import {LibraryService} from 'src/app/_services/library.service'; import {UploadService} from 'src/app/_services/upload.service'; @@ -103,8 +109,8 @@ export class LibrarySettingsModalComponent implements OnInit { includeInDashboard: new FormControl(true, { nonNullable: true, validators: [Validators.required] }), includeInRecommended: new FormControl(true, { nonNullable: true, validators: [Validators.required] }), includeInSearch: new FormControl(true, { nonNullable: true, validators: [Validators.required] }), - manageCollections: new FormControl(true, { nonNullable: true, validators: [Validators.required] }), - manageReadingLists: new FormControl(true, { nonNullable: true, validators: [Validators.required] }), + manageCollections: new FormControl(false, { nonNullable: true, validators: [Validators.required] }), + manageReadingLists: new FormControl(false, { nonNullable: true, validators: [Validators.required] }), allowScrobbling: new FormControl(true, { nonNullable: true, validators: [Validators.required] }), allowMetadataMatching: new FormControl(true, { nonNullable: true, validators: [Validators.required] }), collapseSeriesRelationships: new FormControl(false, { nonNullable: true, validators: [Validators.required] }), @@ -125,13 +131,12 @@ export class LibrarySettingsModalComponent implements OnInit { get IsKavitaPlusEligible() { const libType = parseInt(this.libraryForm.get('type')?.value + '', 10) as LibraryType; - return libType === LibraryType.Manga || libType === LibraryType.LightNovel; + return allKavitaPlusScrobbleEligibleTypes.includes(libType); } get IsMetadataDownloadEligible() { const libType = parseInt(this.libraryForm.get('type')?.value + '', 10) as LibraryType; - return libType === LibraryType.Manga || libType === LibraryType.LightNovel - || libType === LibraryType.ComicVine || libType === LibraryType.Comic; + return allKavitaPlusMetadataApplicableTypes.includes(libType); } ngOnInit(): void { @@ -232,6 +237,7 @@ export class LibrarySettingsModalComponent implements OnInit { this.libraryForm.get('allowMetadataMatching')?.disable(); } + this.cdRef.markForCheck(); }), takeUntilDestroyed(this.destroyRef) diff --git a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html index 5e4f9b2cd..b8c1ec8af 100644 --- a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html +++ b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html @@ -9,7 +9,7 @@ @for(section of sections; track section.title + section.children.length; let idx = $index;) { @if (hasAnyChildren(user, section)) { -
    {{t(section.title)}}
    +
    {{t(section.title)}}
    @for(item of section.children; track item.fragment) { @if (accountService.hasAnyRole(user, item.roles, item.restrictRoles)) { diff --git a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts index 6574fe945..d76a84cc8 100644 --- a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts +++ b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts @@ -41,6 +41,7 @@ export enum SettingsTabId { // Non-Admin Account = 'account', Preferences = 'preferences', + ReadingProfiles = 'reading-profiles', Clients = 'clients', Theme = 'theme', Devices = 'devices', @@ -111,6 +112,7 @@ export class PreferenceNavComponent implements AfterViewInit { children: [ new SideNavItem(SettingsTabId.Account, []), new SideNavItem(SettingsTabId.Preferences), + new SideNavItem(SettingsTabId.ReadingProfiles), new SideNavItem(SettingsTabId.Customize, [], undefined, [Role.ReadOnly]), new SideNavItem(SettingsTabId.Clients), new SideNavItem(SettingsTabId.Theme), @@ -190,6 +192,7 @@ export class PreferenceNavComponent implements AfterViewInit { } else { return this.manageService.getAllKavitaPlusSeries({ matchStateOption: MatchStateOption.Error, + libraryType: -1, searchTerm: '' }).pipe( takeUntilDestroyed(this.destroyRef), @@ -270,13 +273,11 @@ export class PreferenceNavComponent implements AfterViewInit { hasAnyChildren(user: User, section: PrefSection) { // Filter out items where the user has a restricted role const visibleItems = section.children.filter(item => - item.restrictRoles.length === 0 || !this.accountService.hasAnyRole(user, item.restrictRoles) + (item.restrictRoles.length === 0 || !this.accountService.hasAnyRestrictedRole(user, item.restrictRoles)) && + (item.roles.length === 0 || this.accountService.hasAnyRole(user, item.roles)) ); - // Check if the user has any allowed roles in the remaining items - return visibleItems.some(item => - this.accountService.hasAnyRole(user, item.roles) - ); + return visibleItems.length > 0; } collapse() { diff --git a/UI/Web/src/app/user-settings/change-password/change-password.component.html b/UI/Web/src/app/user-settings/change-password/change-password.component.html index 4ee02bce7..328131cf9 100644 --- a/UI/Web/src/app/user-settings/change-password/change-password.component.html +++ b/UI/Web/src/app/user-settings/change-password/change-password.component.html @@ -1,5 +1,9 @@ - + *************** diff --git a/UI/Web/src/app/user-settings/change-password/change-password.component.ts b/UI/Web/src/app/user-settings/change-password/change-password.component.ts index cf8a85e3b..645cc49ba 100644 --- a/UI/Web/src/app/user-settings/change-password/change-password.component.ts +++ b/UI/Web/src/app/user-settings/change-password/change-password.component.ts @@ -15,13 +15,14 @@ import {AccountService} from 'src/app/_services/account.service'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {translate, TranslocoDirective} from "@jsverse/transloco"; import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; +import {AsyncPipe} from "@angular/common"; @Component({ selector: 'app-change-password', templateUrl: './change-password.component.html', styleUrls: ['./change-password.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ReactiveFormsModule, TranslocoDirective, SettingItemComponent] + imports: [ReactiveFormsModule, TranslocoDirective, SettingItemComponent, AsyncPipe] }) export class ChangePasswordComponent implements OnInit, OnDestroy { diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.html b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.html new file mode 100644 index 000000000..d7f4c6bb9 --- /dev/null +++ b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.html @@ -0,0 +1,527 @@ + + + + + @if (!loading) { +
    + +
    + +

    {{t('description')}}

    +

    {{t('extra-tip')}} {{t('wiki-title')}}

    + + +
    + +
    +
    + + @if (readingProfiles.length < virtualScrollerBreakPoint) { + @for (readingProfile of readingProfiles; track readingProfile.id) { + + } + } @else { + + @for (readingProfile of scroll.viewPortItems; track readingProfile.id) { + + } + + } +
    +
    + +
    +
    + @if (selectedProfile === null) { +

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

    +

    {{t('selection-tip')}}

    + } + + @if (readingProfileForm !== null && selectedProfile !== null) { + +
    + +
    + + + + {{readingProfileForm.get('name')!.value}} + + + + + + + + @if (selectedProfile.id !== 0) { +
    + +
    + } + +
    + +
    +
      + +
    • + {{t('image-reader-settings-title')}} + + @defer (when activeTabId === TabId.ImageReader; prefetch on idle) { +
      +
      + + + {{readingProfileForm.get('readingDirection')!.value | readingDirection}} + + + + + +
      + +
      + + + {{readingProfileForm.get('scalingOption')!.value | scalingOption}} + + + + + +
      + +
      + + + {{readingProfileForm.get('pageSplitOption')!.value | pageSplitOption}} + + + + + +
      + +
      + + + {{readingProfileForm.get('readerMode')!.value | readerMode}} + + + + + +
      + +
      + + + {{readingProfileForm.get('layoutMode')!.value | layoutMode}} + + + + + +
      + +
      + + +
      +
      + {{ selectedProfile!.backgroundColor.toUpperCase() }} +
      +       + + + +       +
      + +
      + + +
      + +
      +       +       +
      + +
      + + +
      + +
      +       +       +
      + +
      + + +
      + +
      +       +       +
      + +
      + + +
      + +
      +       +       +
      + +
      + + +
      + +
      +       +       +
      + + @if (readingProfileForm.get("widthOverride"); as widthOverride) { +
      + + + + + +
      + {{ widthOverrideLabel | sentenceCase }} + +
      + +       +       +
      + } + +
      + + + {{readingProfileForm.get('disableWidthOverride')!.value | breakpoint}} + + + + + +
      + +
      + } +       +
      • + +
    • + {{t('book-reader-settings-title')}} + + @defer (when activeTabId === TabId.BookReader; prefetch on idle) { + @if (selectedProfile !== null && readingProfileForm !== null) { +
      +
      + + +
      + +
      +       +       +
      + +
      + + +
      + +
      +       +       +
      + +
      + + + {{readingProfileForm.get('bookReaderReadingDirection')!.value | readingDirection}} + + + + + +
      + +
      + + + {{readingProfileForm.get('bookReaderFontFamily')!.value | titlecase}} + + + + + +
      + +
      + + + {{readingProfileForm.get('bookReaderWritingStyle')!.value | writingStyle}} + + + + + +
      + +
      + + + {{readingProfileForm.get('bookReaderLayoutMode')!.value | bookPageLayoutMode}} + + + + + +
      + +
      + + + {{readingProfileForm.get('bookReaderThemeName')!.value}} + + + + + +
      + +
      + + + {{readingProfileForm.get('bookReaderFontSize')?.value + '%'}} + + +
      +
      + + +
      + {{readingProfileForm.get('bookReaderFontSize')?.value + '%'}} +
      +       +       +
      + +
      + + + {{readingProfileForm.get('bookReaderLineSpacing')?.value + '%'}} + + +
      +
      + +
      + {{readingProfileForm.get('bookReaderLineSpacing')?.value + '%'}} +
      +       +       +
      + +
      + + + {{readingProfileForm.get('bookReaderMargin')?.value + '%'}} + + +
      +
      + +
      + {{readingProfileForm!.get('bookReaderMargin')?.value + '%'}} +
      +       +       +
      +
      + } + } +       +
      • + +
    • + {{t('pdf-reader-settings-title')}} + + @defer (when activeTabId === TabId.PdfReader; prefetch on idle) { +
      +
      + + + {{readingProfileForm!.get('pdfSpreadMode')!.value | pdfSpreadMode}} + + + + + +
      + +
      + + + {{readingProfileForm!.get('pdfTheme')!.value | pdfTheme}} + + + + + +
      + +
      + + + {{readingProfileForm!.get('pdfScrollMode')!.value | pdfScrollMode}} + + + + + +
      +
      + } +       +
      • +
    +
    +
    + +
    + } +
    +
    + + + +
    + + + + +
    + +
    {{profile.name | sentenceCase}}
    + + @if (profile.kind === ReadingProfileKind.Default) { + {{t('default-profile')}} + } +
    +     + } + +     diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.scss b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.scss new file mode 100644 index 000000000..ba232dbae --- /dev/null +++ b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.scss @@ -0,0 +1,36 @@ +@use '../../../series-detail-common'; + +.group-item { + background-color: transparent; + + &:hover { + background-color: var(--card-bg-color); + border-radius: 5px; + cursor: pointer; + } + + &:active, &.active { + background-color: var(--card-bg-color); + border-radius: 5px; + } +} + +.pill { + font-size: .8rem; + background-color: var(--card-bg-color); + border-radius: 0.375rem; + color: var(--badge-text-color); + + &.active { + background-color : var(--primary-color); + } +} + +.custom-position { + right: 15px; + top: -42px; +} + +a:hover { + cursor: pointer; +} diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts new file mode 100644 index 000000000..e64e938f6 --- /dev/null +++ b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts @@ -0,0 +1,326 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, OnInit} from '@angular/core'; +import {ReadingProfileService} from "../../_services/reading-profile.service"; +import { + bookLayoutModes, + bookWritingStyles, breakPoints, + layoutModes, + pageSplitOptions, + pdfScrollModes, + pdfSpreadModes, + pdfThemes, + readingDirections, + readingModes, + ReadingProfile, + ReadingProfileKind, + scalingOptions +} from "../../_models/preferences/reading-profiles"; +import {translate, TranslocoDirective, TranslocoService} from "@jsverse/transloco"; +import {NgStyle, NgTemplateOutlet, TitleCasePipe} from "@angular/common"; +import {VirtualScrollerModule} from "@iharbeck/ngx-virtual-scroller"; +import {User} from "../../_models/user"; +import {AccountService} from "../../_services/account.service"; +import {debounceTime, distinctUntilChanged, take, tap} from "rxjs/operators"; +import {SentenceCasePipe} from "../../_pipes/sentence-case.pipe"; +import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms"; +import {BookService} from "../../book-reader/_services/book.service"; +import {BookPageLayoutMode} from "../../_models/readers/book-page-layout-mode"; +import {PdfTheme} from "../../_models/preferences/pdf-theme"; +import {PdfScrollMode} from "../../_models/preferences/pdf-scroll-mode"; +import {PdfSpreadMode} from "../../_models/preferences/pdf-spread-mode"; +import {bookColorThemes} from "../../book-reader/_components/reader-settings/reader-settings.component"; +import {BookPageLayoutModePipe} from "../../_pipes/book-page-layout-mode.pipe"; +import {LayoutModePipe} from "../../_pipes/layout-mode.pipe"; +import {PageSplitOptionPipe} from "../../_pipes/page-split-option.pipe"; +import {PdfScrollModePipe} from "../../_pipes/pdf-scroll-mode.pipe"; +import {PdfSpreadModePipe} from "../../_pipes/pdf-spread-mode.pipe"; +import {PdfThemePipe} from "../../_pipes/pdf-theme.pipe"; +import {ReaderModePipe} from "../../_pipes/reading-mode.pipe"; +import {ReadingDirectionPipe} from "../../_pipes/reading-direction.pipe"; +import {ScalingOptionPipe} from "../../_pipes/scaling-option.pipe"; +import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; +import {SettingSwitchComponent} from "../../settings/_components/setting-switch/setting-switch.component"; +import {WritingStylePipe} from "../../_pipes/writing-style.pipe"; +import {ColorPickerDirective} from "ngx-color-picker"; +import {NgbNav, NgbNavContent, NgbNavItem, NgbNavLinkBase, NgbNavOutlet, NgbTooltip} from "@ng-bootstrap/ng-bootstrap"; +import {filter} from "rxjs"; +import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; +import {LoadingComponent} from "../../shared/loading/loading.component"; +import {ToastrService} from "ngx-toastr"; +import {ConfirmService} from "../../shared/confirm.service"; +import {WikiLink} from "../../_models/wiki"; +import {BreakpointPipe} from "../../_pipes/breakpoint.pipe"; + +enum TabId { + ImageReader = "image-reader", + BookReader = "book-reader", + PdfReader = "pdf-reader", +} + +@Component({ + selector: 'app-manage-reading-profiles', + imports: [ + TranslocoDirective, + NgTemplateOutlet, + VirtualScrollerModule, + SentenceCasePipe, + BookPageLayoutModePipe, + FormsModule, + LayoutModePipe, + PageSplitOptionPipe, + PdfScrollModePipe, + PdfSpreadModePipe, + PdfThemePipe, + ReactiveFormsModule, + ReaderModePipe, + ReadingDirectionPipe, + ScalingOptionPipe, + SettingItemComponent, + SettingSwitchComponent, + TitleCasePipe, + WritingStylePipe, + NgStyle, + ColorPickerDirective, + NgbNav, + NgbNavItem, + NgbNavLinkBase, + NgbNavContent, + NgbNavOutlet, + LoadingComponent, + NgbTooltip, + BreakpointPipe, + ], + templateUrl: './manage-reading-profiles.component.html', + styleUrl: './manage-reading-profiles.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ManageReadingProfilesComponent implements OnInit { + + virtualScrollerBreakPoint = 20; + + fontFamilies: Array = []; + readingProfiles: ReadingProfile[] = []; + user!: User; + activeTabId = TabId.ImageReader; + loading = true; + + selectedProfile: ReadingProfile | null = null; + readingProfileForm: FormGroup | null = null; + bookColorThemesTranslated = bookColorThemes.map(o => { + const d = {...o}; + d.name = translate('theme.' + d.translationKey); + return d; + }); + + constructor( + private readingProfileService: ReadingProfileService, + private cdRef: ChangeDetectorRef, + private accountService: AccountService, + private bookService: BookService, + private destroyRef: DestroyRef, + private toastr: ToastrService, + private confirmService: ConfirmService, + private transLoco: TranslocoService, + ) { + this.fontFamilies = this.bookService.getFontFamilies().map(f => f.title); + this.cdRef.markForCheck(); + } + + ngOnInit(): void { + this.accountService.currentUser$.pipe(take(1)).subscribe(user => { + if (user) { + this.user = user; + } + }); + + this.readingProfileService.getAllProfiles().subscribe(profiles => { + this.readingProfiles = profiles; + this.loading = false; + this.setupForm(); + + const defaultProfile = this.readingProfiles.find(rp => rp.kind === ReadingProfileKind.Default); + this.selectProfile(defaultProfile); + + this.cdRef.markForCheck(); + }); + + } + + async delete(readingProfile: ReadingProfile) { + if (!await this.confirmService.confirm(this.transLoco.translate("manage-reading-profiles.confirm", {name: readingProfile.name}))) { + return; + } + + + this.readingProfileService.delete(readingProfile.id).subscribe(() => { + this.selectProfile(undefined); + this.readingProfiles = this.readingProfiles.filter(o => o.id !== readingProfile.id); + this.cdRef.markForCheck(); + }); + } + + get widthOverrideLabel() { + const rawVal = this.readingProfileForm?.get('widthOverride')!.value; + if (!rawVal) { + return translate('reader-settings.off'); + } + + const val = parseInt(rawVal); + return (val <= 0) ? '' : val + '%' + } + + setupForm() { + if (this.selectedProfile == null) { + return; + } + + + this.readingProfileForm = new FormGroup({}) + + if (this.fontFamilies.indexOf(this.selectedProfile.bookReaderFontFamily) < 0) { + this.selectedProfile.bookReaderFontFamily = 'default'; + } + + this.readingProfileForm.addControl('name', new FormControl(this.selectedProfile.name, Validators.required)); + + + // Image reader + this.readingProfileForm.addControl('readingDirection', new FormControl(this.selectedProfile.readingDirection, [])); + this.readingProfileForm.addControl('scalingOption', new FormControl(this.selectedProfile.scalingOption, [])); + this.readingProfileForm.addControl('pageSplitOption', new FormControl(this.selectedProfile.pageSplitOption, [])); + this.readingProfileForm.addControl('autoCloseMenu', new FormControl(this.selectedProfile.autoCloseMenu, [])); + this.readingProfileForm.addControl('showScreenHints', new FormControl(this.selectedProfile.showScreenHints, [])); + this.readingProfileForm.addControl('readerMode', new FormControl(this.selectedProfile.readerMode, [])); + this.readingProfileForm.addControl('layoutMode', new FormControl(this.selectedProfile.layoutMode, [])); + this.readingProfileForm.addControl('emulateBook', new FormControl(this.selectedProfile.emulateBook, [])); + this.readingProfileForm.addControl('swipeToPaginate', new FormControl(this.selectedProfile.swipeToPaginate, [])); + this.readingProfileForm.addControl('backgroundColor', new FormControl(this.selectedProfile.backgroundColor, [])); + this.readingProfileForm.addControl('allowAutomaticWebtoonReaderDetection', new FormControl(this.selectedProfile.allowAutomaticWebtoonReaderDetection, [])); + this.readingProfileForm.addControl('widthOverride', new FormControl(this.selectedProfile.widthOverride, [Validators.min(0), Validators.max(100)])); + this.readingProfileForm.addControl('disableWidthOverride', new FormControl(this.selectedProfile.disableWidthOverride, [])) + + // Epub reader + this.readingProfileForm.addControl('bookReaderFontFamily', new FormControl(this.selectedProfile.bookReaderFontFamily, [])); + this.readingProfileForm.addControl('bookReaderFontSize', new FormControl(this.selectedProfile.bookReaderFontSize, [])); + this.readingProfileForm.addControl('bookReaderLineSpacing', new FormControl(this.selectedProfile.bookReaderLineSpacing, [])); + this.readingProfileForm.addControl('bookReaderMargin', new FormControl(this.selectedProfile.bookReaderMargin, [])); + this.readingProfileForm.addControl('bookReaderReadingDirection', new FormControl(this.selectedProfile.bookReaderReadingDirection, [])); + this.readingProfileForm.addControl('bookReaderWritingStyle', new FormControl(this.selectedProfile.bookReaderWritingStyle, [])) + this.readingProfileForm.addControl('bookReaderTapToPaginate', new FormControl(this.selectedProfile.bookReaderTapToPaginate, [])); + this.readingProfileForm.addControl('bookReaderLayoutMode', new FormControl(this.selectedProfile.bookReaderLayoutMode || BookPageLayoutMode.Default, [])); + this.readingProfileForm.addControl('bookReaderThemeName', new FormControl(this.selectedProfile.bookReaderThemeName || bookColorThemes[0].name, [])); + this.readingProfileForm.addControl('bookReaderImmersiveMode', new FormControl(this.selectedProfile.bookReaderImmersiveMode, [])); + + // Pdf reader + this.readingProfileForm.addControl('pdfTheme', new FormControl(this.selectedProfile.pdfTheme || PdfTheme.Dark, [])); + this.readingProfileForm.addControl('pdfScrollMode', new FormControl(this.selectedProfile.pdfScrollMode || PdfScrollMode.Vertical, [])); + this.readingProfileForm.addControl('pdfSpreadMode', new FormControl(this.selectedProfile.pdfSpreadMode || PdfSpreadMode.None, [])); + + // Auto save + this.readingProfileForm.valueChanges.pipe( + debounceTime(500), + distinctUntilChanged(), + filter(_ => this.readingProfileForm!.valid), + takeUntilDestroyed(this.destroyRef), + tap(_ => this.autoSave()), + ).subscribe(); + } + + private autoSave() { + if (this.selectedProfile!.id == 0) { + this.readingProfileService.createProfile(this.packData()).subscribe({ + next: createdProfile => { + this.selectedProfile = createdProfile; + this.readingProfiles.push(createdProfile); + this.cdRef.markForCheck(); + }, + error: err => { + console.log(err); + this.toastr.error(err.message); + } + }) + } else { + const profile = this.packData(); + this.readingProfileService.updateProfile(profile).subscribe({ + next: newProfile => { + this.readingProfiles = this.readingProfiles.map(p => { + if (p.id !== profile.id) return p; + return newProfile; + }); + this.cdRef.markForCheck(); + }, + error: err => { + console.log(err); + this.toastr.error(err.message); + } + }) + } + } + + private packData(): ReadingProfile { + const data: ReadingProfile = this.readingProfileForm!.getRawValue(); + data.id = this.selectedProfile!.id; + data.readingDirection = parseInt(data.readingDirection as unknown as string); + data.scalingOption = parseInt(data.scalingOption as unknown as string); + data.pageSplitOption = parseInt(data.pageSplitOption as unknown as string); + data.readerMode = parseInt(data.readerMode as unknown as string); + data.layoutMode = parseInt(data.layoutMode as unknown as string); + data.disableWidthOverride = parseInt(data.disableWidthOverride as unknown as string); + + data.bookReaderReadingDirection = parseInt(data.bookReaderReadingDirection as unknown as string); + data.bookReaderWritingStyle = parseInt(data.bookReaderWritingStyle as unknown as string); + data.bookReaderLayoutMode = parseInt(data.bookReaderLayoutMode as unknown as string); + + data.pdfTheme = parseInt(data.pdfTheme as unknown as string); + data.pdfScrollMode = parseInt(data.pdfScrollMode as unknown as string); + data.pdfSpreadMode = parseInt(data.pdfSpreadMode as unknown as string); + + return data; + } + + handleBackgroundColorChange(color: string) { + if (!this.readingProfileForm || !this.selectedProfile) return; + + this.readingProfileForm.markAsDirty(); + this.readingProfileForm.markAsTouched(); + this.selectedProfile.backgroundColor = color; + this.readingProfileForm.get('backgroundColor')?.setValue(color); + this.cdRef.markForCheck(); + } + + selectProfile(profile: ReadingProfile | undefined | null) { + if (profile === undefined) { + this.selectedProfile = null; + this.cdRef.markForCheck(); + return; + } + + this.selectedProfile = profile; + this.setupForm(); + this.cdRef.markForCheck(); + } + + addNew() { + const defaultProfile = this.readingProfiles.find(f => f.kind === ReadingProfileKind.Default); + this.selectedProfile = {...defaultProfile!}; + this.selectedProfile.kind = ReadingProfileKind.User; + this.selectedProfile.id = 0; + this.selectedProfile.name = "New Profile #" + (this.readingProfiles.length + 1); + this.setupForm(); + this.cdRef.markForCheck(); + } + + protected readonly readingDirections = readingDirections; + protected readonly pdfSpreadModes = pdfSpreadModes; + protected readonly pageSplitOptions = pageSplitOptions; + protected readonly bookLayoutModes = bookLayoutModes; + protected readonly pdfThemes = pdfThemes; + protected readonly scalingOptions = scalingOptions; + protected readonly layoutModes = layoutModes; + protected readonly readerModes = readingModes; + protected readonly bookWritingStyles = bookWritingStyles; + protected readonly pdfScrollModes = pdfScrollModes; + protected readonly TabId = TabId; + protected readonly ReadingProfileKind = ReadingProfileKind; + protected readonly WikiLink = WikiLink; + protected readonly breakPoints = breakPoints; +} diff --git a/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.html b/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.html index 05cf7572e..d808ebd2d 100644 --- a/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.html +++ b/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.html @@ -115,383 +115,7 @@ }
    -
    } - - -

    {{t('image-reader-settings-title')}}

    - -
    - - - {{settingsForm.get('readingDirection')!.value | readingDirection}} - - - - - -
    - -
    - - - {{settingsForm.get('scalingOption')!.value | scalingOption}} - - - - - -
    - -
    - - - {{settingsForm.get('pageSplitOption')!.value | pageSplitOption}} - - - - - -
    - -
    - - - {{settingsForm.get('readerMode')!.value | readerMode}} - - - - - -
    - -
    - - - {{settingsForm.get('layoutMode')!.value | layoutMode}} - - - - - -
    - -
    - - -
    -
    - {{ user.preferences!.backgroundColor.toUpperCase() }} -
    -     - - - -     -
    - -
    - - -
    - -
    -     -     -
    - -
    - - -
    - -
    -     -     -
    - -
    - - -
    - -
    -     -     -
    - -
    - - -
    - -
    -     -     -
    - -
    - - -
    - -
    -     -     -
    -     - -
    - -

    {{t('book-reader-settings-title')}}

    - -
    - - -
    - -
    -     -     -
    - -
    - - -
    - -
    -     -     -
    - -
    - - - {{settingsForm.get('bookReaderReadingDirection')!.value | readingDirection}} - - - - - -
    - -
    - - - {{settingsForm.get('bookReaderFontFamily')!.value | titlecase}} - - - - - -
    - -
    - - - {{settingsForm.get('bookReaderWritingStyle')!.value | writingStyle}} - - - - - -
    - -
    - - - {{settingsForm.get('bookReaderLayoutMode')!.value | bookPageLayoutMode}} - - - - - -
    - -
    - - - {{settingsForm.get('bookReaderThemeName')!.value}} - - - - - -
    - -
    - - - {{settingsForm.get('bookReaderFontSize')?.value + '%'}} - - -
    -
    - - -
    - {{settingsForm.get('bookReaderFontSize')?.value + '%'}} -
    -     -     -
    - -
    - - - {{settingsForm.get('bookReaderLineSpacing')?.value + '%'}} - - -
    -
    - -
    - {{settingsForm.get('bookReaderLineSpacing')?.value + '%'}} -
    -     -     -
    - -
    - - - {{settingsForm.get('bookReaderMargin')?.value + '%'}} - - -
    -
    - -
    - {{settingsForm.get('bookReaderMargin')?.value + '%'}} -
    -     -     -
    -     - -
    - -

    {{t('pdf-reader-settings-title')}}

    - -
    - - - {{settingsForm.get('pdfSpreadMode')!.value | pdfSpreadMode}} - - - - - -
    - -
    - - - {{settingsForm.get('pdfTheme')!.value | pdfTheme}} - - - - - -
    - -
    - - - {{settingsForm.get('pdfScrollMode')!.value | pdfScrollMode}} - - - - - -
    -     } diff --git a/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.ts b/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.ts index a9313a0f2..15ed323c8 100644 --- a/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.ts +++ b/UI/Web/src/app/user-settings/manga-user-preferences/manage-user-preferences.component.ts @@ -1,17 +1,7 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, OnInit} from '@angular/core'; import {translate, TranslocoDirective} from "@jsverse/transloco"; import { - bookLayoutModes, - bookWritingStyles, - layoutModes, - pageSplitOptions, - pdfScrollModes, - pdfSpreadModes, - pdfThemes, - Preferences, - readingDirections, - readingModes, - scalingOptions + Preferences } from "../../_models/preferences/preferences"; import {AccountService} from "../../_services/account.service"; import {BookService} from "../../book-reader/_services/book.service"; @@ -44,6 +34,13 @@ import {PdfThemePipe} from "../../_pipes/pdf-theme.pipe"; import {PdfScrollModePipe} from "../../_pipes/pdf-scroll-mode.pipe"; import {LicenseService} from "../../_services/license.service"; import {ColorPickerDirective} from "ngx-color-picker"; +import { + bookLayoutModes, bookWritingStyles, + layoutModes, pageSplitOptions, + pdfScrollModes, + pdfSpreadModes, + pdfThemes, readingDirections, readingModes, scalingOptions +} from "../../_models/preferences/reading-profiles"; @Component({ selector: 'app-manga-user-preferences', @@ -83,23 +80,6 @@ export class ManageUserPreferencesComponent implements OnInit { private readonly localizationService = inject(LocalizationService); protected readonly licenseService = inject(LicenseService); - protected readonly readingDirections = readingDirections; - protected readonly scalingOptions = scalingOptions; - protected readonly pageSplitOptions = pageSplitOptions; - protected readonly readerModes = readingModes; - protected readonly layoutModes = layoutModes; - protected readonly bookWritingStyles = bookWritingStyles; - protected readonly bookLayoutModes = bookLayoutModes; - protected readonly pdfSpreadModes = pdfSpreadModes; - protected readonly pdfThemes = pdfThemes; - protected readonly pdfScrollModes = pdfScrollModes; - - bookColorThemesTranslated = bookColorThemes.map(o => { - const d = {...o}; - d.name = translate('theme.' + d.translationKey); - return d; - }); - fontFamilies: Array = []; locales: Array = []; @@ -110,7 +90,12 @@ export class ManageUserPreferencesComponent implements OnInit { get Locale() { if (!this.settingsForm.get('locale')) return 'English'; - return (this.locales || []).filter(l => l.fileName === this.settingsForm.get('locale')!.value)[0].renderName; + const locale = (this.locales || []).find(l => l.fileName === this.settingsForm.get('locale')!.value); + if (!locale) { + return 'English'; + } + + return locale.renderName; } @@ -140,37 +125,6 @@ export class ManageUserPreferencesComponent implements OnInit { this.user = results.user; this.user.preferences = results.pref; - if (this.fontFamilies.indexOf(this.user.preferences.bookReaderFontFamily) < 0) { - this.user.preferences.bookReaderFontFamily = 'default'; - } - - this.settingsForm.addControl('readingDirection', new FormControl(this.user.preferences.readingDirection, [])); - this.settingsForm.addControl('scalingOption', new FormControl(this.user.preferences.scalingOption, [])); - this.settingsForm.addControl('pageSplitOption', new FormControl(this.user.preferences.pageSplitOption, [])); - this.settingsForm.addControl('autoCloseMenu', new FormControl(this.user.preferences.autoCloseMenu, [])); - this.settingsForm.addControl('showScreenHints', new FormControl(this.user.preferences.showScreenHints, [])); - this.settingsForm.addControl('readerMode', new FormControl(this.user.preferences.readerMode, [])); - this.settingsForm.addControl('layoutMode', new FormControl(this.user.preferences.layoutMode, [])); - this.settingsForm.addControl('emulateBook', new FormControl(this.user.preferences.emulateBook, [])); - this.settingsForm.addControl('swipeToPaginate', new FormControl(this.user.preferences.swipeToPaginate, [])); - this.settingsForm.addControl('backgroundColor', new FormControl(this.user.preferences.backgroundColor, [])); - this.settingsForm.addControl('allowAutomaticWebtoonReaderDetection', new FormControl(this.user.preferences.allowAutomaticWebtoonReaderDetection, [])); - - this.settingsForm.addControl('bookReaderFontFamily', new FormControl(this.user.preferences.bookReaderFontFamily, [])); - this.settingsForm.addControl('bookReaderFontSize', new FormControl(this.user.preferences.bookReaderFontSize, [])); - this.settingsForm.addControl('bookReaderLineSpacing', new FormControl(this.user.preferences.bookReaderLineSpacing, [])); - this.settingsForm.addControl('bookReaderMargin', new FormControl(this.user.preferences.bookReaderMargin, [])); - this.settingsForm.addControl('bookReaderReadingDirection', new FormControl(this.user.preferences.bookReaderReadingDirection, [])); - this.settingsForm.addControl('bookReaderWritingStyle', new FormControl(this.user.preferences.bookReaderWritingStyle, [])) - this.settingsForm.addControl('bookReaderTapToPaginate', new FormControl(this.user.preferences.bookReaderTapToPaginate, [])); - this.settingsForm.addControl('bookReaderLayoutMode', new FormControl(this.user.preferences.bookReaderLayoutMode || BookPageLayoutMode.Default, [])); - this.settingsForm.addControl('bookReaderThemeName', new FormControl(this.user?.preferences.bookReaderThemeName || bookColorThemes[0].name, [])); - this.settingsForm.addControl('bookReaderImmersiveMode', new FormControl(this.user?.preferences.bookReaderImmersiveMode, [])); - - this.settingsForm.addControl('pdfTheme', new FormControl(this.user?.preferences.pdfTheme || PdfTheme.Dark, [])); - this.settingsForm.addControl('pdfScrollMode', new FormControl(this.user?.preferences.pdfScrollMode || PdfScrollMode.Vertical, [])); - this.settingsForm.addControl('pdfSpreadMode', new FormControl(this.user?.preferences.pdfSpreadMode || PdfSpreadMode.None, [])); - this.settingsForm.addControl('theme', new FormControl(this.user.preferences.theme, [])); this.settingsForm.addControl('globalPageLayoutMode', new FormControl(this.user.preferences.globalPageLayoutMode, [])); this.settingsForm.addControl('blurUnreadSummaries', new FormControl(this.user.preferences.blurUnreadSummaries, [])); @@ -217,7 +171,7 @@ export class ManageUserPreferencesComponent implements OnInit { reset() { if (!this.user) return; - this.settingsForm.get('readingDirection')?.setValue(this.user.preferences.readingDirection, {onlySelf: true, emitEvent: false}); + /*this.settingsForm.get('readingDirection')?.setValue(this.user.preferences.readingDirection, {onlySelf: true, emitEvent: false}); this.settingsForm.get('scalingOption')?.setValue(this.user.preferences.scalingOption, {onlySelf: true, emitEvent: false}); this.settingsForm.get('pageSplitOption')?.setValue(this.user.preferences.pageSplitOption, {onlySelf: true, emitEvent: false}); this.settingsForm.get('autoCloseMenu')?.setValue(this.user.preferences.autoCloseMenu, {onlySelf: true, emitEvent: false}); @@ -242,7 +196,7 @@ export class ManageUserPreferencesComponent implements OnInit { this.settingsForm.get('pdfTheme')?.setValue(this.user?.preferences.pdfTheme || PdfTheme.Dark, {onlySelf: true, emitEvent: false}); this.settingsForm.get('pdfScrollMode')?.setValue(this.user?.preferences.pdfScrollMode || PdfScrollMode.Vertical, {onlySelf: true, emitEvent: false}); - this.settingsForm.get('pdfSpreadMode')?.setValue(this.user?.preferences.pdfSpreadMode || PdfSpreadMode.None, {onlySelf: true, emitEvent: false}); + this.settingsForm.get('pdfSpreadMode')?.setValue(this.user?.preferences.pdfSpreadMode || PdfSpreadMode.None, {onlySelf: true, emitEvent: false});*/ this.settingsForm.get('theme')?.setValue(this.user.preferences.theme, {onlySelf: true, emitEvent: false}); this.settingsForm.get('globalPageLayoutMode')?.setValue(this.user.preferences.globalPageLayoutMode, {onlySelf: true, emitEvent: false}); @@ -260,7 +214,7 @@ export class ManageUserPreferencesComponent implements OnInit { packSettings(): Preferences { const modelSettings = this.settingsForm.value; return { - readingDirection: parseInt(modelSettings.readingDirection, 10), + /*readingDirection: parseInt(modelSettings.readingDirection, 10), scalingOption: parseInt(modelSettings.scalingOption, 10), pageSplitOption: parseInt(modelSettings.pageSplitOption, 10), autoCloseMenu: modelSettings.autoCloseMenu, @@ -277,34 +231,23 @@ export class ManageUserPreferencesComponent implements OnInit { bookReaderReadingDirection: parseInt(modelSettings.bookReaderReadingDirection, 10), bookReaderWritingStyle: parseInt(modelSettings.bookReaderWritingStyle, 10), bookReaderLayoutMode: parseInt(modelSettings.bookReaderLayoutMode, 10), - bookReaderThemeName: modelSettings.bookReaderThemeName, + bookReaderThemeName: modelSettings.bookReaderThemeName,*/ theme: modelSettings.theme, - bookReaderImmersiveMode: modelSettings.bookReaderImmersiveMode, + //bookReaderImmersiveMode: modelSettings.bookReaderImmersiveMode, globalPageLayoutMode: parseInt(modelSettings.globalPageLayoutMode, 10), blurUnreadSummaries: modelSettings.blurUnreadSummaries, promptForDownloadSize: modelSettings.promptForDownloadSize, noTransitions: modelSettings.noTransitions, - emulateBook: modelSettings.emulateBook, - swipeToPaginate: modelSettings.swipeToPaginate, + //emulateBook: modelSettings.emulateBook, + //swipeToPaginate: modelSettings.swipeToPaginate, collapseSeriesRelationships: modelSettings.collapseSeriesRelationships, shareReviews: modelSettings.shareReviews, locale: modelSettings.locale || 'en', - pdfTheme: parseInt(modelSettings.pdfTheme, 10), - pdfScrollMode: parseInt(modelSettings.pdfScrollMode, 10), - pdfSpreadMode: parseInt(modelSettings.pdfSpreadMode, 10), + //pdfTheme: parseInt(modelSettings.pdfTheme, 10), + //pdfScrollMode: parseInt(modelSettings.pdfScrollMode, 10), + //pdfSpreadMode: parseInt(modelSettings.pdfSpreadMode, 10), aniListScrobblingEnabled: modelSettings.aniListScrobblingEnabled, - wantToReadSync: modelSettings.wantToReadSync + wantToReadSync: modelSettings.wantToReadSync, }; } - - handleBackgroundColorChange(color: string) { - this.settingsForm.markAsDirty(); - this.settingsForm.markAsTouched(); - if (this.user?.preferences) { - this.user.preferences.backgroundColor = color; - } - - this.settingsForm.get('backgroundColor')?.setValue(color); - this.cdRef.markForCheck(); - } } diff --git a/UI/Web/src/app/volume-detail/volume-detail.component.html b/UI/Web/src/app/volume-detail/volume-detail.component.html index 8ef4f814c..56742bc57 100644 --- a/UI/Web/src/app/volume-detail/volume-detail.component.html +++ b/UI/Web/src/app/volume-detail/volume-detail.component.html @@ -170,7 +170,7 @@ [libraryId]="libraryId" [libraryType]="libraryType" [actions]="chapterActions" - (selection)="bulkSelectionService.handleCardSelection('chapter', scroll.viewPortInfo.startIndexWithBuffer + idx, volume.chapters.length, $event)" + (selection)="bulkSelectionService.handleCardSelection('chapter', scroll.viewPortInfo.startIndexWithBuffer + idx, volume!.chapters.length, $event)" [selected]="bulkSelectionService.isCardSelected('chapter', scroll.viewPortInfo.startIndexWithBuffer + idx)" [allowSelection]="true" > } diff --git a/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts index 91fc9f143..b16d1f9fc 100644 --- a/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts +++ b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts @@ -1,43 +1,49 @@ -import { DOCUMENT, NgStyle, NgIf, DecimalPipe } from '@angular/common'; +import {DecimalPipe, DOCUMENT, NgStyle} from '@angular/common'; import { AfterContentChecked, ChangeDetectionStrategy, ChangeDetectorRef, - Component, DestroyRef, + Component, + DestroyRef, ElementRef, EventEmitter, - HostListener, inject, Inject, OnInit, ViewChild } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { Router, ActivatedRoute } from '@angular/router'; -import { take, debounceTime } from 'rxjs'; -import { BulkSelectionService } from 'src/app/cards/bulk-selection.service'; -import { FilterSettings } from 'src/app/metadata-filter/filter-settings'; -import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service'; -import { UtilityService, KEY_CODES } from 'src/app/shared/_services/utility.service'; -import { SeriesRemovedEvent } from 'src/app/_models/events/series-removed-event'; -import { JumpKey } from 'src/app/_models/jumpbar/jump-key'; -import { Pagination } from 'src/app/_models/pagination'; -import { Series } from 'src/app/_models/series'; -import { FilterEvent } from 'src/app/_models/metadata/series-filter'; -import { Action, ActionItem } from 'src/app/_services/action-factory.service'; -import { ActionService } from 'src/app/_services/action.service'; -import { ImageService } from 'src/app/_services/image.service'; -import { JumpbarService } from 'src/app/_services/jumpbar.service'; -import { MessageHubService, EVENTS } from 'src/app/_services/message-hub.service'; -import { ScrollService } from 'src/app/_services/scroll.service'; -import { SeriesService } from 'src/app/_services/series.service'; +import {Title} from '@angular/platform-browser'; +import {ActivatedRoute, Router} from '@angular/router'; +import {debounceTime, take} from 'rxjs'; +import {BulkSelectionService} from 'src/app/cards/bulk-selection.service'; +import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service'; +import {UtilityService} from 'src/app/shared/_services/utility.service'; +import {SeriesRemovedEvent} from 'src/app/_models/events/series-removed-event'; +import {JumpKey} from 'src/app/_models/jumpbar/jump-key'; +import {Pagination} from 'src/app/_models/pagination'; +import {Series} from 'src/app/_models/series'; +import {FilterEvent, SortField} from 'src/app/_models/metadata/series-filter'; +import {Action, ActionItem} from 'src/app/_services/action-factory.service'; +import {ActionService} from 'src/app/_services/action.service'; +import {ImageService} from 'src/app/_services/image.service'; +import {JumpbarService} from 'src/app/_services/jumpbar.service'; +import {EVENTS, MessageHubService} from 'src/app/_services/message-hub.service'; +import {ScrollService} from 'src/app/_services/scroll.service'; +import {SeriesService} from 'src/app/_services/series.service'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; -import { SeriesCardComponent } from '../../../cards/series-card/series-card.component'; -import { CardDetailLayoutComponent } from '../../../cards/card-detail-layout/card-detail-layout.component'; -import { BulkOperationsComponent } from '../../../cards/bulk-operations/bulk-operations.component'; -import { SideNavCompanionBarComponent } from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component'; +import {SeriesCardComponent} from '../../../cards/series-card/series-card.component'; +import {CardDetailLayoutComponent} from '../../../cards/card-detail-layout/card-detail-layout.component'; +import {BulkOperationsComponent} from '../../../cards/bulk-operations/bulk-operations.component'; +import { + SideNavCompanionBarComponent +} from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component'; import {translate, TranslocoDirective} from "@jsverse/transloco"; -import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../../../_models/metadata/v2/filter-v2"; +import {FilterField} from "../../../_models/metadata/v2/filter-field"; +import {SeriesFilterSettings} from "../../../metadata-filter/filter-settings"; +import {MetadataService} from "../../../_services/metadata.service"; +import {FilterStatement} from "../../../_models/metadata/v2/filter-statement"; +import {FilterComparison} from "../../../_models/metadata/v2/filter-comparison"; @Component({ @@ -52,15 +58,16 @@ export class WantToReadComponent implements OnInit, AfterContentChecked { @ViewChild('scrollingBlock') scrollingBlock: ElementRef | undefined; @ViewChild('companionBar') companionBar: ElementRef | undefined; private readonly destroyRef = inject(DestroyRef); + private readonly metadataService = inject(MetadataService); isLoading: boolean = true; series: Array = []; pagination: Pagination = new Pagination(); - filter: SeriesFilterV2 | undefined = undefined; - filterSettings: FilterSettings = new FilterSettings(); + filter: FilterV2 | undefined = undefined; + filterSettings: SeriesFilterSettings = new SeriesFilterSettings(); refresh: EventEmitter = new EventEmitter(); - filterActiveCheck!: SeriesFilterV2; + filterActiveCheck!: FilterV2; filterActive: boolean = false; jumpbarKeys: Array = []; @@ -105,13 +112,23 @@ export class WantToReadComponent implements OnInit, AfterContentChecked { this.router.routeReuseStrategy.shouldReuseRoute = () => false; this.titleService.setTitle('Kavita - ' + translate('want-to-read.title')); - this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => { - this.filter = filter; - this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter(); - this.filterActiveCheck!.statements.push(this.filterUtilityService.createSeriesV2DefaultStatement()); + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.filter = data['filter'] as FilterV2; + + const defaultStmt = {field: FilterField.WantToRead, value: 'true', comparison: FilterComparison.Equal} as FilterStatement; + + if (this.filter == null) { + this.filter = this.metadataService.createDefaultFilterDto('series'); + this.filter.statements.push(defaultStmt); + } + + + this.filterActiveCheck = this.metadataService.createDefaultFilterDto('series'); + this.filterActiveCheck!.statements.push(defaultStmt); this.filterSettings.presetsV2 = this.filter; + this.cdRef.markForCheck(); }); @@ -165,7 +182,7 @@ export class WantToReadComponent implements OnInit, AfterContentChecked { }); } - updateFilter(data: FilterEvent) { + updateFilter(data: FilterEvent) { if (data.filterV2 === undefined) return; this.filter = data.filterV2; diff --git a/UI/Web/src/assets/langs/ca.json b/UI/Web/src/assets/langs/ca.json index 7291e3e2a..1b929cb53 100644 --- a/UI/Web/src/assets/langs/ca.json +++ b/UI/Web/src/assets/langs/ca.json @@ -31,29 +31,11 @@ "success-toast": "S'han actualitzat les preferències d'ús", "global-settings-title": "Paràmetres globals", "locale-label": "Configuració local", - "scaling-option-label": "Opcions d'escala", - "background-color-label": "Color de fons", - "writing-style-label": "Estil d'escriptura", - "font-size-book-label": "Mida de la lletra", - "line-height-book-label": "Interlineat", - "pdf-scroll-mode-label": "Mode de desplaçament", - "pdf-theme-label": "Tema", - "immersive-mode-label": "Mode immersiu", "locale-tooltip": "La llengua que ha d'usar el Kavita", "prompt-on-download-label": "Pregunta en baixar", "disable-animations-label": "Desactiva les animacions", - "auto-close-menu-label": "Tanca automàticament el menú", - "font-family-label": "Família tipogràfica", - "margin-book-label": "Marge", "clients-api-key-label": "Clau de l'API", - "clients-api-key-tooltip": "La clau de l'API és com una contrasenya. Reinicialitzar-la invalidarà tots els clients existents.", - "image-reader-settings-title": "Lector d'imatges", - "reading-direction-label": "Direcció de lectura", - "layout-mode-label": "Mode de disposició", - "book-reader-settings-title": "Lector de llibres", - "reading-direction-book-label": "Direcció de lectura", - "layout-mode-book-label": "Mode de disposició", - "pdf-reader-settings-title": "Lector de PDF" + "clients-api-key-tooltip": "La clau de l'API és com una contrasenya. Reinicialitzar-la invalidarà tots els clients existents." }, "theme-manager": { "title": "Gestor de temes", @@ -493,8 +475,7 @@ "manga-reader": { "incognito-title": "Mode incògnit:", "next-page-tooltip": "Pàgina següent", - "back": "Enrere", - "save-globally": "Desa globalment" + "back": "Enrere" }, "pdf-scroll-mode-pipe": { "vertical": "Vertical", diff --git a/UI/Web/src/assets/langs/cs.json b/UI/Web/src/assets/langs/cs.json index dfa2db0fc..05a877a23 100644 --- a/UI/Web/src/assets/langs/cs.json +++ b/UI/Web/src/assets/langs/cs.json @@ -83,7 +83,7 @@ }, "user-preferences": { "title": "Uživatelský panel", - "pref-description": "Toto jsou globální nastavení, která jsou vázána na váš účet.", + "pref-description": "Jedná se o globální nastavení, která jsou vázána na váš účet. Nastavení čtečky se nachází v sekci Čtecí profily.", "account-tab": "{{tabs.account-tab}}", "preferences-tab": "{{tabs.preferences-tab}}", "theme-tab": "{{tabs.theme-tab}}", @@ -107,70 +107,19 @@ "collapse-series-relationships-tooltip": "Měla by Kavita ukázat seriály, které nemají žádné vztahy nebo jsou rodičem/prequelem", "share-series-reviews-label": "Sdílejte recenze Serií", "share-series-reviews-tooltip": "Má Kavita zahrnout vaše recenze na Series pro ostatní uživatele", - "image-reader-settings-title": "Čtečka obrázků", - "reading-direction-label": "Směr čtení", - "reading-direction-tooltip": "Kliknutím na směr přejdete na další stránku. Zprava doleva znamená, že kliknutím na levou stranu obrazovky přejdete na další stránku.", - "scaling-option-label": "Možnosti škálování", - "scaling-option-tooltip": "Jak změnit měřítko obrázku na obrazovku.", - "page-splitting-label": "Rozdělení stránky", - "page-splitting-tooltip": "Jak rozdělit obrázek v plné šířce (tj. oba obrázky jsou kombinovány)", - "reading-mode-label": "Režim čtení", - "reading-mode-tooltip": "Změna stránkování na vertikální, horizontální nebo nekonečné posunování", - "layout-mode-label": "Režim rozvržení", - "layout-mode-tooltip": "Vykreslení jednoho obrázku na obrazovku nebo dvou obrázků vedle sebe", - "background-color-label": "Barva pozadí", - "background-color-tooltip": "Barva pozadí čtečky obrázků", - "auto-close-menu-label": "Nabídka automatického zavření", - "auto-close-menu-tooltip": "Mělo by se menu automaticky zavřít", - "show-screen-hints-label": "Zobrazit tipy na obrazovce", - "show-screen-hints-tooltip": "Zobrazení překryvného okna pro lepší orientaci v oblasti a směru stránkování", - "emulate-comic-book-label": "Emulovat komiks", - "swipe-to-paginate-label": "Přejeďte prstem na stránkování", - "book-reader-settings-title": "Čtečka knih", - "tap-to-paginate-label": "Klepnutím můžete stránkovat", - "tap-to-paginate-tooltip": "Pokud strany obrazovky čtečky knih umožňují klepnutím na ni přejít na předchozí/další stránku", - "immersive-mode-label": "Imerzní režim", - "immersive-mode-tooltip": "Tím se nabídka skryje za kliknutí na dokument čtečky a otočením klepnutím zapněte stránkování", - "reading-direction-book-label": "Směr čtení", - "reading-direction-book-tooltip": "Směrem ke kliknutí se přesunete na další stránku. Zprava doleva znamená, že kliknutím na levou stranu obrazovky přejdete na další stránku.", - "font-family-label": "Rodina písem", - "font-family-tooltip": "Rodina písem k načtení. Výchozí načte výchozí písmo knihy", - "writing-style-label": "Styl psaní", - "writing-style-tooltip": "Změní směr textu. Vodorovně je zleva doprava, svisle shora dolů.", - "layout-mode-book-label": "Režim rozvržení", - "layout-mode-book-tooltip": "Jak by měl být obsah rozvržen. Scroll je takový, jak ho kniha balí. 1 nebo 2 sloupce se přizpůsobí výšce zařízení a vejdou se 1 nebo 2 sloupce textu na stránku", - "color-theme-book-label": "Barevný motiv", - "color-theme-book-tooltip": "Jaký barevný motiv použít na obsah a nabídku čtečky knih", - "font-size-book-label": "Velikost písma", - "line-height-book-label": "Řádkování", - "line-height-book-tooltip": "Kolik mezer mezi řádky knihy", - "margin-book-label": "Okraj", - "margin-book-tooltip": "Kolik mezer na každé straně obrazovky. To bude přepsáno na 0 na mobilních zařízeních bez ohledu na toto nastavení.", "clients-opds-alert": "OPDS není na tomto serveru povoleno. Toto nebude mít vliv na uživatele Tachiyomi.", "clients-opds-description": "Všichni klienti třetích stran budou používat klíč API nebo níže uvedenou adresu URL připojení. Jsou to jako hesla, udržujte je v soukromí.", "clients-api-key-tooltip": "Klíč API je jako heslo. Jeho resetováním dojde ke zneplatnění všech stávajících klientů.", "clients-opds-url-tooltip": "Viz seznam podporovaných klientů OPDS: ", "reset": "{{common.reset}}", "save": "{{common.save}}", - "swipe-to-paginate-tooltip": "Mělo by přejetí prstem po obrazovce způsobit spuštění další nebo předchozí stránky", - "emulate-comic-book-tooltip": "Používá stínový efekt, který napodobuje čtení z knihy", - "pdf-scroll-mode-tooltip": "Způsob procházení stránek. Vertikální/horizontální a stránkování klepnutím (bez posouvání)", - "pdf-spread-mode-label": "Režim rozložení", - "pdf-reader-settings-title": "PDF čtečka", - "pdf-scroll-mode-label": "Režim posunu", - "font-size-book-tooltip": "Procento měřítka, které se použije na písmo v knize", - "pdf-spread-mode-tooltip": "Jak by měly být stránky uspořádány. Jednoduché nebo dvojité (liché/sudé)", - "pdf-theme-label": "Motiv", - "pdf-theme-tooltip": "Barevný motiv čtečky", "clients-opds-url-label": "URL OPDS", "clients-api-key-label": "Klíč API", "kavitaplus-settings-title": "Kavita+", "anilist-scrobbling-label": "AniList Scrobblování", "anilist-scrobbling-tooltip": "Povolit Kavitě Scrobble (jednosměrná synchronizace) průběhu čtení a hodnocení do AniListu", "want-to-read-sync-label": "Chci číst Synchronizace", - "want-to-read-sync-tooltip": "Povolit Kavitě přidávat položky do seznamu Chci číst na základě AniListu a sérií MAL v seznamu čekajících čtení", - "allow-auto-webtoon-reader-label": "Režim automatické čtečky webových komiksů", - "allow-auto-webtoon-reader-tooltip": "Pokud stránky vypadají jako webový komiks, přepněte se do režimu čtečky webových komiksů. Mohou se vyskytnout některé falešně pozitivní výsledky." + "want-to-read-sync-tooltip": "Povolit Kavitě přidávat položky do seznamu Chci číst na základě AniListu a sérií MAL v seznamu čekajících čtení" }, "user-holds": { "title": "Scrobble drží", @@ -680,7 +629,10 @@ "incognito-mode-label": "Režim inkognito", "next": "Další", "previous": "Předchozí", - "go-to-page-prompt": "Existuje {{totalPages}} stránek. Na kterou stránku chcete přejít?" + "go-to-page-prompt": "Existuje {{totalPages}} stránek. Na kterou stránku chcete přejít?", + "go-to-first-page": "Přejít na první stránku", + "go-to-section": "Přejít do sekce", + "go-to-section-prompt": "Je zde {{totalSections}} sekcí. Do které sekce chcete přejít?" }, "personal-table-of-contents": { "no-data": "V záložkách zatím nic není", @@ -728,7 +680,7 @@ "series-detail": { "page-settings-title": "Nastavení stránky", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "Karta", "layout-mode-option-list": "Seznam", "continue-from": "Pokračovat {{title}}", @@ -839,7 +791,6 @@ "customize": "{{settings.customize}}", "reading-lists": "Seznamy četby", "bookmarks": "Záložky", - "browse-authors": "Procházet autory", "donate": "Přispět", "more": "Více", "back": "Zpět", @@ -849,7 +800,8 @@ "collections": "Sbírky", "all-series": "Všechny série", "cancel-edit": "Zavřít úpravu", - "edit": "{{common.edit}}" + "edit": "{{common.edit}}", + "browse-people": "Procházet Osoby" }, "library-settings-modal": { "close": "{{common.close}}", @@ -905,14 +857,14 @@ "allow-metadata-matching-tooltip": "Měla by Kavita stáhnout metadata pro série v rámci této knihovny. K tomu dojde pouze v případě, že má server aktivní předplatné Kavita+." }, "reader-settings": { - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", - "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", - "writing-style-label": "{{user-preferences.writing-style-label}}", - "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "font-family-label": "{{manage-reading-profiles.font-family-label}}", + "font-size-label": "{{manage-reading-profiles.font-size-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", + "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}", + "writing-style-label": "{{manage-reading-profiles.writing-style-label}}", + "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "right-to-left": "Zprava doleva", "writing-style-tooltip": "Změní směr textu. Vodorovný je zleva doprava, svislý je shora dolů.", "general-settings-title": "Obecná nastavení", @@ -938,7 +890,15 @@ "color-theme-title": "Barevné motivy", "theme-white": "Bílý", "theme-paper": "Papír", - "theme-black": "Černý" + "theme-black": "Černý", + "create-new-tooltip": "Vytvořte nový spravovatelný profil z vašeho aktuálního implicitního profilu", + "update-parent": "Uložit do {{name}}", + "loading": "načítání", + "create-new": "Nový profil z implicitního", + "reading-profile-updated": "Profil čtení aktualizován", + "reading-profile-promoted": "Profil čtení propagován", + "line-spacing-min-label": "1x", + "line-spacing-max-label": "2.5x" }, "bookmarks": { "title": "{{side-nav.bookmarks}}", @@ -1337,7 +1297,8 @@ "admin-manage-tokens": "Správa uživatelských tokenů", "scrobble-holds": "Podržení Scrobble", "account": "Účet", - "admin-metadata": "Správa metadat" + "admin-metadata": "Správa metadat", + "reading-profiles": "Profily čtení" }, "collection-detail": { "item-count": "{{common.item-count}}", @@ -1452,7 +1413,9 @@ "server-settings": "Nastavení serveru", "settings": "Nastavení", "announcements": "Oznámení", - "person-aka-status": "Shoduje se s aliasem" + "person-aka-status": "Shoduje se s aliasem", + "browse-tags": "Procházet štítky", + "browse-genres": "Procházet žánry" }, "promoted-icon": { "promoted": "{{common.promoted}}" @@ -1524,8 +1487,8 @@ "dry-run-description": "Toto je zkušební verze, která ukazuje, co se stane, pokud stisknete tlačítko Další a provedete import. Všechny chyby nebudou importovány." }, "manga-reader": { - "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", + "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}", + "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}", "next-page-tooltip": "Další stránka", "first-time-reading-manga": "Klepnutím na obrázek kdykoli otevřete nabídku. Klepnutím na ukazatel průběhu můžete konfigurovat různá nastavení nebo přejít na stránku. Klepnutím na strany obrázku přejdete na další/předchozí stránku.", "back": "Zpět", @@ -1536,7 +1499,6 @@ "no-prev-chapter": "Žádná předchozí kapitola", "incognito-title": "Anonymní režim:", "left-to-right-alt": "Zleva doprava", - "save-globally": "Uložit globálně", "shortcuts-menu-alt": "Modální klávesové zkratky", "prev-page-tooltip": "Předchozí stránka", "prev-chapter-tooltip": "Předchozí kapitola/svazek", @@ -1555,14 +1517,19 @@ "incognito-alt": "Anonymní režim je zapnutý. Přepnutím jej vypnete.", "image-splitting-label": "Rozdělení obrazu", "width-override-label": "Přepsání šířky", - "off": "Vypnuto", + "off": "{{reader-settings.off}}", "enable-comic-book-label": "Napodobit komiks", "brightness-label": "Jas", "bookmark-page-tooltip": "Založit stránku", "unbookmark-page-tooltip": "Zrušení záložky stránky", "bookmarks-title": "Záložky", "layout-mode-switched": "Režim rozvržení přepnutý na jednoduchý z důvodu nedostatku místa pro vykreslení dvojitého rozvržení", - "user-preferences-updated": "Aktualizace uživatelských předvoleb" + "create-new": "{{reader-settings.create-new}}", + "update-parent": "{{reader-settings.update-parent}}", + "loading": "{{reader-settings.loading}}", + "create-new-tooltip": "{{reader-settings.create-new-tooltip}}", + "reading-profile-updated": "Profil čtení aktualizován", + "reading-profile-promoted": "Profil čtení propagován" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -1744,8 +1711,8 @@ "cover-image-tab": "{{tabs.cover-tab}}", "tasks-tab": "{{tabs.tasks-tab}}", "info-tab": "{{tabs.info-tab}}", - "pages-label": "{{edit-chapter-modal.pages-count}}", - "words-label": "{{edit-chapter-modal.length-title}}", + "pages-label": "{{edit-chapter-modal.pages-label}}", + "words-label": "{{edit-chapter-modal.words-label}}", "pages-count": "{{edit-chapter-modal.pages-count}}", "words-count": "{{edit-chapter-modal.words-count}}", "reading-time-label": "{{edit-chapter-modal.reading-time-label}}", @@ -1898,7 +1865,7 @@ "reading-lists": "{{side-nav.reading-lists}}", "bookmarks": "{{side-nav.bookmarks}}", "all-series": "{{side-nav.all-series}}", - "browse-authors": "{{side-nav.browse-authors}}" + "browse-authors": "{{side-nav.browse-people}}" }, "filter-field-pipe": { "age-rating": "{{metadata-fields.age-rating-title}}", @@ -2004,7 +1971,13 @@ "reorder": "Přeuspořádat", "rename": "Přejmenovat", "rename-tooltip": "Přejmenovat inteligentní filtr", - "merge": "Sloučit" + "merge": "Sloučit", + "reading-profiles": "Profily čtení", + "set-reading-profile": "Nastavit profil čtení", + "set-reading-profile-tooltip": "Připojit profil čtení k této knihovně", + "clear-reading-profile": "Vymazat profil čtení", + "clear-reading-profile-tooltip": "Vymazat profil čtení pro tuto knihovnu", + "cleared-profile": "Vyčištěný profil čtení" }, "changelog-update-item": { "changed": "Změněno", @@ -2093,11 +2066,6 @@ "epub": "Epub", "image": "Obrázek" }, - "browse-authors": { - "title": "Procházet autory a spisovatele", - "author-count": "{{num}} lidí", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "carousel-reel": { "prev-items": "Předchozí položky", "next-items": "Další položky" @@ -2121,7 +2089,9 @@ "dont-match-status-label": "{{dont-match-label}}", "match-alt": "Spáruj {{seriesName}}", "actions-header": "Akce", - "library-name-header": "Knihovna" + "library-name-header": "Knihovna", + "library-type": "Typ knihovny", + "matched-state-label": "Stav shody" }, "match-series-result-item": { "volume-count": "{{server-stats.volume-count}}", @@ -2154,7 +2124,10 @@ "last-modified": "Naposledy upraveno", "time-to-read": "Čas k přečtení", "read-progress": "Naposledy čteno", - "average-rating": "Průměrné hodnocení" + "average-rating": "Průměrné hodnocení", + "person-name": "Jméno", + "person-series-count": "Počet sérií", + "person-chapter-count": "Počet kapitol" }, "edit-person-modal": { "name-label": "{{edit-series-modal.name-label}}", @@ -2461,7 +2434,9 @@ "webtoon-override": "Přepnutí do režimu Webtoon kvůli obrázkům představujícím webtoon.", "scrobble-gen-init": "Vytvořena úloha pro generování událostí scrobble z historie čtení, hodnocení v minulosti a jejich synchronizaci s připojenými službami.", "confirm-delete-multiple-volumes": "Jste si jisti, že chcete odstranit {{count}} svazků? Soubory na disku se tím nezmění.", - "series-added-want-to-read": "Série přidána ze seznamu Chci číst" + "series-added-want-to-read": "Série přidána ze seznamu Chci číst", + "series-bound-to-reading-profile": "Série vázaná na čtenářský profil {{name}}", + "library-bound-to-reading-profile": "Knihovna vázaná na čtenářský profil {{name}}" }, "preferences": { "split-right-to-left": "Rozdělit zprava doleva", @@ -2543,7 +2518,8 @@ "submit": "Odeslat", "email": "E-mail", "chapter-count": "{{num}} Kapitol", - "no-data": "Žádná data" + "no-data": "Žádná data", + "issue-count": "{{num}} Vydání" }, "entity-type": { "logs": "záznamy", @@ -2582,7 +2558,8 @@ "confirm": "Potvrdit", "info": "Informace", "cancel": "{{common.cancel}}", - "ok": "Ok" + "ok": "Ok", + "prompt": "Otázka" }, "manage-metadata-settings": { "enabled-tooltip": "Povolte systému Kavita stahovat metadata a zapisovat do jeho databáze.", @@ -2690,5 +2667,146 @@ "merge-warning": "Pokud budete pokračovat, vybraná osoba bude odstraněna. Jméno vybrané osoby bude přidáno jako alias a všechny její role budou převedeny.", "alias-title": "Nové aliasy", "known-for-title": "Známý pro" + }, + "manage-reading-profiles": { + "extra-tip": "Přiřaďte profily čtení pomocí akčního menu v sériích a knihovnách nebo hromadně. Při změně nastavení v čtečce se vytvoří skrytý profil, který si pamatuje vaše volby pro danou sérii (ne pro soubory PDF). Tento profil se odstraní, když přiřadíte k sérii jeden ze svých vlastních profilů čtení. Více informací naleznete na stránce", + "reading-direction-tooltip": "Směr kliknutí pro přechod na další stránku. Zprava doleva znamená, že kliknete na levou stranu obrazovky, abyste přejeli na další stránku.", + "layout-mode-book-tooltip": "Jak by měl být obsah rozložen. Posouvání je stejné jako u knihy. 1 nebo 2 sloupce se přizpůsobí výšce zařízení a na každou stránku se vejde 1 nebo 2 sloupce textu", + "description": "Ne všechny vaše série lze číst stejným způsobem, proto nastavte pro každou knihovnu nebo sérii samostatné profily čtení, aby se vám co nejlépe dařilo navázat na předchozí díly série.", + "reading-direction-book-tooltip": "Směr kliknutí pro přechod na další stránku. Zprava doleva znamená, že kliknete na levou stranu obrazovky, abyste přejeli na další stránku.", + "font-family-tooltip": "Rodina písem, která se má načíst. Výchozí nastavení načte výchozí písmo knihy", + "pdf-theme-tooltip": "Barevné motivy čtečky", + "reading-profile-series-settings-title": "Série", + "reading-direction-book-label": "Směr čtení", + "margin-book-tooltip": "Jak velký odstup na každé straně obrazovky. Na mobilních zařízeních se tato hodnota bez ohledu na nastavení nastaví na 0.", + "allow-auto-webtoon-reader-tooltip": "Pokud stránky vypadají jako webtoon, přepněte do režimu Webtoon čtečky. Mohou se vyskytnout některé falešně pozitivní výsledky.", + "reset": "{{common.reset}}", + "tap-to-paginate-tooltip": "Měly by strany obrazovky čtečky knih umožňovat klepnutí pro přechod na předchozí/následující stránku", + "delete": "{{common.delete}}", + "profiles-title": "Vaše profily čtení", + "default-profile": "Výchozí", + "add": "{{common.add}}", + "add-tooltip": "Váš nový profil bude uložen po provedení změn", + "make-default": "Nastavit jako výchozí", + "no-selected": "Není vybrán žádný profil", + "confirm": "Opravdu chcete smazat profil čtení {{name}}?", + "selection-tip": "Vyberte profil ze seznamu nebo vytvořte nový v pravém horním rohu", + "image-reader-settings-title": "Čtečka obrázků", + "reading-direction-label": "Směr čtení", + "scaling-option-label": "Možnosti škálování", + "scaling-option-tooltip": "Jak přizpůsobit velikost obrázku vaší obrazovce.", + "page-splitting-label": "Rozdělení stránky", + "page-splitting-tooltip": "Jak rozdělit obrázek v plné šířce (tj. kombinace levého a pravého obrázku)", + "reading-mode-label": "Režim čtení", + "reading-mode-tooltip": "Změňte čtečku tak, aby stránkovala vertikálně, horizontálně nebo měla nekonečné posouvání", + "layout-mode-label": "Režim rozvržení", + "layout-mode-tooltip": "Zobrazit jeden obrázek na obrazovce nebo dva obrázky vedle sebe", + "background-color-label": "Barva pozadí", + "background-color-tooltip": "Barva pozadí čtečky obrázků", + "auto-close-menu-label": "Automatické zavření nabídky", + "auto-close-menu-tooltip": "Mělo by se menu automaticky zavřít", + "show-screen-hints-label": "Zobrazit nápovědu na obrazovce", + "show-screen-hints-tooltip": "Zobrazit překryvnou vrstvu, která pomůže pochopit oblast a směr stránkování", + "emulate-comic-book-label": "Napodobit komiks", + "emulate-comic-book-tooltip": "Použije stínový efekt, který napodobuje čtení z knihy", + "swipe-to-paginate-label": "Přejetím prstem přejděte na stránku", + "swipe-to-paginate-tooltip": "Má přejetí prstem po obrazovce vyvolat přechod na další nebo předchozí stránku", + "allow-auto-webtoon-reader-label": "Režim automatického čtení webtoonů", + "width-override-label": "{{manga-reader.width-override-label}}", + "width-override-tooltip": "Přepsat šířku obrázků v čtečce", + "book-reader-settings-title": "Čtečka knih", + "tap-to-paginate-label": "Klepnutím na stránku posouvat", + "immersive-mode-label": "Imersivní režim", + "immersive-mode-tooltip": "Tím se skryje nabídka za kliknutím na dokument čtečky a zapne se listování klepnutím", + "font-family-label": "Rodina písem", + "writing-style-label": "Styl psaní", + "writing-style-tooltip": "Změní směr textu. Horizontální směr je zleva doprava, vertikální směr je shora dolů.", + "layout-mode-book-label": "Režim rozvržení", + "color-theme-book-label": "Barevné téma", + "color-theme-book-tooltip": "Jaké barevné schéma použít pro obsah čtečky knih a nabídku", + "font-size-book-label": "Velikost písma", + "font-size-book-tooltip": "Procento zmenšení, které se použije na písmo v knize", + "line-height-book-label": "Řádkování", + "line-height-book-tooltip": "Jak velký je odstup mezi řádky v knize", + "margin-book-label": "Odsazení", + "pdf-reader-settings-title": "Čtečka PDF", + "pdf-scroll-mode-label": "Režim posouvání", + "pdf-scroll-mode-tooltip": "Jak procházíte stránky. Vertikálně/horizontálně a klepnutím na stránku (bez posouvání)", + "pdf-spread-mode-label": "Režim rozložení", + "pdf-spread-mode-tooltip": "Jak by měly být stránky rozvrženy. Jednoduché nebo dvojité (liché/sudé)", + "pdf-theme-label": "Motiv", + "reading-profile-library-settings-title": "Knihovna", + "wiki-title": "wiki", + "disable-width-override-label": "Zakázat přepsání šířky", + "disable-width-override-tooltip": "Zabraňte tomu, aby se přepsání šířky projevilo, pokud je vaše obrazovka alespoň v konfigurovaném bodě zlomu nebo menší" + }, + "bulk-set-reading-profile-modal": { + "title": "Nastavit profil čtení", + "close": "{{common.close}}", + "filter-label": "{{common.filter}}", + "clear": "{{common.clear}}", + "no-data": "Zatím nebyly vytvořeny žádné sbírky", + "loading": "{{common.loading}}", + "create": "{{common.create}}", + "bound": "Vázaný" + }, + "browse-people": { + "title": "Procházet Osoby", + "author-count": "{{num}} osob", + "issue-count": "{{common.issue-count}}", + "roles-label": "Role", + "sort-label": "Třídit", + "name-label": "Jméno", + "issue-count-label": "Počet vydání", + "series-count-label": "Počet sérií", + "cover-image-description": "{{edit-series-modal.cover-image-description}}", + "series-count": "{{common.series-count}}" + }, + "browse-genres": { + "title": "Procházet žánry", + "genre-count": "{{num}} žánrů", + "issue-count": "{{common.issue-count}}", + "series-count": "{{common.series-count}}" + }, + "browse-tags": { + "title": "Procházet štítky", + "genre-count": "{{num}} štítků", + "issue-count": "{{common.issue-count}}", + "series-count": "{{common.series-count}}" + }, + "browse-title-pipe": { + "publication-status": "{{value}} prací", + "age-rating": "Hodnoceno {{value}}", + "tag": "Má štítek {{value}}", + "translator": "Přeložil {{value}}", + "character": "Má postavu {{value}}", + "editor": "Úpravy provedl {{value}}", + "artist": "Nakreslil {{value}}", + "letterer": "Vepsal text {{value}}", + "inker": "Inkoustoval {{value}}", + "genre": "Má žánr {{value}}", + "library": "V rámci knihovny {{value}}", + "release-year": "Vydáno v roce {{value}}", + "imprint": "Otisk {{value}}", + "team": "Tým {{value}}", + "location": "V místě {{value}}", + "user-rating": "Hodnoceno {{value}} hvězdičkami", + "format": "Formát {{value}}", + "colorist": "Vybarvil {{value}}", + "publisher": "Vydáno {{value}}", + "writer": "Napsal {{value}}", + "penciller": "Nakreslil tužkou {{hodnota}}" + }, + "generic-filter-field-pipe": { + "person-name": "Jméno", + "person-series-count": "Počet sérií", + "person-role": "Role", + "person-chapter-count": "Počet kapitol" + }, + "breakpoint-pipe": { + "never": "Nikdy", + "mobile": "Mobilní", + "tablet": "Tablet", + "desktop": "Stolní počítač" } } diff --git a/UI/Web/src/assets/langs/de.json b/UI/Web/src/assets/langs/de.json index 376e33a7e..77663373a 100644 --- a/UI/Web/src/assets/langs/de.json +++ b/UI/Web/src/assets/langs/de.json @@ -72,7 +72,8 @@ "your-review": "Dies ist deine Rezension", "external-review": "Externe Rezension", "local-review": "Lokale Rezension", - "rating-percentage": "Bewertung {{r}}%" + "rating-percentage": "Bewertung {{r}}%", + "critic": "Kritiker" }, "want-to-read": { "title": "Favoriten", @@ -106,55 +107,6 @@ "collapse-series-relationships-tooltip": "Sollte Kavita Serien zeigen, die keine Verbindungen haben, oder ist das Elternteil/Prequel", "share-series-reviews-label": "Bewertungen von Serien teilen", "share-series-reviews-tooltip": "Soll Kavita deine Rezensionen zu Serien für andere Nutzer aufnehmen", - "image-reader-settings-title": "Bildleser", - "reading-direction-label": "Leserichtung", - "reading-direction-tooltip": "Richtung, in die geklicken werden müssen, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass man auf die linke Seite des Bildschirms klickt, um zur nächsten Seite zu gelangen.", - "scaling-option-label": "Skalierungsoptionen", - "scaling-option-tooltip": "So wird das Bild auf den Bildschirm skaliert.", - "page-splitting-label": "Seitenaufteilung", - "page-splitting-tooltip": "Wie wird ein Bild in voller Breite geteilt (d.h. linkes und rechtes Bild werden kombiniert)", - "reading-mode-label": "Lesemodus", - "reading-mode-tooltip": "Ändern Sie den Reader so, dass er vertikal oder horizontal paginiert oder einen unendlichen Bildlauf hat", - "layout-mode-label": "Layoutmodus", - "layout-mode-tooltip": "Rendert ein einzelnes Bild auf dem Bildschirm oder zwei nebeneinander liegende Bilder", - "background-color-label": "Hintergrundfarbe", - "background-color-tooltip": "Hintergrundfarbe des Bildlesers", - "auto-close-menu-label": "Menü Automatisch schließen", - "auto-close-menu-tooltip": "Soll sich das Menü automatisch schließen", - "show-screen-hints-label": "Bildschirmtipps anzeigen", - "show-screen-hints-tooltip": "Einblenden eines Overlays zum besseren Verständnis des Seitenbereichs und der Seitenausrichtung", - "emulate-comic-book-label": "Comicbuch nachbilden", - "emulate-comic-book-tooltip": "Wendet einen Schatteneffekt an, um das Lesen aus einem Buch zu simulieren", - "swipe-to-paginate-label": "Zum Umblättern wischen", - "swipe-to-paginate-tooltip": "Soll die nächste oder vorherige Seite durch Wischen über den Bildschirm aufgerufen werden", - "book-reader-settings-title": "Buch-Reader", - "tap-to-paginate-label": "Tippen zum Umblättern", - "tap-to-paginate-tooltip": "Sollten die Seiten des Buchlesebildschirms ein Antippen erlauben, um zur vorherigen/nächsten Seite zu gelangen", - "immersive-mode-label": "Immersiver Modus", - "immersive-mode-tooltip": "Das Menü wird nach einem Klick auf das Reader-Dokument ausgeblendet und das Tippen zum Umblättern eingeschaltet", - "reading-direction-book-label": "Leserichtung", - "reading-direction-book-tooltip": "Richtung, in die zu klicken ist, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass man auf die linke Seite des Bildschirms klickt, um zur nächsten Seite zu gelangen.", - "font-family-label": "Schriftart", - "font-family-tooltip": "Schriftart, die geladen werden soll. Standard lädt die Standardschriftart des Buches", - "writing-style-label": "Schreibstil", - "writing-style-tooltip": "Ändert die Richtung des Textes. Horizontal ist von links nach rechts, vertikal von oben nach unten.", - "layout-mode-book-label": "Layoutmodus", - "layout-mode-book-tooltip": "Wie soll der Inhalt aufgebaut sein. Scrollen ist so, wie das Buch es verpackt. 1- oder 2-spaltig entspricht der Höhe des Geräts und fasst 1 oder 2 Spalten Text pro Seite", - "color-theme-book-label": "Farbe Motiv", - "color-theme-book-tooltip": "Welches Farb Motiv soll für den Inhalt und das Menü des Buchlesers verwendet werden", - "font-size-book-label": "Schriftgröße", - "font-size-book-tooltip": "Prozentsatz der Skalierung, der auf die Schrift im Buch anzuwenden ist", - "line-height-book-label": "Zeilenabstände", - "line-height-book-tooltip": "Wie viel Abstand zwischen den Zeilen im Buch", - "margin-book-label": "Seitenrand", - "margin-book-tooltip": "Wie viel Abstand auf jeder Seite des Bildschirms. Auf mobilen Geräten wird dieser Wert unabhängig von dieser Einstellung auf 0 gesetzt.", - "pdf-reader-settings-title": "PDF Viewer", - "pdf-scroll-mode-label": "Scroll Modus", - "pdf-scroll-mode-tooltip": "So Scrollen sie durch Seiten. Vertikal/Horizontal und Tippen zum Paginieren (kein Scrollen)", - "pdf-spread-mode-label": "Ausbreitungs Modus", - "pdf-spread-mode-tooltip": "Wie sollten die Seiten angeordnet werden. Einzeln oder Doppelt (Gerade/Ungrade)", - "pdf-theme-label": "Thema", - "pdf-theme-tooltip": "Farbschema des Lesers", "clients-opds-alert": "OPDS ist auf diesem Server nicht aktiviert. Tachiyomi-Benutzer sind davon nicht betroffen.", "clients-opds-description": "Alle Clients von Drittanbietern verwenden entweder den API-Schlüssel oder die unten stehende Verbindungs-URL. Diese sind wie Passwörter, vertraulich zu behandeln.", "clients-api-key-tooltip": "Der API-Schlüssel ist wie ein Passwort. Wenn Sie ihn zurücksetzen, werden alle bestehenden Kunden ungültig.", @@ -167,9 +119,7 @@ "want-to-read-sync-label": "Willst du lesen synchronisieren", "kavitaplus-settings-title": "Kavita+", "want-to-read-sync-tooltip": "Erlaube Kavita, basierend auf AniList und MAL-Serien Elemente zu deiner „Want to Read“-Liste in „Pending readlist“ hinzuzufügen", - "anilist-scrobbling-tooltip": "Erlaube Kavita, ihren Lesefortschritt und ihre Bewertungen zu AniList zu scrobbeln (Einweg-Synchronisierung)", - "allow-auto-webtoon-reader-tooltip": "Wechsle in den Webtoon-Lesemodus, wenn die Seiten wie ein Webtoon aussehen. Es kann zu einer falschen Positivrate kommen.", - "allow-auto-webtoon-reader-label": "Automatischer Webtoon-Lesemodus" + "anilist-scrobbling-tooltip": "Erlaube Kavita, ihren Lesefortschritt und ihre Bewertungen zu AniList zu scrobbeln (Einweg-Synchronisierung)" }, "user-holds": { "title": "Scrobble pausiert", @@ -679,7 +629,10 @@ "incognito-mode-label": "Unsichtbarkeits Modus", "next": "Nächste", "previous": "Vorherige", - "go-to-page-prompt": "Es gibt {{totalPages}} Seiten. Auf welche Seite möchten sie gehen?" + "go-to-page-prompt": "Es gibt {{totalPages}} Seiten. Auf welche Seite möchten sie gehen?", + "go-to-first-page": "Zur ersten Seite gehen", + "go-to-section": "Zum Abschnitt gehen", + "go-to-section-prompt": "Es gibt {{totalSections}} Abschnitte. Zu welchem Abschnitt möchten Sie springen?" }, "personal-table-of-contents": { "no-data": "Noch nichts mit Lesezeichen versehen", @@ -727,7 +680,7 @@ "series-detail": { "page-settings-title": "Seiteneinstellungen", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "Karte", "layout-mode-option-list": "Liste", "continue-from": "Fortsetzen: {{title}}", @@ -849,7 +802,6 @@ "back": "Zurück", "more": "Mehr", "customize": "{{settings.customize}}", - "browse-authors": "Autoren durchsuchen", "edit": "{{common.edit}}", "cancel-edit": "Schließen Neu ordnen" }, @@ -914,10 +866,8 @@ }, "reader-settings": { "general-settings-title": "Allgemeine Einstellungen", - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", "reset-to-defaults": "Auf Standardwerte zurücksetzen", "reader-settings-title": "Reader-Einstellungen", "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", @@ -946,7 +896,15 @@ "theme-dark": "Dunkel", "theme-black": "Schwarz", "theme-white": "Weiß", - "theme-paper": "Papier" + "theme-paper": "Papier", + "line-spacing-max-label": "2.5x", + "create-new-tooltip": "Erstellen Sie aus Ihrem aktuellen impliziten Profil ein neues verwaltbares Profil", + "update-parent": "Unter {{name}} speichern", + "loading": "laden", + "create-new": "Neues Profil von impliziert", + "reading-profile-updated": "Leseprofil aktualisiert", + "reading-profile-promoted": "Leseprofil beworben", + "line-spacing-min-label": "1x" }, "table-of-contents": { "no-data": "Dieses Buch hat kein Inhaltsverzeichnis in den Metadaten oder eine toc-Datei" @@ -1387,7 +1345,8 @@ "admin-matched-metadata": "Passende Metadaten", "admin-manage-tokens": "Verwalte Benutzertoken", "scrobble-holds": "Scrobble-Holds", - "admin-metadata": "Verwalte Metadaten" + "admin-metadata": "Verwalte Metadaten", + "reading-profiles": "Leseprofile" }, "collection-detail": { "no-data": "Es sind keine Artikel vorhanden. Versuchen Sie, eine Serie hinzuzufügen.", @@ -1511,7 +1470,8 @@ "logout": "Abmelden", "all-filters": "Intelligente Filter", "nav-link-header": "Navigation Optionen", - "close": "{{common.close}}" + "close": "{{common.close}}", + "person-aka-status": "Entspricht einem Alias" }, "promoted-icon": { "promoted": "{{common.promoted}}" @@ -1622,7 +1582,6 @@ }, "manga-reader": { "back": "Zurück", - "save-globally": "Global speichern", "incognito-alt": "Der Inkognito-Modus ist eingeschaltet. Zum Ausschalten schalten Sie um.", "incognito-title": "Inkognito-Modus:", "shortcuts-menu-alt": "Tastaturkurzbefehle Modal", @@ -1644,9 +1603,7 @@ "height": "Höhe", "width": "Breite", "width-override-label": "Breite Override", - "off": "Aus", "original": "Original", - "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", "swipe-enabled-label": "Swipe aktiviert", "enable-comic-book-label": "Comicbuch nachahmen", "brightness-label": "Helligkeit", @@ -1657,9 +1614,9 @@ "layout-mode-switched": "Layoutmodus auf Einfach umgestellt, da nicht genügend Platz zum Rendern des Doppellayouts vorhanden ist", "no-next-chapter": "Kein nächstes Kapitel", "no-prev-chapter": "Kein vorheriges Kapitel", - "user-preferences-updated": "Benutzereinstellungen aktualisiert", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", - "series-progress": "Fortschritt der Serie: {{percentage}}" + "series-progress": "Fortschritt der Serie: {{percentage}}", + "reading-profile-updated": "Leseprofil aktualisiert", + "reading-profile-promoted": "Leseprofil beworben" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -1853,8 +1810,6 @@ "cover-image-tab": "{{tabs.cover-tab}}", "tasks-tab": "{{tabs.tasks-tab}}", "info-tab": "{{tabs.info-tab}}", - "pages-label": "{{edit-chapter-modal.pages-count}}", - "words-label": "{{edit-chapter-modal.length-title}}", "pages-count": "{{edit-chapter-modal.pages-count}}", "words-count": "{{edit-chapter-modal.words-count}}", "reading-time-label": "{{edit-chapter-modal.reading-time-label}}", @@ -2249,7 +2204,11 @@ "bulk-delete-libraries": "Möchten Sie wirklich {{count}} Bibliotheken löschen?", "match-success": "Reihenfolge korrekt zugeordnet", "webtoon-override": "Wechsel in den Webtoon-Modus, da die Bilder einen Webtoon darstellen.", - "scrobble-gen-init": "Hat einen Auftrag in die Warteschlange gestellt, um Scrobble-Ereignisse aus dem bisherigen Leseverlauf und Bewertungen zu generieren und diese mit verbundenen Diensten zu synchronisieren." + "scrobble-gen-init": "Hat einen Auftrag in die Warteschlange gestellt, um Scrobble-Ereignisse aus dem bisherigen Leseverlauf und Bewertungen zu generieren und diese mit verbundenen Diensten zu synchronisieren.", + "confirm-delete-multiple-volumes": "Sind sie sicher, dass Sie {{count}} Bände löschen wollen? Die Dateien auf der Festplatte werden dadurch nicht verändert.", + "series-bound-to-reading-profile": "Serie gebunden an Leseprofil {{name}}", + "library-bound-to-reading-profile": "Bibliothek, verknüpft mit Leseprofil {{name}}", + "series-added-want-to-read": "Serie aus der Liste „Möchte lesen“ hinzugefügt" }, "read-time-pipe": { "less-than-hour": "<1 Stunde", @@ -2324,7 +2283,14 @@ "match-tooltip": "Spielserie mit Kavita+ manuell abgleichen", "reorder": "Nachbestellung", "rename": "Umbenennen", - "rename-tooltip": "Smart Filter umbenennen" + "rename-tooltip": "Smart Filter umbenennen", + "reading-profiles": "Leseprofile", + "set-reading-profile": "Leseprofil festlegen", + "set-reading-profile-tooltip": "Ein Leseprofil mit dieser Bibliothek verknüpfen", + "clear-reading-profile": "Leseprofil löschen", + "clear-reading-profile-tooltip": "Leseprofil für diese Bibliothek löschen", + "cleared-profile": "Lese-Profil gelöscht", + "merge": "Zusammenführen" }, "preferences": { "left-to-right": "Links nach rechts", @@ -2450,7 +2416,8 @@ "confirm": "Bestätigen", "info": "Info", "ok": "Ok", - "cancel": "{{common.cancel}}" + "cancel": "{{common.cancel}}", + "prompt": "Frage" }, "person-detail": { "all-roles": "Funktionen", @@ -2458,12 +2425,9 @@ "individual-role-title": "Als eine {{role}}", "browse-person-title": "Alle Werke von {{name}}", "browse-person-by-role-title": "Alle Werke von {{name}} als {{role}}", - "anilist-url": "{{edit-person-modal.anilist-tooltip}}" - }, - "browse-authors": { - "author-count": "{{num}} Personen", - "title": "Autoren & Schriftsteller durchsuchen", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" + "anilist-url": "{{edit-person-modal.anilist-tooltip}}", + "aka-title": "Auch bekannt als ", + "no-info": "Keine Informationen zu dieser Person" }, "edit-person-modal": { "title": "Details zu {{personName}}", @@ -2486,7 +2450,11 @@ "name-label": "{{edit-series-modal.name-label}}", "required-field": "{{validations.required-field}}", "cover-image-description": "{{edit-series-modal.cover-image-description}}", - "save": "{{common.save}}" + "save": "{{common.save}}", + "aliases-tooltip": "Wenn eine Serie mit einem Alias einer Person versehen ist, wird diese Person zugewiesen, anstatt eine neue Person anzulegen. Wenn Sie einen Alias löschen, müssen Sie die Serie erneut scannen, damit die Änderung übernommen wird.", + "aliases-tab": "Aliases", + "aliases-label": "Aliase bearbeiten", + "alias-overlap": "Dieser Alias verweist bereits auf eine andere Person oder ist der Name dieser Person. Bitte erwäge, sie zusammenzuführen." }, "changelog-update-item": { "download": "Download", @@ -2511,7 +2479,7 @@ }, "match-series-modal": { "description": "Wähle einen Treffer aus, um die Metadaten von Kavita+ neu zu verknüpfen und Scrobble-Ereignisse neu zu generieren. „Nicht übereinstimmend“ kann verwendet werden, um Kavita daran zu hindern, Metadaten abzugleichen und zu scrobbeln.", - "query-tooltip": "Gib den Namen der Serie ein, AniList/MyAnimeList-URL. URLs werden direkt aufgerufen.", + "query-tooltip": "Geben Sie den Seriennamen und die URL von AniList/MyAnimeList/ComicBookRoundup ein. Die URLs werden direkt nachgeschlagen.", "no-results": "Es wurde keine Übereinstimmung gefunden. Versuche, die URL eines unterstützten Anbieters hinzuzufügen und versuche es erneut.", "query-label": "Abfrage", "dont-match-label": "Keine Übereinstimmung", @@ -2610,7 +2578,16 @@ "enable-cover-image-tooltip": "Erlaubt Kavita, das Titelbild für die Serie zu schreiben", "enable-cover-image-label": "Cover Bild", "overrides-label": "Überschreibungen", - "overrides-description": "Erlaube Kavita, gesperrte Felder zu überschreiben." + "overrides-description": "Erlaube Kavita, gesperrte Felder zu überschreiben.", + "enable-chapter-release-date-tooltip": "Veröffentlichungsdatum des Kapitels/der Ausgabe darf angegeben werden", + "enable-chapter-publisher-label": "Publisher", + "enable-chapter-release-date-label": "Veröffentlichungsdatum", + "enable-chapter-title-label": "Titel", + "enable-chapter-title-tooltip": "Titel des Kapitels/der Ausgabe darf geschrieben werden", + "chapter-header": "Kapitel Felder", + "enable-chapter-publisher-tooltip": "Zulassen, dass der Herausgeber des Kapitels/der Ausgabe geschrieben wird", + "enable-chapter-cover-label": "Kapitel-Cover", + "enable-chapter-cover-tooltip": "Cover von Kapitel/Ausgabe festlegen" }, "metadata-setting-field-pipe": { "covers": "Covers", @@ -2621,7 +2598,12 @@ "summary": "{{filter-field-pipe.summary}}", "publication-status": "{{edit-series-modal.publication-status-title}}", "tags": "{{metadata-fields.tags-title}}", - "localized-name": "{{edit-series-modal.localized-name-label}}" + "localized-name": "{{edit-series-modal.localized-name-label}}", + "chapter-release-date": "Veröffentlichungsdatum (Kapitel)", + "chapter-summary": "Zusammenfassung (Kapitel)", + "chapter-covers": "Covers (Kapitel)", + "chapter-title": "Titel (Kapitel)", + "chapter-publisher": "{{person-role-pipe.publisher}} (Kapitel)" }, "role-localized-pipe": { "bookmark": "Lesezeichen", @@ -2639,5 +2621,90 @@ "critical": "Kritisch", "information": "Information", "warning": "Warnung" + }, + "reviews": { + "user-reviews-local": "Lokale Bewertungen", + "user-reviews-plus": "Externe Rezension" + }, + "review-modal": { + "review-label": "Rezension", + "title": "Rezension Bearbeiten", + "min-length": "Die Rezension muss mindestens {{count}} Zeichen lang sein" + }, + "manage-reading-profiles": { + "description": "Nicht alle Ihre Serien können auf dieselbe Weise gelesen werden. Richten Sie daher für jede Bibliothek oder Serie separate Leseprofile ein, damit Sie so nahtlos wie möglich zu Ihrer Serie zurückkehren können.", + "extra-tip": "Weisen Sie Leseprofile über das Aktionsmenü in Serien und Bibliotheken oder in großen Mengen zu. Wenn Sie die Einstellungen in einem Reader ändern, wird ein verstecktes Profil erstellt, das Ihre Auswahl für diese Serie speichert (nicht für PDFs). Dieses Profil wird entfernt, wenn Sie der Serie eines Ihrer eigenen Leseprofile zuweisen oder aktualisieren.", + "tap-to-paginate-tooltip": "Sollten die Seiten des E-Book-Reader-Bildschirms durch Antippen umblätterbar sein vorherige/nächste Seite", + "show-screen-hints-tooltip": "Zeige eine Überlagerung an, um den Bereich und die Richtung der Paginierung besser zu verstehen", + "font-size-book-tooltip": "Prozentuale Skalierung für die Schriftart im Buch", + "pdf-reader-settings-title": "PDF Reader", + "line-height-book-label": "Zeilenabstand", + "layout-mode-book-tooltip": "Wie Inhalte angeordnet werden sollen. Der Bildlauf entspricht dem Aufbau des Buches. 1 oder 2 Spalten passen zur Höhe des Geräts und es passen 1 oder 2 Spalten Text pro Seite", + "profiles-title": "Ihre Leseprofil", + "default-profile": "Standard", + "add-tooltip": "Ihr neues Profil wird nach der Änderung gespeichert", + "make-default": "Als Standard festlegen", + "no-selected": "Kein Profil ausgewählt", + "confirm": "Möchten Sie das Leseprofil {{name}} wirklich löschen?", + "selection-tip": "Wählen Sie ein Profil aus der Liste aus oder erstellen Sie oben rechts ein neues Profil", + "image-reader-settings-title": "Bild Reader", + "reading-direction-label": "Leserichtung", + "reading-direction-tooltip": "Klicken Sie hier, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass Sie auf die linke Seite des Bildschirms klicken, um zur nächsten Seite zu gelangen.", + "scaling-option-label": "Skalierungsoptionen", + "scaling-option-tooltip": "So skalieren Sie das Bild an Ihren Bildschirm.", + "page-splitting-label": "Seitenaufteilung", + "page-splitting-tooltip": "So teilen Sie ein Bild in voller Breite (d. h. beide Bilder, links und rechts, werden kombiniert)", + "reading-mode-label": "Lesemodus", + "reading-mode-tooltip": "Ändern Sie den Reader, um vertikal, horizontal oder unbegrenzt zu scrollen", + "layout-mode-label": "Layout-Modus", + "layout-mode-tooltip": "Ein einzelnes Bild auf dem Bildschirm oder zwei Bilder nebeneinander rendern", + "background-color-label": "Hintergrundfarbe", + "background-color-tooltip": "Hintergrundfarbe des Bildlesers", + "auto-close-menu-label": "Menü automatisch schließen", + "auto-close-menu-tooltip": "Soll das Menü automatisch schließen", + "show-screen-hints-label": "Bildschirmhinweise anzeigen", + "emulate-comic-book-label": "Comicbuch nachahmen", + "emulate-comic-book-tooltip": "Wendet einen Schatteneffekt an, um das Lesen aus einem Buch zu imitieren", + "swipe-to-paginate-label": "Zum Blättern wischen", + "swipe-to-paginate-tooltip": "Soll durch Wischen auf dem Bildschirm die nächste oder vorherige Seite aufgerufen werden", + "allow-auto-webtoon-reader-label": "Automatischer Webtoon-Lesemodus", + "allow-auto-webtoon-reader-tooltip": "Wechseln Sie in den Webtoon-Reader-Modus, wenn die Seiten wie ein Webtoon aussehen. Es können einige Fehlalarme auftreten.", + "width-override-tooltip": "Breite von Bildern im Reader überschreiben", + "book-reader-settings-title": "Buch Reader", + "tap-to-paginate-label": "Zum Blättern antippen", + "immersive-mode-label": "Immersiver Modus", + "reading-direction-book-label": "Leserichtung", + "reading-direction-book-tooltip": "Klicken Sie hier, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass Sie auf die linke Seite des Bildschirms klicken, um zur nächsten Seite zu gelangen.", + "immersive-mode-tooltip": "Dadurch wird das Menü hinter einem Klick auf das Lesedokument ausgeblendet und die Seitenumblätterung per Fingertipp aktiviert.", + "font-family-label": "Schriftfamilie", + "font-family-tooltip": "Zu ladende Schriftfamilie. Standardmäßig wird die Standardschriftart des Buches geladen", + "writing-style-label": "Schreibstil", + "writing-style-tooltip": "Ändert die Ausrichtung des Textes. Horizontal bedeutet von links nach rechts, vertikal bedeutet von oben nach unten.", + "layout-mode-book-label": "Layout-Modus", + "color-theme-book-label": "Farbschema", + "color-theme-book-tooltip": "Welches Farbschema soll für den Inhalt und das Menü des Buchlesers verwendet werden", + "font-size-book-label": "Schriftgröße", + "line-height-book-tooltip": "Wie viel Abstand zwischen den Zeilen des Buches", + "margin-book-label": "Rand", + "margin-book-tooltip": "Wie viel Abstand soll auf jeder Seite des Bildschirms sein? Diese Einstellung wird auf Mobilgeräten unabhängig von dieser Einstellung auf 0 gesetzt.", + "pdf-scroll-mode-label": "Scroll-Modus", + "pdf-scroll-mode-tooltip": "Wie Sie durch die Seiten scrollen. Vertikal/horizontal und durch Antippen blättern (kein Scrollen)", + "pdf-spread-mode-label": "Verteilungsmodus", + "pdf-spread-mode-tooltip": "Wie Seiten angelegt werden sollen. Einfach oder doppelt (ungerade/gerade)", + "pdf-theme-label": "Theme", + "pdf-theme-tooltip": "Farbschema des Readers", + "reading-profile-series-settings-title": "Serie", + "reading-profile-library-settings-title": "Bibliothek" + }, + "bulk-set-reading-profile-modal": { + "no-data": "Es wurden noch keine Sammlungen erstellt", + "bound": "Gebunden", + "title": "Leseprofil festlegen" + }, + "merge-person-modal": { + "alias-title": "Neue Aliase", + "known-for-title": "Bekannt für", + "src": "Person zusammenführen", + "merge-warning": "Wenn Sie fortfahren, wird die ausgewählte Person entfernt. Der Name der ausgewählten Person wird als Alias hinzugefügt und alle ihre Rollen werden übertragen." } } diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 19d4443b6..2a2d40c4f 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -106,7 +106,7 @@ "user-preferences": { "title": "User Dashboard", - "pref-description": "These are global settings that are bound to your account.", + "pref-description": "These are global settings that are bound to your account. Reader settings are located in Reading Profiles.", "account-tab": "{{tabs.account-tab}}", "preferences-tab": "{{tabs.preferences-tab}}", @@ -140,60 +140,6 @@ "want-to-read-sync-label": "Want To Read Sync", "want-to-read-sync-tooltip": "Allow Kavita to add items to your Want to Read list based on AniList and MAL series in Pending readlist", - "image-reader-settings-title": "Image Reader", - "reading-direction-label": "Reading Direction", - "reading-direction-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.", - "scaling-option-label": "Scaling Options", - "scaling-option-tooltip": "How to scale the image to your screen.", - "page-splitting-label": "Page Splitting", - "page-splitting-tooltip": "How to split a full width image (ie both left and right images are combined)", - "reading-mode-label": "Reading Mode", - "reading-mode-tooltip": "Change reader to paginate vertically, horizontally, or have an infinite scroll", - "layout-mode-label": "Layout Mode", - "layout-mode-tooltip": "Render a single image to the screen or two side-by-side images", - "background-color-label": "Background Color", - "background-color-tooltip": "Background Color of Image Reader", - "auto-close-menu-label": "Auto Close Menu", - "auto-close-menu-tooltip": "Should menu auto close", - "show-screen-hints-label": "Show Screen Hints", - "show-screen-hints-tooltip": "Show an overlay to help understand pagination area and direction", - "emulate-comic-book-label": "Emulate comic book", - "emulate-comic-book-tooltip": "Applies a shadow effect to emulate reading from a book", - "swipe-to-paginate-label": "Swipe to Paginate", - "swipe-to-paginate-tooltip": "Should swiping on the screen cause the next or previous page to be triggered", - "allow-auto-webtoon-reader-label": "Automatic Webtoon Reader Mode", - "allow-auto-webtoon-reader-tooltip": "Switch into Webtoon Reader mode if pages look like a webtoon. Some false positives may occur.", - - "book-reader-settings-title": "Book Reader", - "tap-to-paginate-label": "Tap to Paginate", - "tap-to-paginate-tooltip": "Should the sides of the book reader screen allow tapping on it to move to prev/next page", - "immersive-mode-label": "Immersive Mode", - "immersive-mode-tooltip": "This will hide the menu behind a click on the reader document and turn tap to paginate on", - "reading-direction-book-label": "Reading Direction", - "reading-direction-book-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.", - "font-family-label": "Font Family", - "font-family-tooltip": "Font family to load up. Default will load the book's default font", - "writing-style-label": "Writing Style", - "writing-style-tooltip": "Changes the direction of the text. Horizontal is left to right, vertical is top to bottom.", - "layout-mode-book-label": "Layout Mode", - "layout-mode-book-tooltip": "How content should be laid out. Scroll is as the book packs it. 1 or 2 Column fits to the height of the device and fits 1 or 2 columns of text per page", - "color-theme-book-label": "Color Theme", - "color-theme-book-tooltip": "What color theme to apply to the book reader content and menu", - "font-size-book-label": "Font Size", - "font-size-book-tooltip": "Percent of scaling to apply to font in the book", - "line-height-book-label": "Line Spacing", - "line-height-book-tooltip": "How much spacing between the lines of the book", - "margin-book-label": "Margin", - "margin-book-tooltip": "How much spacing on each side of the screen. This will override to 0 on mobile devices regardless of this setting.", - - "pdf-reader-settings-title": "PDF Reader", - "pdf-scroll-mode-label": "Scroll Mode", - "pdf-scroll-mode-tooltip": "How you scroll through pages. Vertical/Horizontal and Tap to Paginate (no scroll)", - "pdf-spread-mode-label": "Spread Mode", - "pdf-spread-mode-tooltip": "How pages should be laid out. Single or double (odd/even)", - "pdf-theme-label": "Theme", - "pdf-theme-tooltip": "Color theme of the reader", - "clients-opds-alert": "OPDS is not enabled on this server. This will not affect Tachiyomi users.", "clients-opds-description": "All 3rd Party clients will either use the API key or the Connection Url below. These are like passwords, keep it private.", "clients-api-key-tooltip": "The API key is like a password. Resetting it will invalidate any existing clients.", @@ -773,6 +719,8 @@ "library-name-header": "Library", "valid-until-header": "Next Refresh", "actions-header": "Actions", + "library-type": "Library Type", + "matched-state-label": "Match State", "matched-status-label": "Matched", "unmatched-status-label": "Not Matched", "blacklist-status-label": "Needs Manual Match", @@ -861,7 +809,7 @@ "page-label": "Page", "pagination-header": "Section", - "go-to-page": "Go to page", + "go-to-first-page": "Go to first page", "go-to-last-page": "Go to last page", "prev-page": "Prev Page", "next-page": "Next Page", @@ -882,7 +830,12 @@ "incognito-mode-label": "Incognito Mode", "next": "Next", "previous": "Previous", - "go-to-page-prompt": "There are {{totalPages}} pages. What page do you want to go to?" + + "go-to-page": "Go to page", + "go-to-page-prompt": "There are {{totalPages}} pages. What page do you want to go to?", + + "go-to-section": "Go to section", + "go-to-section-prompt": "There are {{totalSections}} sections. What section do you want to go to?" }, "personal-table-of-contents": { @@ -936,7 +889,7 @@ "series-detail": { "page-settings-title": "Page Settings", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "Card", "layout-mode-option-list": "List", "continue-from": "Continue {{title}}", @@ -1083,7 +1036,7 @@ "collections": "Collections", "reading-lists": "Reading Lists", "bookmarks": "Bookmarks", - "browse-authors": "Browse Authors", + "browse-people": "Browse People", "filter-label": "{{common.filter}}", "all-series": "All Series", "clear": "{{common.clear}}", @@ -1096,10 +1049,31 @@ "edit": "{{common.edit}}" }, - "browse-authors": { - "title": "Browse Authors & Writers", + "browse-people": { + "title": "Browse People", "author-count": "{{num}} People", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" + "cover-image-description": "{{edit-series-modal.cover-image-description}}", + "issue-count": "{{common.issue-count}}", + "series-count": "{{common.series-count}}", + "roles-label": "Roles", + "sort-label": "Sort", + "name-label": "Name", + "issue-count-label": "Issue Count", + "series-count-label": "Series Count" + }, + + "browse-genres": { + "title": "Browse Genres", + "genre-count": "{{num}} Genres", + "issue-count": "{{common.issue-count}}", + "series-count": "{{common.series-count}}" + }, + + "browse-tags": { + "title": "Browse Tags", + "genre-count": "{{num}} Tags", + "issue-count": "{{common.issue-count}}", + "series-count": "{{common.series-count}}" }, "person-detail": { @@ -1176,36 +1150,45 @@ "reader-settings": { "general-settings-title": "General Settings", - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", + "font-family-label": "{{manage-reading-profiles.font-family-label}}", + "font-size-label": "{{manage-reading-profiles.font-size-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", "reset-to-defaults": "Reset to Defaults", + "update-parent": "Save to {{name}}", + "loading": "loading", + "create-new": "New profile from implicit", + "create-new-tooltip": "Create a new manageable profile from your current implicit one", + "reading-profile-updated": "Reading profile updated", + "reading-profile-promoted": "Reading profile promoted", "reader-settings-title": "Reader Settings", - "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", + "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}", "right-to-left": "Right to Left", "left-to-right": "Left to Right", "horizontal": "Horizontal", "vertical": "Vertical", - "writing-style-label": "{{user-preferences.writing-style-label}}", + "writing-style-label": "{{manage-reading-profiles.writing-style-label}}", "writing-style-tooltip": "Changes the direction of the text. Horizontal is left to right, vertical is top to bottom.", "tap-to-paginate-label": "Tap Pagination", "tap-to-paginate-tooltip": "Click the edges of the screen to paginate", "on": "On", "off": "Off", - "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", + "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}", "immersive-mode-tooltip": "This will hide the menu behind a click on the reader document and turn tap to paginate on", "fullscreen-label": "Fullscreen", "fullscreen-tooltip": "Put reader in fullscreen mode", "exit": "Exit", "enter": "Enter", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-tooltip": "Scroll: Mirrors epub file (usually one long scrolling page per chapter).
    1 Column: Creates a single virtual page at a time.
    2 Column: Creates two virtual pages at a time laid out side-by-side.", "layout-mode-option-scroll": "Scroll", "layout-mode-option-1col": "1 Column", "layout-mode-option-2col": "2 Column", "color-theme-title": "Color Theme", + "line-spacing-min-label": "1x", + "line-spacing-max-label": "2.5x", + "theme-dark": "Dark", "theme-black": "Black", "theme-white": "White", @@ -1319,6 +1302,17 @@ "create": "{{common.create}}" }, + "bulk-set-reading-profile-modal": { + "title": "Set Reading profile", + "close": "{{common.close}}", + "filter-label": "{{common.filter}}", + "clear": "{{common.clear}}", + "no-data": "No collections created yet", + "loading": "{{common.loading}}", + "create": "{{common.create}}", + "bound": "Bound" + }, + "entity-title": { "special": "Special", "issue-num": "{{common.issue-hash-num}}", @@ -1715,6 +1709,7 @@ "scrobble-holds": "Scrobble Holds", "account": "Account", "preferences": "Preferences", + "reading-profiles": "Reading Profiles", "clients": "API Key / OPDS", "devices": "Devices", "user-stats": "Stats", @@ -1860,7 +1855,9 @@ "all-filters": "Smart Filters", "nav-link-header": "Navigation Options", "close": "{{common.close}}", - "person-aka-status": "Matches an alias" + "person-aka-status": "Matches an alias", + "browse-genres": "Browse Genres", + "browse-tags": "Browse Tags" }, "promoted-icon": { @@ -1985,7 +1982,10 @@ "manga-reader": { "back": "Back", - "save-globally": "Save Globally", + "update-parent": "{{reader-settings.update-parent}}", + "loading": "{{reader-settings.loading}}", + "create-new": "{{reader-settings.create-new}}", + "create-new-tooltip": "{{reader-settings.create-new-tooltip}}", "incognito-alt": "Incognito mode is on. Toggle to turn off.", "incognito-title": "Incognito Mode:", "shortcuts-menu-alt": "Keyboard Shortcuts Modal", @@ -2007,9 +2007,9 @@ "height": "Height", "width": "Width", "width-override-label": "Width Override", - "off": "Off", + "off": "{{reader-settings.off}}", "original": "Original", - "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", + "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}", "swipe-enabled-label": "Swipe Enabled", "enable-comic-book-label": "Emulate comic book", "brightness-label": "Brightness", @@ -2021,8 +2021,9 @@ "layout-mode-switched": "Layout mode switched to Single due to insufficient space to render double layout", "no-next-chapter": "No Next Chapter", "no-prev-chapter": "No Previous Chapter", - "user-preferences-updated": "User preferences updated", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", + "reading-profile-updated": "Reading profile updated", + "reading-profile-promoted": "Reading profile promoted", + "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}", "series-progress": "Series Progress: {{percentage}}" }, @@ -2084,7 +2085,10 @@ "release-year": "Release Year", "read-progress": "Last Read", "average-rating": "Average Rating", - "random": "Random" + "random": "Random", + "person-name": "Name", + "person-series-count": "Series Count", + "person-chapter-count": "Chapter Count" }, "edit-series-modal": { @@ -2229,8 +2233,8 @@ "tasks-tab": "{{tabs.tasks-tab}}", "info-tab": "{{tabs.info-tab}}", - "pages-label": "{{edit-chapter-modal.pages-count}}", - "words-label": "{{edit-chapter-modal.length-title}}", + "pages-label": "{{edit-chapter-modal.pages-label}}", + "words-label": "{{edit-chapter-modal.words-label}}", "pages-count": "{{edit-chapter-modal.pages-count}}", "words-count": "{{edit-chapter-modal.words-count}}", "reading-time-label": "{{edit-chapter-modal.reading-time-label}}", @@ -2507,7 +2511,7 @@ "reading-lists": "{{side-nav.reading-lists}}", "bookmarks": "{{side-nav.bookmarks}}", "all-series": "{{side-nav.all-series}}", - "browse-authors": "{{side-nav.browse-authors}}" + "browse-authors": "{{side-nav.browse-people}}" }, "filter-field-pipe": { @@ -2579,9 +2583,42 @@ "confirm": "Confirm", "info": "Info", "cancel": "{{common.cancel}}", - "ok": "Ok" + "ok": "Ok", + "prompt": "Question" }, + "browse-title-pipe": { + "publication-status": "{{value}} works", + "age-rating": "Rated {{value}}", + "user-rating": "{{value}} star rating", + "tag": "Has Tag {{value}}", + "translator": "Translated by {{value}}", + "character": "Has character {{value}}", + "publisher": "Published by {{value}}", + "editor": "Edited by {{value}}", + "artist": "Drawn by {{value}}", + "letterer": "Lettered by {{value}}", + "colorist": "Colored by {{value}}", + "inker": "Inked by {{value}}", + "penciller": "Pencilled by {{value}}", + "writer": "Written by {{value}}", + "genre": "Has Genre {{value}}", + "library": "Within {{value}} library", + "format": "Format of {{value}}", + "release-year": "Released in {{value}}", + "imprint": "Imprint of {{value}}", + "team": "Team {{value}}", + "location": "In {{value}} location" + }, + + "generic-filter-field-pipe": { + "person-role": "Role", + "person-name": "Name", + "person-series-count": "Series Count", + "person-chapter-count": "Chapter Count" + }, + + "toasts": { "regen-cover": "A job has been enqueued to regenerate the cover image", "no-pages": "There are no pages. Kavita was not able to read this archive.", @@ -2702,7 +2739,9 @@ "bulk-delete-libraries": "Are you sure you want to delete {{count}} libraries?", "match-success": "Series matched correctly", "webtoon-override": "Switching to Webtoon mode due to images representing a webtoon.", - "scrobble-gen-init": "Enqueued a job to generate scrobble events from past reading history and ratings, syncing them with connected services." + "scrobble-gen-init": "Enqueued a job to generate scrobble events from past reading history and ratings, syncing them with connected services.", + "series-bound-to-reading-profile": "Series bound to Reading Profile {{name}}", + "library-bound-to-reading-profile": "Library bound to Reading Profile {{name}}" }, "read-time-pipe": { @@ -2756,6 +2795,13 @@ "remove-from-on-deck": "Remove From On Deck", "remove-from-on-deck-tooltip": "Remove series from showing from On Deck", + "reading-profiles": "Reading Profiles", + "set-reading-profile": "Set Reading Profile", + "set-reading-profile-tooltip": "Bind a Reading Profile to this Library", + "clear-reading-profile": "Clear Reading Profile", + "clear-reading-profile-tooltip": "Clear Reading Profile for this Library", + "cleared-profile": "Cleared Reading Profile", + "others": "Others", "add-to-reading-list": "Add to Reading List", "add-to-reading-list-tooltip": "Add to a Reading List", @@ -2836,6 +2882,89 @@ "pdf-light": "Light", "pdf-dark": "Dark" }, + "breakpoint-pipe": { + "never": "Never", + "mobile": "Mobile", + "tablet": "Tablet", + "desktop": "Desktop" + }, + + "manage-reading-profiles": { + "description": "Not all your series may be read in the same way, set up distinct reading profiles per library or series to make getting back in your series as seamless as possible.", + "extra-tip": "Assign reading profiles via the action menu on series and libraries, or in bulk. When changing settings in a reader, a hidden profile is created that remembers your choices for that series (not for pdfs). This profile is removed when you assign one of your own reading profiles to the series. More information can be found on the", + "wiki-title": "wiki", + "profiles-title": "Your reading profiles", + "default-profile": "Default", + "add": "{{common.add}}", + "add-tooltip": "Your new profile will be saved after making a change to it", + "make-default": "Set as default", + "no-selected": "No profile selected", + "confirm": "Are you sure you want to delete the reading profile {{name}}?", + "selection-tip": "Select a profile from the list, or create a new one at the top right", + + "image-reader-settings-title": "Image Reader", + "reading-direction-label": "Reading Direction", + "reading-direction-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.", + "scaling-option-label": "Scaling Options", + "scaling-option-tooltip": "How to scale the image to your screen.", + "page-splitting-label": "Page Splitting", + "page-splitting-tooltip": "How to split a full width image (ie both left and right images are combined)", + "reading-mode-label": "Reading Mode", + "reading-mode-tooltip": "Change reader to paginate vertically, horizontally, or have an infinite scroll", + "layout-mode-label": "Layout Mode", + "layout-mode-tooltip": "Render a single image to the screen or two side-by-side images", + "background-color-label": "Background Color", + "background-color-tooltip": "Background Color of Image Reader", + "auto-close-menu-label": "Auto Close Menu", + "auto-close-menu-tooltip": "Should menu auto close", + "show-screen-hints-label": "Show Screen Hints", + "show-screen-hints-tooltip": "Show an overlay to help understand pagination area and direction", + "emulate-comic-book-label": "Emulate comic book", + "emulate-comic-book-tooltip": "Applies a shadow effect to emulate reading from a book", + "swipe-to-paginate-label": "Swipe to Paginate", + "swipe-to-paginate-tooltip": "Should swiping on the screen cause the next or previous page to be triggered", + "allow-auto-webtoon-reader-label": "Automatic Webtoon Reader Mode", + "allow-auto-webtoon-reader-tooltip": "Switch into Webtoon Reader mode if pages look like a webtoon. Some false positives may occur.", + "width-override-label": "{{manga-reader.width-override-label}}", + "width-override-tooltip": "Override width of images in the reader", + "disable-width-override-label": "Disable width override", + "disable-width-override-tooltip": "Prevent the width override from taking effect when your screen is at least the configured breakpoint or smaller", + "reset": "{{common.reset}}", + + "book-reader-settings-title": "Book Reader", + "tap-to-paginate-label": "Tap to Paginate", + "tap-to-paginate-tooltip": "Should the sides of the book reader screen allow tapping on it to move to prev/next page", + "immersive-mode-label": "Immersive Mode", + "immersive-mode-tooltip": "This will hide the menu behind a click on the reader document and turn tap to paginate on", + "reading-direction-book-label": "Reading Direction", + "reading-direction-book-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.", + "font-family-label": "Font Family", + "font-family-tooltip": "Font family to load up. Default will load the book's default font", + "writing-style-label": "Writing Style", + "writing-style-tooltip": "Changes the direction of the text. Horizontal is left to right, vertical is top to bottom.", + "layout-mode-book-label": "Layout Mode", + "layout-mode-book-tooltip": "How content should be laid out. Scroll is as the book packs it. 1 or 2 Column fits to the height of the device and fits 1 or 2 columns of text per page", + "color-theme-book-label": "Color Theme", + "color-theme-book-tooltip": "What color theme to apply to the book reader content and menu", + "font-size-book-label": "Font Size", + "font-size-book-tooltip": "Percent of scaling to apply to font in the book", + "line-height-book-label": "Line Spacing", + "line-height-book-tooltip": "How much spacing between the lines of the book", + "margin-book-label": "Margin", + "margin-book-tooltip": "How much spacing on each side of the screen. This will override to 0 on mobile devices regardless of this setting.", + + "pdf-reader-settings-title": "PDF Reader", + "pdf-scroll-mode-label": "Scroll Mode", + "pdf-scroll-mode-tooltip": "How you scroll through pages. Vertical/Horizontal and Tap to Paginate (no scroll)", + "pdf-spread-mode-label": "Spread Mode", + "pdf-spread-mode-tooltip": "How pages should be laid out. Single or double (odd/even)", + "pdf-theme-label": "Theme", + "pdf-theme-tooltip": "Color theme of the reader", + + "reading-profile-series-settings-title": "Series", + "reading-profile-library-settings-title": "Library", + "delete": "{{common.delete}}" + }, "validation": { @@ -2911,6 +3040,7 @@ "author-count": "{{num}} Authors", "item-count": "{{num}} Items", "chapter-count": "{{num}} Chapters", + "issue-count": "{{num}} Issues", "no-data": "No Data", "book-num": "Book", diff --git a/UI/Web/src/assets/langs/es.json b/UI/Web/src/assets/langs/es.json index d9f5ca04f..2360de136 100644 --- a/UI/Web/src/assets/langs/es.json +++ b/UI/Web/src/assets/langs/es.json @@ -106,55 +106,6 @@ "collapse-series-relationships-tooltip": "Kavita debería mostrar series que no tienen relaciones o es la serie madre/secuela", "share-series-reviews-label": "Compartir reseñas de series", "share-series-reviews-tooltip": "Kavita debería incluir tus reseñas de series para otros usuarios", - "image-reader-settings-title": "Lector de imágenes", - "reading-direction-label": "Dirección de lectura", - "reading-direction-tooltip": "Dirección para hacer clic para pasar a la siguiente página. De derecha a izquierda significa que haces clic en el lado izquierdo de la pantalla para pasar a la siguiente página.", - "scaling-option-label": "Opciones de escalado", - "scaling-option-tooltip": "Cómo ajustar la imagen a tu pantalla.", - "page-splitting-label": "Separación de página", - "page-splitting-tooltip": "Cómo separar una imagen de ancho completo (es decir, ambas imágenes izquierda y derecha están combinadas)", - "reading-mode-label": "Modo de lectura", - "reading-mode-tooltip": "Cambiar el lector a paginar verticalmente, horizontalmente, o tener un desplazamiento infinito", - "layout-mode-label": "Modo de disposición", - "layout-mode-tooltip": "Renderizar una única imagen en la pantalla o dos imágenes una al lado de la otra", - "background-color-label": "Color de fondo", - "background-color-tooltip": "Color de fondo del lector de imágenes", - "auto-close-menu-label": "Cerrar menú automáticamente", - "auto-close-menu-tooltip": "¿El menú debería cerrarse automáticamente?", - "show-screen-hints-label": "Mostrar sugerencias en pantalla", - "show-screen-hints-tooltip": "Mostrar superposiciones para ayudar a comprender las áreas de paginación y las direcciones", - "emulate-comic-book-label": "Emular a un cómic", - "emulate-comic-book-tooltip": "Agrega un efecto de sombra para imitar la lectura de un libro", - "swipe-to-paginate-label": "Deslizar para paginar", - "swipe-to-paginate-tooltip": "Permitir deslizar en la pantalla para pasar a la página anterior/siguiente", - "book-reader-settings-title": "Lector de libros", - "tap-to-paginate-label": "Tocar para paginar", - "tap-to-paginate-tooltip": "Los lados de la pantalla del lector de libros deben permitir tocar para pasar a la página anterior/siguiente", - "immersive-mode-label": "Modo inmersivo", - "immersive-mode-tooltip": "Esto ocultará el menú detrás de un clic en el documento del lector y activará tocar para paginar", - "reading-direction-book-label": "Dirección de lectura", - "reading-direction-book-tooltip": "Dirección para hacer clic para pasar a la siguiente página. De derecha a izquierda significa que haces clic en el lado izquierdo de la pantalla para pasar a la siguiente página.", - "font-family-label": "Familia de fuentes", - "font-family-tooltip": "Familia de fuentes para cargar. Por defecto cargará la fuente predeterminada del libro", - "writing-style-label": "Estilo de escritura", - "writing-style-tooltip": "Cambia la dirección del texto. Horizontal es de izquierda a derecha, vertical es de arriba a abajo.", - "layout-mode-book-label": "Modo de disposición", - "layout-mode-book-tooltip": "Cómo se debe organizar el contenido. Desplazable es tal como el libro se empaqueta. 1 o 2 columnas se ajusta a la altura del dispositivo y ajusta 1 o 2 columnas de texto por página", - "color-theme-book-label": "Tema de color", - "color-theme-book-tooltip": "Qué tema de color aplicar al contenido del lector de libros y al menú", - "font-size-book-label": "Tamaño de fuente", - "font-size-book-tooltip": "Porcentaje de escalado que aplicar a la fuente del libro", - "line-height-book-label": "Espaciado entre líneas", - "line-height-book-tooltip": "Cuánto espacio habrá entre las líneas del libro", - "margin-book-label": "Margen", - "margin-book-tooltip": "Cuánto espacio habrá en cada lado de la pantalla. Esto se anulará a 0 en los dispositivos móviles sin importar esta configuración.", - "pdf-reader-settings-title": "Lector de PDF", - "pdf-scroll-mode-label": "Modo de desplazamiento", - "pdf-scroll-mode-tooltip": "Cómo se desplaza por las páginas. Vertical/Horizontal y Toque para Paginar (sin desplazamiento)", - "pdf-spread-mode-label": "Modo de propagación", - "pdf-spread-mode-tooltip": "Cómo se deben distribuir las páginas. Simple o doble (par/impar)", - "pdf-theme-label": "Tema", - "pdf-theme-tooltip": "Tema de color del lector", "clients-opds-alert": "OPDS no está habilitado en este servidor. Esto no afectará a los usuarios de Tachiyomi.", "clients-opds-description": "Todos los clientes de terceros usarán la clave API o la URL de conexión a continuación. Estos son como contraseñas, mantenlo en privado.", "clients-api-key-tooltip": "La clave API es como una contraseña. Restablecerla invalidará cualquier cliente existente.", @@ -841,8 +792,7 @@ "donate-tooltip": "Puedes eliminarlo suscribiéndote a Kavita+", "back": "Atras", "more": "Ver más", - "customize": "{{settings.customize}}", - "browse-authors": "Buscar autores" + "customize": "{{settings.customize}}" }, "library-settings-modal": { "close": "{{common.close}}", @@ -1590,7 +1540,6 @@ }, "manga-reader": { "back": "Volver", - "save-globally": "Guardar globalmente", "incognito-alt": "El modo incógnito está encendido. Desliza para apagar.", "incognito-title": "Modo incógnito:", "shortcuts-menu-alt": "Modo de atajos de teclado", @@ -1625,7 +1574,6 @@ "layout-mode-switched": "El modo de diseño se ha cambiado a Individual ya que no hay espacio suficiente para renderizar el diseño doble", "no-next-chapter": "No hay siguiente Capítulo", "no-prev-chapter": "No hay Capítulo Anterior", - "user-preferences-updated": "Preferencias de usuario actualizadas", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "series-progress": "Progreso de la serie: {{porcentage}}" }, @@ -2433,11 +2381,6 @@ "mal-tooltip": "https://myanimelist.net/people/{MalId}/", "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}" }, - "browse-authors": { - "title": "Buscar autores y escritores", - "author-count": "{{num}} personas", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "email-history": { "date-header": "Fecha de envío", "template-header": "Plantilla", diff --git a/UI/Web/src/assets/langs/fi.json b/UI/Web/src/assets/langs/fi.json index 5d1f1393f..7795f3c60 100644 --- a/UI/Web/src/assets/langs/fi.json +++ b/UI/Web/src/assets/langs/fi.json @@ -22,37 +22,9 @@ "collapse-series-relationships-label": "Kutista sarjojen suhteet", "collapse-series-relationships-tooltip": "Pitäisikö Kavita näyttää sarjoja, joilla ei ole suhteita tai jotka ovat vanhempi/esiosa", "share-series-reviews-label": "Jaa sarjojen arvostelut", - "image-reader-settings-title": "Kuvanlukija", - "reading-direction-tooltip": "Napsauttamista kattavat ohjeet seuraavalle sivulle siirtymiseksi. \"Oikealta vasemmalle\" tarkoittaa, että napsautat näytön vasenta reunaa siirtyäksesi seuraavalle sivulle.", - "scaling-option-label": "Skaalausvaihtoehdot", - "scaling-option-tooltip": "Kuinka skaalata kuva ruudullesi.", - "page-splitting-label": "Sivun jakaminen", - "page-splitting-tooltip": "Täysleveän kuvan jakaminen (eli sekä vasen että oikea kuva yhdistetään)", - "reading-mode-label": "Lukutila", - "reading-mode-tooltip": "Vaihda lukija sivuttelemaan pysty- tai vaakasuunnassa tai vierittämään loputtomasti", - "layout-mode-label": "Asettelutila", - "layout-mode-tooltip": "Hahmonna ruudulle yksi kuva tai kaksi vierekkäistä kuvaa", - "background-color-label": "Taustaväri", - "background-color-tooltip": "Kuvanlukijan taustaväri", - "auto-close-menu-label": "Sulje valikko automaattisesti", - "auto-close-menu-tooltip": "Pitäisikö valikon sulkeutua automaattisesti", - "show-screen-hints-label": "Näytä näytön vihjeet", - "show-screen-hints-tooltip": "Näytä peittokuva, joka auttaa ymmärtämään sivutusalueen ja -suunnan", - "emulate-comic-book-label": "Emuloi sarjakuvaa", - "emulate-comic-book-tooltip": "Käyttää varjotehostetta jäljittelemään kirjan lukemista", - "tap-to-paginate-label": "Sivuta napauttamalla", - "book-reader-settings-title": "Kirjanlukija", - "swipe-to-paginate-label": "Sivuta pyyhkäisemällä", - "swipe-to-paginate-tooltip": "Pitäisikö näytöllä pyyhkäiseminen laukaista seuraavan tai edellisen sivun", - "immersive-mode-label": "Mukaansatempaava tila", - "immersive-mode-tooltip": "Tämä piilottaa valikon lukijan asiakirjan napsautuksen taakse ja sivuuta päälle napauttamalla", - "reading-direction-book-label": "Lukusuunta", - "reading-direction-book-tooltip": "Napsauttamista kattavat ohjeet seuraavalle sivulle siirtymiseksi. \"Oikealta vasemmalle\" tarkoittaa, että napsautat näytön vasenta reunaa siirtyäksesi seuraavalle sivulle.", "disable-animations-tooltip": "Poistaa animaatiot käytöstä sivustolla. Hyödyllinen e-musteen lukijoille.", "stats-tab": "{{tabs.stats-tab}}", - "reading-direction-label": "Lukusuunta", - "scrobbling-tab": "{{tabs.scrobbling-tab}}", - "tap-to-paginate-tooltip": "Pitäisikö kirjanlukijanäytön sivuilla napauttaa sitä siirtyäksesi edelliselle/seuraavalle sivulle" + "scrobbling-tab": "{{tabs.scrobbling-tab}}" }, "customize-dashboard-modal": { "smart-filters": "Älykkäät suodattimet", diff --git a/UI/Web/src/assets/langs/fr.json b/UI/Web/src/assets/langs/fr.json index 3ae26002d..780da243e 100644 --- a/UI/Web/src/assets/langs/fr.json +++ b/UI/Web/src/assets/langs/fr.json @@ -72,7 +72,8 @@ "your-review": "Voici votre critique", "external-review": "Critique externe", "local-review": "Critique locale", - "rating-percentage": "Évaluation {{r}}%" + "rating-percentage": "Évaluation {{r}}%", + "critic": "critique" }, "want-to-read": { "title": "À lire", @@ -106,55 +107,6 @@ "collapse-series-relationships-tooltip": "Kavita doit-il afficher des Séries qui n'ont pas de lien ou sont le parent/préquel", "share-series-reviews-label": "Partagez les critiques de la Série", "share-series-reviews-tooltip": "Kavita doit-il afficher vos commentaires sur les Séries pour les autres utilisateurs", - "image-reader-settings-title": "Lecteur d'image", - "reading-direction-label": "Sens de lecture", - "reading-direction-tooltip": "Direction dans laquelle cliquer pour passer à la page suivante. De droite à gauche signifie que vous cliquez sur le côté gauche de l'écran pour passer à la page suivante.", - "scaling-option-label": "Options de Mise à l'échelle", - "scaling-option-tooltip": "Comment ajuster la mise à l'échelle de l'image a votre écran.", - "page-splitting-label": "Séparation des Pages", - "page-splitting-tooltip": "Comment diviser une image pleine largeur (càd que les images de gauche et de droite sont combinées)", - "reading-mode-label": "Mode de Lecture", - "reading-mode-tooltip": "Modifier le lecteur pour paginer verticalement, horizontalement ou avoir un défilement infini", - "layout-mode-label": "Mode de mise en page", - "layout-mode-tooltip": "Rendu d'une seule image à l'écran ou de deux images côte à côte", - "background-color-label": "Couleur d'arrière-plan", - "background-color-tooltip": "Couleur de fond du lecteur d'image", - "auto-close-menu-label": "Fermeture automatique du Menu", - "auto-close-menu-tooltip": "Le menu devrait se fermer tout seul", - "show-screen-hints-label": "Afficher les conseils à l'écran", - "show-screen-hints-tooltip": "Afficher une superposition pour aider à comprendre la zone et la direction de la pagination", - "emulate-comic-book-label": "Imiter l'aspect Bande dessinées", - "emulate-comic-book-tooltip": "Applique un effet d'ombre pour imiter la lecture d'un livre", - "swipe-to-paginate-label": "Glisser pour paginer", - "swipe-to-paginate-tooltip": "Le glissement sur l'écran devrait provoquer le déclenchement de la page suivante ou précédente", - "book-reader-settings-title": "Lecteur de livre", - "tap-to-paginate-label": "Appuyer pour paginer", - "tap-to-paginate-tooltip": "Les bords d'écran du lecteur de livre doivent-ils permettre d'appuyer pour passer à la page précédente/suivante", - "immersive-mode-label": "Mode immersif", - "immersive-mode-tooltip": "Cela permet de masquer le menu en cliquant sur le document de lecture et d'activer la fonction de pagination", - "reading-direction-book-label": "Sens de lecture", - "reading-direction-book-tooltip": "Sens du clic pour aller à page suivante. Droite à gauche signifie que vous devez cliquer du côté gauche de l'écran pour aller à la page suivante.", - "font-family-label": "Famille de Polices", - "font-family-tooltip": "Famille de police à charger. Par Défaut chargera la police par défaut du livre", - "writing-style-label": "Style d'écriture", - "writing-style-tooltip": "Change la direction du texte. Horizontal est de gauche à droite, vertical est de haut en bas.", - "layout-mode-book-label": "Mise en page", - "layout-mode-book-tooltip": "Comment le contenu devrait être mis en page. Défilement correspond à la présentation d'origine du livre. 1 ou 2 Colonnes adapte le texte à la hauteur de l'appareil avec une 1 ou 2 colonnes par page", - "color-theme-book-label": "Couleur du thème", - "color-theme-book-tooltip": "Quel thème de couleur appliquer aux contenu et menu du lecteur de livre", - "font-size-book-label": "Taille de la Police", - "font-size-book-tooltip": "Pourcentage de mise à l'échelle à appliquer à la police du livre", - "line-height-book-label": "Espacement de l'interligne", - "line-height-book-tooltip": "Quel espace entre les lignes du livre", - "margin-book-label": "Marge", - "margin-book-tooltip": "Quel espace de chaque côté de l'écran. Cela sera remplacé par 0 sur les appareils mobiles indépendamment de ce réglage.", - "pdf-reader-settings-title": "Lecteur PDF", - "pdf-scroll-mode-label": "Mode de défilement", - "pdf-scroll-mode-tooltip": "Mode de défilement des pages. Vertical/Horizontal et Tapez pour paginer (pas de défilement)", - "pdf-spread-mode-label": "Mode d'étalement", - "pdf-spread-mode-tooltip": "Comment les pages doivent être mises en page. Simple ou double (paire/impaire)", - "pdf-theme-label": "Thème", - "pdf-theme-tooltip": "Thème de couleur du lecteur", "clients-opds-alert": "OPDS n'est pas actif sur ce serveur. Cela n'affectera pas les utilisateurs de Tachiyomi.", "clients-opds-description": "Tous les clients tiers utiliseront soit la Clé d'API ou l'Url de connexion ci-dessous. Ce sont comme des mots de passe, ne les divulguez pas.", "clients-api-key-tooltip": "La Clé d'API est comme un mot de passe. Gardez-la secrète, gardez-la en sécurité. La réinitialiser invalidera tous les clients existants.", @@ -167,9 +119,7 @@ "anilist-scrobbling-label": "Suivi de lecture AniList", "anilist-scrobbling-tooltip": "Autorise Kavita à mettre à jour le suivi de lecture et les notes sur AniList", "want-to-read-sync-label": "À lire : Synchroniser", - "want-to-read-sync-tooltip": "Permettre à Kavita d'ajouter des éléments à votre liste \"À lire\" en fonction des séries AniList et MAL de la liste de lecture \"En attente\"", - "allow-auto-webtoon-reader-label": "Mode Lecteur Webtoon Automatique", - "allow-auto-webtoon-reader-tooltip": "Passez en mode \"Lecteur Webtoon\" si les pages ressemblent à un webtoon. Des faux positifs peuvent se produire." + "want-to-read-sync-tooltip": "Permettre à Kavita d'ajouter des éléments à votre liste \"À lire\" en fonction des séries AniList et MAL de la liste de lecture \"En attente\"" }, "user-holds": { "title": "Enregistrement du suivi d'activité", @@ -849,7 +799,6 @@ "back": "Retour", "more": "Plus", "customize": "{{settings.customize}}", - "browse-authors": "Parcourir les auteurs", "edit": "{{common.edit}}", "cancel-edit": "Fermer la réorganisation" }, @@ -1622,7 +1571,6 @@ }, "manga-reader": { "back": "Retour", - "save-globally": "Sauvegarder globalement", "incognito-alt": "Le mode Incognito est activé. Basculer pour le désactiver.", "incognito-title": "Mode incognito :", "shortcuts-menu-alt": "Raccourcis clavier Modal", @@ -1657,9 +1605,8 @@ "layout-mode-switched": "Le mode de mise en page est passé à simple en raison d'un manque d'espace pour rendre la mise en page double", "no-next-chapter": "Pas de prochain chapitre", "no-prev-chapter": "Pas de chapitre précédent", - "user-preferences-updated": "Mise à jour des préférences des utilisateurs", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", - "series-progress": "Progression de la série : {{percentage}}" + "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}", + "series-progress": "Progression de la série : {{percentage}}" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -2481,11 +2428,6 @@ "cover-image-description-extra": "Vous pouvez également télécharger une couverture à partir de CoversDB, si elle est disponible.", "download-coversdb": "Télécharger à partir de CoversDB" }, - "browse-authors": { - "title": "Parcourir les auteurs et écrivains", - "author-count": "{{num}} Personnes", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "changelog-update-item": { "added": "Ajouté", "download": "Télécharger", @@ -2591,7 +2533,12 @@ "age-rating-mapping-description": "Toute chaîne de caractères à gauche, si elle est trouvée dans les Genres ou les Tags, définira la classification par âge de la Série.", "whitelist-tooltip": "N'autoriser qu'une chaîne de cette liste à être écrite pour les Tags. Assurez-vous qu'elles sont séparées par des virgules.", "age-rating-mapping-title": "Correspondance des classifications par âge", - "field-mapping-title": "Correspondance de champ" + "field-mapping-title": "Correspondance de champ", + "enable-chapter-title-tooltip": "Autoriser la modification du Titre du chapitre/volume", + "enable-chapter-title-label": "Titre", + "enable-chapter-release-date-label": "Date de diffusion", + "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}", + "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}" }, "match-series-result-item": { "chapter-count": "{{common.chapter-count}}", @@ -2637,5 +2584,18 @@ "trace": "Trace", "warning": "Attention", "critical": "Critique" + }, + "reviews": { + "user-reviews-local": "Avis Locaux", + "user-reviews-plus": "Avis Externes" + }, + "review-modal": { + "close": "{{common.close}}", + "save": "{{common.save}}", + "delete": "{{common.delete}}", + "required": "{{validation.required-field}}", + "review-label": "Avis", + "title": "Editer Avis", + "min-length": "L'avis doit faire au moins {{count}} caractères" } } diff --git a/UI/Web/src/assets/langs/ga.json b/UI/Web/src/assets/langs/ga.json index 94490ec07..f04733b7a 100644 --- a/UI/Web/src/assets/langs/ga.json +++ b/UI/Web/src/assets/langs/ga.json @@ -83,7 +83,7 @@ }, "user-preferences": { "title": "Painéal na nÚsáideoirí", - "pref-description": "Is socruithe domhanda iad seo atá faoi cheangal ag do chuntas.", + "pref-description": "Is socruithe domhanda iad seo atá ceangailte le do chuntas. Tá socruithe léitheoirí le fáil i bPróifílí Léitheoireachta.", "account-tab": "{{tabs.account-tab}}", "preferences-tab": "{{tabs.preferences-tab}}", "theme-tab": "{{tabs.theme-tab}}", @@ -107,55 +107,6 @@ "collapse-series-relationships-tooltip": "Ar chóir Kavita thaispeáint Sraith nach bhfuil aon chaidreamh nó go bhfuil an tuismitheoir/réamhscéal", "share-series-reviews-label": "Léirmheasanna Sraith Comhroinn", "share-series-reviews-tooltip": "Ar chóir Kavita san áireamh do athbhreithnithe ar Sraith d'úsáideoirí eile", - "image-reader-settings-title": "Léitheoir Íomhá", - "reading-direction-label": "Treo Léitheoireachta", - "reading-direction-tooltip": "Treoir chun cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Deas go Clé go bhfuil tú ag cliceáil ar thaobh clé an scáileáin chun bogadh go dtí an chéad leathanach eile.", - "scaling-option-label": "Roghanna Scálú", - "scaling-option-tooltip": "Conas an íomhá a scála ar do scáileán.", - "page-splitting-label": "Scoilteadh Leathanach", - "page-splitting-tooltip": "Conas íomhá leithead iomlán a roinnt (ie cuirtear íomhánna ar chlé agus ar dheis le chéile)", - "reading-mode-label": "Mód Léitheoireachta", - "reading-mode-tooltip": "Athraigh an léitheoir chun leathanach a dhéanamh go hingearach, go cothrománach, nó bíodh scrolla gan teorainn agat", - "layout-mode-label": "Mód Leagan Amach", - "layout-mode-tooltip": "Tabhair íomhá amháin don scáileán nó dhá íomhá taobh le taobh", - "background-color-label": "Cúlra Dath", - "background-color-tooltip": "Cúlra Dath an Léitheora Íomhá", - "auto-close-menu-label": "Dún an Roghchlár Go hUathoibríoch", - "auto-close-menu-tooltip": "Ba chóir an roghchlár a dhúnadh go huathoibríoch", - "show-screen-hints-label": "Taispeáin Leideanna Scáileáin", - "show-screen-hints-tooltip": "Taispeáin forleagan chun cabhrú le tuiscint a fháil ar limistéar agus treo pagination", - "emulate-comic-book-label": "Aithris a dhéanamh ar ghreannán", - "emulate-comic-book-tooltip": "Cuireann sé scáthéifeacht i bhfeidhm chun aithris a dhéanamh ar léamh as leabhar", - "swipe-to-paginate-label": "Svaidhpeáil go Paginate", - "swipe-to-paginate-tooltip": "Ba chóir svaidhpeáil ar an scáileán a chur faoi deara an chéad leathanach eile nó an leathanach roimhe seo a spreagadh", - "book-reader-settings-title": "Léitheoir Leabhar", - "tap-to-paginate-label": "Tapáil go Paginate", - "tap-to-paginate-tooltip": "Má cheadaíonn taobhanna scáileán an léitheora leabhar cnagadh air chun bogadh go dtí an chéad leathanach eile/an chéad leathanach eile", - "immersive-mode-label": "Mód tumtha", - "immersive-mode-tooltip": "Folóidh sé seo an roghchlár taobh thiar de chliceáil ar an gcáipéis léitheora agus casfaidh sé tapáil chun paginate a dhéanamh air", - "reading-direction-book-label": "Treo Léitheoireachta", - "reading-direction-book-tooltip": "Treoir chun cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Deas go Clé go bhfuil tú ag cliceáil ar thaobh clé an scáileáin chun bogadh go dtí an chéad leathanach eile.", - "font-family-label": "Teaghlach Cló", - "font-family-tooltip": "Clófhoireann le luchtú suas. Luchtóidh an réamhshocrú cló réamhshocraithe an leabhair", - "writing-style-label": "Stíl Scríbhneoireachta", - "writing-style-tooltip": "Athraíonn seo treo an téacs. Horizontal is left to right, tá ingearach ó bhun go barr.", - "layout-mode-book-label": "Mód Leagan Amach", - "layout-mode-book-tooltip": "Conas ba chóir ábhar a leagan amach. Scrollaigh mar a phacálann an leabhar é. 1 nó 2 Oireann Colún d'airde na feiste agus luíonn sé 1 nó 2 cholún téacs in aghaidh an leathanaigh", - "color-theme-book-label": "Téama Datha", - "color-theme-book-tooltip": "Cén téama datha atá le cur i bhfeidhm ar ábhar agus roghchlár an léitheora leabhar", - "font-size-book-label": "Clómhéid", - "font-size-book-tooltip": "Céatadán den scálú le cur i bhfeidhm ar chló sa leabhar", - "line-height-book-label": "Spásáil Líne", - "line-height-book-tooltip": "Cé mhéad spásáil idir línte an leabhair", - "margin-book-label": "Imeall", - "margin-book-tooltip": "Cé mhéad spásáil ar gach taobh den scáileán. Sáróidh sé seo 0 ar ghléasanna soghluaiste beag beann ar an socrú seo.", - "pdf-reader-settings-title": "Léitheoir PDF", - "pdf-scroll-mode-label": "Mód Scrollaigh", - "pdf-scroll-mode-tooltip": "Conas a scrollaíonn tú trí leathanaigh. Ingearach / Cothrománach agus Tapáil go Paginate (gan scrollbharra)", - "pdf-spread-mode-label": "Mód Scaipthe", - "pdf-spread-mode-tooltip": "Conas ba chóir leathanaigh a leagan amach. Singil nó dúbailte (corr / fiú)", - "pdf-theme-label": "Téama", - "pdf-theme-tooltip": "Téama datha an léitheora", "clients-opds-alert": "Níl OPDS cumasaithe ar an bhfreastalaí seo. Ní dhéanfaidh sé seo difear d'úsáideoirí Tachiyami.", "clients-opds-description": "Úsáidfidh gach cliant 3ú Páirtí an eochair API nó an Url Ceangail thíos. Tá siad seo cosúil le pasfhocail, coinnigh príobháideach é.", "clients-api-key-tooltip": "Tá an eochair API cosúil le pasfhocal. Má athshocraítear é, cuirfidh sé aon chliaint atá ann cheana ó bhail.", @@ -168,9 +119,7 @@ "anilist-scrobbling-label": "Scrobbling AniList", "anilist-scrobbling-tooltip": "Lig do Kavita Scrobble (sioncronú aontreo) dul chun cinn a léamh agus rátálacha chuig AniList", "want-to-read-sync-label": "Ag Teastáil le Léamh Sioncrónaithe", - "want-to-read-sync-tooltip": "Lig do Kavita míreanna a chur le do liosta Want to Read bunaithe ar shraith AniList agus MAL sa léiliosta ar feitheamh", - "allow-auto-webtoon-reader-tooltip": "Athraigh isteach i mód Webtoon Reader má tá cuma ar leathanaigh ghréasáin. D’fhéadfadh roinnt rudaí dearfacha bréagacha tarlú.", - "allow-auto-webtoon-reader-label": "Mód Uathoibríoch Léitheoir Webtoon" + "want-to-read-sync-tooltip": "Lig do Kavita míreanna a chur le do liosta Want to Read bunaithe ar shraith AniList agus MAL sa léiliosta ar feitheamh" }, "user-holds": { "title": "Coinníonn Scrobble", @@ -214,7 +163,7 @@ "description": "Nuair a roghnaítear iad, déanfar gach liosta sraithe agus léitheoireachta a bhfuil mír amháin ar a laghad acu atá níos mó ná an srian roghnaithe a bhriseadh ó thorthaí.", "not-applicable-for-admins": "Níl sé seo infheidhme maidir le admins.", "age-rating-label": "{{metadata-fields.age-rating-title}}", - "no-restriction": "Uimh Srianadh", + "no-restriction": "Gan Srian", "include-unknowns-label": "Cuir anaithnid san áireamh", "include-unknowns-tooltip": "Más fíor, ceadófar Anaithnid le Srian Aoise. D'fhéadfadh sé seo a bheith ina chúis le sceitheadh na meán d'úsáideoirí a bhfuil srianta Aoise orthu." }, @@ -680,7 +629,10 @@ "incognito-mode-label": "Mód Incognito", "next": "Ar Aghaidh", "previous": "Roimhe Seo", - "go-to-page-prompt": "Tá leathanaigh {{totalPages}} ann. Cén leathanach ar mhaith leat dul chuige?" + "go-to-page-prompt": "Tá leathanaigh {{totalPages}} ann. Cén leathanach ar mhaith leat dul chuige?", + "go-to-section": "Téigh go dtí an roinn", + "go-to-section-prompt": "Tá {{totalSections}} rannóg ann. Cén rannóg ar mhaith leat dul chuici?", + "go-to-first-page": "Téigh go dtí an chéad leathanach" }, "personal-table-of-contents": { "no-data": "Níl aon rud Leabharmharcáilte fós", @@ -728,7 +680,7 @@ "series-detail": { "page-settings-title": "Socruithe an Leathanaigh", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "Cárta", "layout-mode-option-list": "Liosta", "continue-from": "Lean ar aghaidh {{title}}", @@ -851,9 +803,9 @@ "back": "Ar ais", "more": "Níos mó", "customize": "{{settings.customize}}", - "browse-authors": "Brabhsáil Údair", "edit": "{{common.edit}}", - "cancel-edit": "Dún Athordú" + "cancel-edit": "Dún Athordú", + "browse-people": "Brabhsáil Daoine" }, "library-settings-modal": { "close": "{{common.close}}", @@ -916,30 +868,30 @@ }, "reader-settings": { "general-settings-title": "Socruithe Ginearálta", - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", + "font-family-label": "{{manage-reading-profiles.font-family-label}}", + "font-size-label": "{{manage-reading-profiles.font-size-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", "reset-to-defaults": "Athshocraigh go Réamhshocruithe", "reader-settings-title": "Socruithe an Léitheora", - "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", + "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}", "right-to-left": "Deas go Clé", "left-to-right": "Clé go Deas", "horizontal": "Cothrománach", "vertical": "Ingearach", - "writing-style-label": "{{user-preferences.writing-style-label}}", + "writing-style-label": "{{manage-reading-profiles.writing-style-label}}", "writing-style-tooltip": "Athraíonn seo treo an téacs. Horizontal is left to right, tá ingearach ó bhun go barr.", "tap-to-paginate-label": "Tapáil Pagination", "tap-to-paginate-tooltip": "Cliceáil ar imill an scáileáin chun paginate", "on": "Ar", "off": "As", - "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", + "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}", "immersive-mode-tooltip": "Folóidh sé seo an roghchlár taobh thiar de chliceáil ar an gcáipéis léitheora agus casfaidh sé tapáil chun paginate a dhéanamh air", "fullscreen-label": "Lánscáileán", "fullscreen-tooltip": "Cuir an léitheoir i mód lánscáileáin", "exit": "Scoir", "enter": "Iontráil", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-tooltip": "Scrollaigh: Scátháin comhad epub (de ghnáth leathanach fada scrollaithe amháin in aghaidh na caibidle).
    1 Colún: Cruthaíonn sé leathanach fíorúil amháin ag an am.
    2 Colún: Cruthaítear dhá leathanach fhíorúla ag an am atá leagtha amach taobh le taobh -taobh.", "layout-mode-option-scroll": "Scrollaigh", "layout-mode-option-1col": "1 Colún", @@ -948,7 +900,15 @@ "theme-dark": "Dorcha", "theme-black": "Dubh", "theme-white": "Bán", - "theme-paper": "Páipéar" + "theme-paper": "Páipéar", + "line-spacing-min-label": "1x", + "line-spacing-max-label": "2.5x", + "update-parent": "Sábháil chuig {{name}}", + "loading": "ag lódáil", + "create-new": "Próifíl nua ó intuigthe", + "reading-profile-updated": "Próifíl léitheoireachta nuashonraithe", + "reading-profile-promoted": "Próifíl léitheoireachta curtha chun cinn", + "create-new-tooltip": "Cruthaigh próifíl nua inbhainistithe ón gceann intuigthe atá agat faoi láthair" }, "table-of-contents": { "no-data": "Níl Clár ábhair sa leabhar seo atá leagtha síos sna meiteashonraí nó i gcomhad clár" @@ -1245,7 +1205,7 @@ "library-scan-tooltip": "Cé chomh minic a dhéanfaidh Kavita meiteashonraí a scanadh agus a athnuachan timpeall ar chomhaid leabharlainne.", "library-database-backup-label": "Cúltaca fileata", "library-database-backup-tooltip": "Cé chomh minic a dhéanfaidh Kavita cúltaca ar an mbunachar sonraí agus ar chomhaid ghaolmhara eile.", - "cleanup-label": "Glanta", + "cleanup-label": "Glanadh", "cleanup-tooltip": "Cé chomh minic a rithfidh Kavita tascanna glantacháin. D'fhéadfadh sé seo a bheith trom agus ba chóir é a dhéanamh ag meán oíche i bhformhór na gcásanna", "adhoc-tasks-title": "Tascanna Ad-hoc", "job-title-header": "Teideal an Phoist", @@ -1380,7 +1340,7 @@ "clients": "Eochair API / OPDS", "devices": "Gléasanna", "user-stats": "Stait", - "scrobbling": "Scrobbling", + "scrobbling": "Ag scrobadh", "theme": "Téama", "customize": "Saincheap", "cbl-import": "Liosta Léitheoireachta CBL", @@ -1389,7 +1349,8 @@ "admin-matched-metadata": "Meiteashonraí Meaitseála", "admin-manage-tokens": "Bainistigh Comharthaí Úsáideora", "scrobble-holds": "Scrobble i seilbh", - "admin-metadata": "Bainistigh Meiteashonraí" + "admin-metadata": "Bainistigh Meiteashonraí", + "reading-profiles": "Próifílí Léitheoireachta" }, "collection-detail": { "no-data": "Níl aon mhír ann. Bain triail as sraith a chur leis.", @@ -1514,7 +1475,9 @@ "all-filters": "Scagairí Cliste", "nav-link-header": "Roghanna Nascleanúna", "close": "{{common.close}}", - "person-aka-status": "Meaitseálann leasainm" + "person-aka-status": "Meaitseálann leasainm", + "browse-tags": "Brabhsáil Clibeanna", + "browse-genres": "Brabhsáil Seánraí" }, "promoted-icon": { "promoted": "{{common.promoted}}" @@ -1625,7 +1588,6 @@ }, "manga-reader": { "back": "Ar ais", - "save-globally": "Sábháil ar fud an domhain", "incognito-alt": "Tá mód Incognito ar siúl. Scoránaigh chun é a chasadh as.", "incognito-title": "Mód Incognito:", "shortcuts-menu-alt": "Mód Aicearraí Méarchláir", @@ -1647,9 +1609,9 @@ "height": "Airde", "width": "Leithead", "width-override-label": "Sáraigh Leithead", - "off": "As", + "off": "{{reader-settings.off}}", "original": "Bunleagan", - "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", + "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}", "swipe-enabled-label": "Svaidhpeáil Cumasaithe", "enable-comic-book-label": "Aithris a dhéanamh ar ghreannán", "brightness-label": "Gile", @@ -1660,9 +1622,14 @@ "layout-mode-switched": "Mód leagan amach aistrithe go Singil mar gheall ar easpa spáis chun leagan amach dúbailte a dhéanamh", "no-next-chapter": "Gan aon chaibidil eile", "no-prev-chapter": "Uimh Caibidil Roimhe Seo", - "user-preferences-updated": "Nuashonraíodh sainroghanna úsáideora", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", - "series-progress": "Dul Chun Cinn na Sraithe: {{percentage}}" + "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}", + "series-progress": "Dul Chun Cinn na Sraithe: {{percentage}}", + "create-new": "{{reader-settings.create-new}}", + "update-parent": "{{reader-settings.update-parent}}", + "loading": "{{reader-settings.loading}}", + "reading-profile-updated": "Próifíl léitheoireachta nuashonraithe", + "reading-profile-promoted": "Próifíl léitheoireachta curtha chun cinn", + "create-new-tooltip": "{{reader-settings.create-new-tooltip}}" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -1719,7 +1686,10 @@ "release-year": "Bliain Scaoilte", "read-progress": "An Léamh Is Déanaí", "average-rating": "Meánráta", - "random": "Randamach" + "random": "Randamach", + "person-name": "Ainm", + "person-series-count": "Líon na Sraitheanna", + "person-chapter-count": "Líon na gCaibidlí" }, "edit-series-modal": { "title": "{{seriesName}} Sonraí", @@ -1856,8 +1826,8 @@ "cover-image-tab": "{{tabs.cover-tab}}", "tasks-tab": "{{tabs.tasks-tab}}", "info-tab": "{{tabs.info-tab}}", - "pages-label": "{{edit-chapter-modal.pages-count}}", - "words-label": "{{edit-chapter-modal.length-title}}", + "pages-label": "{{edit-chapter-modal.pages-label}}", + "words-label": "{{edit-chapter-modal.words-label}}", "pages-count": "{{edit-chapter-modal.pages-count}}", "words-count": "{{edit-chapter-modal.words-count}}", "reading-time-label": "{{edit-chapter-modal.reading-time-label}}", @@ -2078,7 +2048,7 @@ "reading-lists": "{{side-nav.reading-lists}}", "bookmarks": "{{side-nav.bookmarks}}", "all-series": "{{side-nav.all-series}}", - "browse-authors": "{{side-nav.browse-authors}}" + "browse-authors": "{{side-nav.browse-people}}" }, "filter-field-pipe": { "age-rating": "{{metadata-fields.age-rating-title}}", @@ -2110,7 +2080,7 @@ "writers": "{{metadata-fields.writers-title}}", "path": "Cosán", "file-path": "Cosán Comhad", - "want-to-read": "Ag Teastáil le Léamh", + "want-to-read": "Ar mhaith leat léamh", "read-date": "Dáta Léitheoireachta", "average-rating": "Meánráta", "read-last": "Léigh go deireanach" @@ -2254,7 +2224,9 @@ "webtoon-override": "Ag aistriú go mód Webtoon mar gheall ar íomhánna a léiríonn webtoon.", "scrobble-gen-init": "Cheangail post chun teagmhais scrobble a ghiniúint ó stair léitheoireachta agus rátálacha san am a chuaigh thart, agus iad á sioncronú le seirbhísí ceangailte.", "confirm-delete-multiple-volumes": "An bhfuil tú cinnte gur mian leat {{count}} imleabhar a scriosadh? Ní athróidh sé comhaid ar an diosca.", - "series-added-want-to-read": "Sraith curtha leis ón liosta Ar Mhaith Leat Léamh" + "series-added-want-to-read": "Sraith curtha leis ón liosta Ar Mhaith Leat Léamh", + "series-bound-to-reading-profile": "Sraith atá ceangailte le Próifíl Léitheoireachta {{name}}", + "library-bound-to-reading-profile": "Leabharlann ceangailte le Próifíl Léitheoireachta {{name}}" }, "read-time-pipe": { "less-than-hour": "<1 Uair", @@ -2330,7 +2302,13 @@ "reorder": "Athordú", "rename": "Athainmnigh", "rename-tooltip": "Athainmnigh an Scagaire Cliste", - "merge": "Cumaisc" + "merge": "Cumaisc", + "reading-profiles": "Próifílí Léitheoireachta", + "set-reading-profile": "Socraigh Próifíl Léitheoireachta", + "set-reading-profile-tooltip": "Ceangail Próifíl Léitheoireachta leis an Leabharlann seo", + "clear-reading-profile": "Próifíl Léitheoireachta Glan", + "clear-reading-profile-tooltip": "Glan Próifíl Léitheoireachta don Leabharlann seo", + "cleared-profile": "Próifíl Léitheoireachta Glanta" }, "preferences": { "left-to-right": "Clé go Deas", @@ -2405,7 +2383,7 @@ "theme-tab": "Téama", "devices-tab": "Gléasanna", "stats-tab": "Stait", - "scrobbling-tab": "Scrobbling", + "scrobbling-tab": "Ag scrobadh", "smart-filters-tab": "Scagairí Cliste" }, "common": { @@ -2449,19 +2427,16 @@ "volume-nums": "Imleabhair", "author-count": "{{num}} Údair", "chapter-count": "{{num}} Caibidlí", - "no-data": "Uimh Sonraí" + "no-data": "Uimh Sonraí", + "issue-count": "{{num}} Fadhbanna" }, "confirm": { "alert": "Airdeall", "confirm": "Deimhnigh", "info": "Faisnéis", "cancel": "{{common.cancel}}", - "ok": "Ceart go leor" - }, - "browse-authors": { - "title": "Brabhsáil Údair & Scríbhneoirí", - "author-count": "{{num}} Daoine", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" + "ok": "Ceart go leor", + "prompt": "Ceist" }, "person-detail": { "known-for-title": "Aitheanta do", @@ -2485,7 +2460,7 @@ "role-label": "Ról", "mal-id-label": "MAL Id", "anilist-id-label": "AniList Id", - "hardcover-id-label": "Hardcover Id", + "hardcover-id-label": "Id Clúdaigh Chrua", "asin-label": "ASIN", "description-label": "Cur síos", "save": "{{common.save}}", @@ -2531,7 +2506,7 @@ "match-series-modal": { "save": "{{common.save}}", "no-results": "Ní féidir meaitseáil a aimsiú. Bain triail as an url ó sholáthraí tacaithe a chur leis agus bain triail eile as.", - "query-label": "Ceist", + "query-label": "Fiosrúchán", "title": "Meaitseáil {{ seriesName}}", "description": "Roghnaigh meaitseáil chun meiteashonraí Kavita+ a athshreangú agus imeachtaí scrobble a athghiniúint. Is féidir Don't Match a úsáid chun Kavita a shrianadh ó mheiteashonraí a mheaitseáil agus scrobadh a dhéanamh.", "close": "{{common.close}}", @@ -2565,7 +2540,9 @@ "dont-match-status-label": "{{dont-match-label}}", "library-name-header": "Leabharlann", "actions-header": "Gníomhartha", - "match-alt": "Meaitseáil {{seriesName}}" + "match-alt": "Meaitseáil {{seriesName}}", + "matched-state-label": "Stát an Chomhoiriúnaithe", + "library-type": "Cineál Leabharlainne" }, "match-series-result-item": { "details": "Féach ar an leathanach", @@ -2690,5 +2667,146 @@ "src": "Cumaisc Duine", "title": "{{personName}}", "save": "{{common.save}}" + }, + "manage-reading-profiles": { + "selection-tip": "Roghnaigh próifíl ón liosta, nó cruthaigh ceann nua ag an mbarr ar dheis", + "delete": "{{common.delete}}", + "page-splitting-tooltip": "Conas íomhá lánleithid a roinnt (i.e. cuirtear na híomhánna clé agus deas le chéile)", + "auto-close-menu-label": "Dúnadh Uathoibríoch an Roghchláir", + "scaling-option-tooltip": "Conas an íomhá a scálú chuig do scáileán.", + "pdf-spread-mode-tooltip": "Leagan amach leathanaigh. Aonair nó dúbailte (corr/cothrom)", + "writing-style-tooltip": "Athraíonn sé treo an téacs. Is é an treo cothrománach ná ó chlé go deas, agus is é an treo ingearach ná ó bharr go bun.", + "reading-profile-library-settings-title": "Leabharlann", + "pdf-spread-mode-label": "Mód Scaipthe", + "layout-mode-book-tooltip": "Leagan amach an ábhair. Is é an scrollú an chaoi a bhfuil sé pacáilte sa leabhar. Oireann 1 nó 2 cholún d'airde an fheiste agus oireann sé do 1 nó 2 cholún téacs in aghaidh an leathanaigh", + "layout-mode-tooltip": "Rindreáil íomhá aonair ar an scáileán nó dhá íomhá taobh le taobh", + "color-theme-book-tooltip": "Cén téama datha atá le cur i bhfeidhm ar ábhar agus roghchlár an léitheora leabhar", + "layout-mode-label": "Mód Leagan Amach", + "description": "B’fhéidir nach léifear do shraitheanna uile ar an mbealach céanna, mar sin socraigh próifílí léitheoireachta ar leith in aghaidh an leabharlainne nó na sraithe chun go mbeidh sé chomh héasca agus is féidir filleadh ar do shraith.", + "profiles-title": "Do phróifílí léitheoireachta", + "default-profile": "Réamhshocrú", + "add": "{{common.add}}", + "add-tooltip": "Sábhálfar do phróifíl nua tar éis athrú a dhéanamh uirthi", + "make-default": "Socraigh mar réamhshocrú", + "image-reader-settings-title": "Léitheoir Íomhánna", + "scaling-option-label": "Roghanna Scálúcháin", + "page-splitting-label": "Scoilteadh Leathanaigh", + "reading-mode-label": "Mód Léitheoireachta", + "reading-mode-tooltip": "Athraigh an léitheoir chun leathanaigh a roinnt go hingearach, go cothrománach, nó scrolláil gan teorainn a bheith aige", + "background-color-tooltip": "Dath Cúlra an Léitheora Íomhá", + "auto-close-menu-tooltip": "Ar cheart go ndúnfadh an roghchlár go huathoibríoch", + "show-screen-hints-label": "Taispeáin Leideanna Scáileáin", + "show-screen-hints-tooltip": "Taispeáin forleagan chun cabhrú le limistéar agus treo na leathanaigh a thuiscint", + "emulate-comic-book-label": "Aithris leabhar grinn", + "emulate-comic-book-tooltip": "Cuireann éifeacht scátha i bhfeidhm chun léamh ó leabhar a aithris", + "swipe-to-paginate-label": "Svaidhpeáil chun leathanaigh a athrú", + "allow-auto-webtoon-reader-label": "Mód Léitheora Gréasáin Uathoibríoch", + "allow-auto-webtoon-reader-tooltip": "Athraigh go mód Léitheora Gréasáin má tá cuma gréasáin ar leathanaigh. D’fhéadfadh roinnt torthaí dearfacha bréagacha tarlú.", + "width-override-label": "{{manga-reader.width-override-label}}", + "reset": "{{common.reset}}", + "book-reader-settings-title": "Léitheoir Leabhar", + "tap-to-paginate-label": "Tapáil chun Leathanachú", + "tap-to-paginate-tooltip": "An gceadaíonn taobhanna scáileán an léitheora leabhar tapáil air chun bogadh go dtí an leathanach roimhe/an chéad leathanach eile", + "immersive-mode-label": "Mód Tumtha", + "immersive-mode-tooltip": "Cuirfidh sé seo an roghchlár i bhfolach taobh thiar de chliceáil ar an doiciméad léitheora agus casfaidh sé sconna chun leathanach a chur ar siúl", + "reading-direction-book-label": "Treo Léitheoireachta", + "reading-direction-book-tooltip": "Treo le cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Deas go Clé go gcliceálann tú ar thaobh na láimhe clé den scáileán chun bogadh go dtí an chéad leathanach eile.", + "font-family-label": "Teaghlach Clónna", + "writing-style-label": "Stíl Scríbhneoireachta", + "layout-mode-book-label": "Mód Leagan Amach", + "font-family-tooltip": "Teaghlach clónna le luchtú. Luchtófar cló réamhshocraithe an leabhair leis an rogha réamhshocraithe", + "color-theme-book-label": "Téama Dathanna", + "font-size-book-label": "Méid Cló", + "font-size-book-tooltip": "Céatadán den scálú le cur i bhfeidhm ar an gcló sa leabhar", + "line-height-book-label": "Spásáil Líne", + "line-height-book-tooltip": "Cé mhéad spás idir línte an leabhair", + "margin-book-label": "Corrlach", + "pdf-reader-settings-title": "Léitheoir PDF", + "pdf-scroll-mode-label": "Mód Scrollaigh", + "reading-profile-series-settings-title": "Sraith", + "pdf-theme-label": "Téama", + "no-selected": "Níl aon phróifíl roghnaithe", + "reading-direction-label": "Treo Léitheoireachta", + "reading-direction-tooltip": "Treo le cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Deas go Clé go gcliceálann tú ar thaobh na láimhe clé den scáileán chun bogadh go dtí an chéad leathanach eile.", + "extra-tip": "Sannadh próifílí léitheoireachta tríd an roghchlár gníomhaíochta ar shraitheanna agus ar leabharlanna, nó i mórchóir. Agus socruithe á n-athrú i léitheoir, cruthaítear próifíl fholaithe a chuimhníonn ar do roghanna don tsraith sin (ní do pdfanna). Baintear an phróifíl seo nuair a shannann tú ceann de do phróifílí léitheoireachta féin don tsraith. Is féidir tuilleadh eolais a fháil ar an", + "confirm": "An bhfuil tú cinnte gur mian leat an phróifíl léitheoireachta {{name}} a scriosadh?", + "margin-book-tooltip": "Cé mhéad spásála ar gach taobh den scáileán. Sáróidh sé seo go 0 ar ghléasanna soghluaiste beag beann ar an socrú seo.", + "swipe-to-paginate-tooltip": "An gcuirfí an leathanach seo chugainn nó an leathanach roimhe sin i ngníomh mar gheall ar shlaipeadh ar an scáileán?", + "pdf-theme-tooltip": "Téama dathanna an léitheora", + "background-color-label": "Dath an Chúlra", + "pdf-scroll-mode-tooltip": "Conas a scrollaíonn tú trí leathanaigh. Ingearach/Cothrománach agus Tapáil chun Leathanachú (gan scrolláil)", + "width-override-tooltip": "Sáraigh leithead na n-íomhánna sa léitheoir", + "wiki-title": "vicí", + "disable-width-override-label": "Díchumasaigh sárú leithead", + "disable-width-override-tooltip": "Cosc a chur ar an sárú leithead ó bheith i bhfeidhm nuair a bhíonn do scáileán ar a laghad ag an bpointe briste cumraithe nó níos lú" + }, + "bulk-set-reading-profile-modal": { + "filter-label": "{{common.filter}}", + "clear": "{{common.clear}}", + "close": "{{common.close}}", + "no-data": "Níl aon bhailiúcháin cruthaithe fós", + "create": "{{common.create}}", + "bound": "Ceangailte", + "title": "Socraigh próifíl Léitheoireachta", + "loading": "{{common.loading}}" + }, + "browse-people": { + "author-count": "{{num}} Daoine", + "cover-image-description": "{{edit-series-modal.cover-image-description}}", + "issue-count": "{{common.issue-count}}", + "series-count": "{{common.series-count}}", + "sort-label": "Sórtáil", + "name-label": "Ainm", + "series-count-label": "Líon na Sraitheanna", + "roles-label": "Róil", + "title": "Brabhsáil Daoine", + "issue-count-label": "Líon na nEisiúintí" + }, + "browse-genres": { + "series-count": "{{common.series-count}}", + "genre-count": "Seánraí {{num}}", + "issue-count": "{{common.issue-count}}", + "title": "Brabhsáil Seánraí" + }, + "browse-tags": { + "title": "Brabhsáil Clibeanna", + "genre-count": "Clibeanna {{num}}", + "series-count": "{{common.series-count}}", + "issue-count": "{{common.issue-count}}" + }, + "browse-title-pipe": { + "publication-status": "Saothar {{value}}", + "user-rating": "Rátáil réalta {{value}}", + "tag": "Tá Clib {{value}} aige", + "character": "Tá carachtar {{value}} ann", + "editor": "Eagarthóireacht déanta ag {{value}}", + "letterer": "Litrithe ag {{value}}", + "penciller": "Pencilithe ag {{value}}", + "writer": "Scríofa ag {{value}}", + "genre": "Tá Seánra {{value}} aige", + "release-year": "Scaoilte i {{value}}", + "imprint": "Inphriontáil de {{value}}", + "library": "Laistigh de leabharlann {{value}}", + "team": "Foireann {{value}}", + "age-rating": "Rátáil {{value}}", + "publisher": "Foilsithe ag {{value}}", + "inker": "Dúigh le {{value}}", + "format": "Formáid {{value}}", + "translator": "Aistrithe ag {{value}}", + "colorist": "Daite ag {{value}}", + "location": "I suíomh {{value}}", + "artist": "Tarraingthe ag {{value}}" + }, + "generic-filter-field-pipe": { + "person-role": "Ról", + "person-series-count": "Líon na Sraitheanna", + "person-chapter-count": "Líon na gCaibidlí", + "person-name": "Ainm" + }, + "breakpoint-pipe": { + "never": "Choíche", + "mobile": "Soghluaiste", + "tablet": "Táibléad", + "desktop": "Deasc" } } diff --git a/UI/Web/src/assets/langs/hu.json b/UI/Web/src/assets/langs/hu.json index 53c9632cd..7fae9daef 100644 --- a/UI/Web/src/assets/langs/hu.json +++ b/UI/Web/src/assets/langs/hu.json @@ -25,7 +25,8 @@ "cancel": "{{common.cancel}}", "saving": "Mentés…", "update": "Frissítés", - "account-detail-title": "Fiók Részletei" + "account-detail-title": "Fiók Részletei", + "invalid-email-warning": "Érvénytelen email esetén a Kavita néhány funkciója zárolva lesz" }, "user-scrobble-history": { "title": "Feldolgozás történet", @@ -44,7 +45,10 @@ "not-applicable": "Nem alkalmazható", "processed": "Feldolgozva", "not-processed": "Nincs feldolgozva", - "special": "{{entity-title.special}}" + "special": "{{entity-title.special}}", + "scrobbling-disabled": "A scrobbling ki van kapcsolva a Fiók beállításaidban.", + "description": "Itt található minden a fiókodhoz tartozó srobble esemény. Ahhoz, hogy az események létrejöjjenek, be kell állítanod egy scrobble szolgáltatót. A feldolgozott események egy hónap után törlődnek. Ha vannak fel nem dolgozott események, azok adatait valószínűleg nem sikerült egyeztetni a feltöltés során. Ilyen esetben vedd fel a kapcsolatot az adminoddal, hogy javításra kerüljenek.", + "token-expired": "Az AniList tokened lejárt! A scrobble események nem kerülnek feldolgozásra, amíg a Fiókok oldalon nem frissíted." }, "scrobble-event-type-pipe": { "chapter-read": "Olvasás folyamata", @@ -66,7 +70,8 @@ "your-review": "A te áttekintésed", "external-review": "Külső áttekintés", "local-review": "Helyi áttekintés", - "rating-percentage": "Értékelés {{r}}%" + "rating-percentage": "Értékelés {{r}}%", + "critic": "kritikus" }, "want-to-read": { "title": "Olvasandó", @@ -82,7 +87,6 @@ "stats-tab": "{{tabs.stats-tab}}", "scrobbling-tab": "{{tabs.scrobbling-tab}}", "smart-filters-tab": "{{tabs.smart-filters-tab}}", - "background-color-label": "Háttérszín", "reset": "{{common.reset}}", "save": "{{common.save}}", "locale-tooltip": "Kavita által használt nyelv", @@ -91,7 +95,19 @@ "disable-animations-tooltip": "Oldalon lévő animációk kikapcsolása. Hasznos az e-ink olvasóknak.", "prompt-on-download-label": "Letöltés esetében kérdezzen", "prompt-on-download-tooltip": "Kérdezzen, amikor a letöltés mérete túlhaladja a {{size}}MB-ot", - "collapse-series-relationships-label": "Sorozat Kapcsolatok Összezárása" + "collapse-series-relationships-label": "Sorozat Kapcsolatok Összezárása", + "title": "Felhasználó irányítópultja", + "page-layout-mode-label": "Oldal elrendezési mód", + "global-settings-title": "Globális beállítások", + "blur-unread-summaries-tooltip": "Elmossa a kötetek vagy fejezetek összefoglaló szövegét, ha még nem olvastad (a spoilerek elkerülése érdekében)", + "kavitaplus-settings-title": "Kavita+", + "page-layout-mode-tooltip": "Elemek mutatása kártyákként vagy listanézetben a Sorozat részletei oldalon.", + "anilist-scrobbling-tooltip": "Scrobble (egyirányú szinkronizáció) engedélyezése a Kavitából az AniList felé (olvasási előrehaladottság és kritikák)", + "pref-description": "Ezek olyan globális beállítások, melyek a fiókodhoz vannak rendelve.", + "success-toast": "Felhasználó beállításai frissítve", + "locale-label": "Nyelv", + "anilist-scrobbling-label": "AniList Scrobbling", + "want-to-read-sync-label": "Olvasási várólista szinkronizálás" }, "user-holds": { "no-data": "{{typeahead.no-data}}" @@ -721,5 +737,18 @@ }, "actionable": { "clear": "{{common.clear}}" + }, + "reviews": { + "user-reviews-local": "Helyi kritikák", + "user-reviews-plus": "Külsős kritikák" + }, + "review-modal": { + "title": "Kritika szerkesztése", + "review-label": "Kritika", + "close": "{{common.close}}", + "save": "{{common.save}}", + "min-length": "A kritika minimum {{count}} karakter hosszúságú kell legyen", + "delete": "{{common.delete}}", + "required": "{{validation.required-field}}" } } diff --git a/UI/Web/src/assets/langs/id.json b/UI/Web/src/assets/langs/id.json index 5843bf7da..490cd5f9f 100644 --- a/UI/Web/src/assets/langs/id.json +++ b/UI/Web/src/assets/langs/id.json @@ -83,39 +83,6 @@ "collapse-series-relationships-tooltip": "Haruskah Kavita menampilkan Seri yang tidak memiliki hubungan atau yang merupakan induk/prekuel", "share-series-reviews-label": "Bagikan Ulasan Seri", "share-series-reviews-tooltip": "Haruskah Kavita menyertakan ulasan Anda tentang Seri untuk pengguna lain", - "image-reader-settings-title": "Pembaca Gambar", - "reading-direction-label": "Orientasi Baca", - "reading-direction-tooltip": "Arah untuk mengklik agar beralih ke halaman berikutnya. Dari Kanan ke Kiri berarti Anda mengklik pada sisi kiri layar untuk beralih ke halaman berikutnya.", - "scaling-option-label": "Opsi Skala", - "scaling-option-tooltip": "Bagaimana cara menyesuaikan skala gambar ke layar Anda.", - "page-splitting-label": "Pemisahan Halaman", - "page-splitting-tooltip": "Bagaimana cara memisahkan gambar yang lebarnya penuh (gambar kiri dan kanan digabungkan)", - "reading-mode-label": "Mode Membaca", - "layout-mode-label": "Mode Tata Letak", - "layout-mode-tooltip": "Tampilkan satu gambar ke layar atau dua gambar berdampingan", - "background-color-label": "Warna Latar Belakang", - "auto-close-menu-label": "Tutup Menu Otomatis", - "show-screen-hints-label": "Tampilkan Petunjuk Layar", - "emulate-comic-book-label": "Emulasikan buku komik", - "swipe-to-paginate-label": "Geser untuk Memutar Halaman", - "book-reader-settings-title": "Pembaca Buku", - "tap-to-paginate-label": "Ketuk untuk Memutar Halaman", - "tap-to-paginate-tooltip": "Haruskan sisi layar pembaca buku bisa diketuk untuk pindah ke halaman sebelumnya/berikutnya", - "immersive-mode-label": "Mode Imersif", - "immersive-mode-tooltip": "Ini akan menyembunyikan menu dengan mengklik dokumen pembaca dan mengaktifkan ketuk untuk memutar halaman", - "reading-direction-book-label": "Arah Baca", - "reading-direction-book-tooltip": "Cara mengklik untuk beralih ke halaman berikutnya. Dari Kanan ke Kiri berarti mengklik di sisi kiri layar.", - "font-family-label": "Jenis Font", - "font-family-tooltip": "Jenis Font untuk dimuat. Bawaan akan memuat font bawaan buku", - "writing-style-label": "Gaya Penulisan", - "writing-style-tooltip": "Mengubah arah teks. Horizontal dari kiri ke kanan, vertikal dari atas ke bawah.", - "layout-mode-book-label": "Mode Tata Letak", - "layout-mode-book-tooltip": "Bagaimana konten harus ditata. Gulir itu sesuai dengan bawaan buku. 1 atau 2 Kolom itu sesuai dengan tinggi perangkat dan dimuat dalam 1 atau 2 kolom teks per halaman", - "color-theme-book-label": "Warna Tema", - "color-theme-book-tooltip": "Warna tema apa yang akan diterapkan pada konten pembaca buku dan menu", - "font-size-book-label": "Ukuran Font", - "line-height-book-label": "Jarak Baris", - "line-height-book-tooltip": "Berapa banyak spasi antara baris dalam buku", "reset": "{{common.reset}}", "save": "{{common.save}}" }, diff --git a/UI/Web/src/assets/langs/it.json b/UI/Web/src/assets/langs/it.json index bfee2d3c8..98fa183dd 100644 --- a/UI/Web/src/assets/langs/it.json +++ b/UI/Web/src/assets/langs/it.json @@ -106,63 +106,14 @@ "collapse-series-relationships-tooltip": "Kavita dovrebbe mostrare serie che non hanno relazioni o è il genitore", "share-series-reviews-label": "Condividi le recensioni della serie", "share-series-reviews-tooltip": "Kavita dovrebbe includere le tue recensioni di serie per altri utenti", - "image-reader-settings-title": "Lettore di immagini", - "reading-direction-label": "Direzione Lettura", - "reading-direction-tooltip": "Direzione da cliccare per passare alla pagina successiva. Da destra a sinistra significa che fai clic sul lato sinistro dello schermo per passare alla pagina successiva.", - "scaling-option-label": "Opzioni di ridimensionamento", - "scaling-option-tooltip": "Come ridimensionare l'immagine sullo schermo.", - "page-splitting-label": "Divisione pagine", - "page-splitting-tooltip": "Come dividere un'immagine a tutta larghezza (cioè entrambe le immagini sinistra e destra sono combinate)", - "reading-mode-label": "Modalità lettura", - "layout-mode-label": "Modalità Layout", - "layout-mode-tooltip": "Renderizza una singola immagine sullo schermo o due immagini affiancate", - "background-color-label": "Colore di sfondo", - "auto-close-menu-label": "Menu di chiusura automatica", - "show-screen-hints-label": "Mostra suggerimenti sullo schermo", - "emulate-comic-book-label": "Emula fumetto", - "swipe-to-paginate-label": "Scorri per impaginare", - "book-reader-settings-title": "Lettore di Libri", - "tap-to-paginate-label": "Tocca per impaginare", - "tap-to-paginate-tooltip": "Se i lati dello schermo del lettore di libri consentono di toccarlo per passare alla pagina precedente/successiva", - "immersive-mode-label": "Modalità Immersiva", - "immersive-mode-tooltip": "Questo nasconderà il menu. Un clic sulla pagina del lettore e si attiverà il \"tocca per impaginare\"", - "reading-direction-book-label": "Direzione di lettura", - "reading-direction-book-tooltip": "Direzione da cliccare per passare alla pagina successiva. Da destra a sinistra significa che fai clic sul lato sinistro dello schermo per passare alla pagina successiva.", - "font-family-label": "Tipologia di Font", - "font-family-tooltip": "Tipologia di caratteri da caricare. Predefinito caricherà il carattere predefinito del libro", - "writing-style-label": "Stile di Scrittura", - "writing-style-tooltip": "Cambia la direzione del testo. Orizzontale è da sinistra a destra, verticale è dall'alto verso il basso.", - "layout-mode-book-label": "Modalità di disposizione delle pagine", - "layout-mode-book-tooltip": "Come devono essere strutturati i contenuti. Sfoglia è come lo presenta il libro. 1 o 2 colonne adatta all'altezza del dispositivo ed utilizza 1 o 2 colonne di testo per pagina", - "color-theme-book-label": "Tema Colore", - "color-theme-book-tooltip": "Quale tema applicare al contenuto e al menu del lettore di libri", - "font-size-book-label": "Dimensioni del carattere", - "line-height-book-label": "Spaziatura interlinea", - "line-height-book-tooltip": "Quanta spaziatura tra le righe del libro", - "margin-book-label": "Margine", - "margin-book-tooltip": "Quanto margine lasciare su ciascun lato dello schermo. Sui dispositivi mobili verrà ignorato il valore, indipendentemente da questo settaggio.", - "pdf-reader-settings-title": "Lettore PDF", - "pdf-scroll-mode-label": "Modalità Scorrimento", - "pdf-scroll-mode-tooltip": "Come scorrere le pagine. Verticalmente/Orizzontalmente e Premi per cambiare pagina (nessuno scorrimento)", - "pdf-spread-mode-label": "Modalità Due Pagine", - "pdf-spread-mode-tooltip": "Come dovrebbero essere disposte le pagine. Singole o doppie (pari/dispari)", - "pdf-theme-label": "Tema", "clients-opds-alert": "OPDS non è abilitato su questo server. Ciò non influirà sugli utenti Tachiyomi.", "clients-opds-description": "Tutti i client di terze parti utilizzeranno la chiave API o l'URL di connessione di seguito. Sono come password, tienile private.", "clients-api-key-tooltip": "La chiave API è come una password. Reimpostandolo, tutti i client esistenti verranno invalidati.", "clients-opds-url-tooltip": "Visualizza un elenco dei client OPDS supportati: ", "reset": "{{common.reset}}", "save": "{{common.save}}", - "reading-mode-tooltip": "Cambia il lettore per impaginare verticalmente, orizzontalmente o avere uno scorrimento infinito", - "show-screen-hints-tooltip": "Mostra una sovrapposizione per aiutare a comprendere l'area e la direzione della paginazione", - "emulate-comic-book-tooltip": "Applica un effetto ombra per emulare la lettura di un libro", - "swipe-to-paginate-tooltip": "Lo scorrimento sullo schermo dovrebbe causare l'attivazione della pagina successiva o precedente", - "pdf-theme-tooltip": "Tema colore del lettore", "clients-opds-url-label": "URL OPDS", "clients-api-key-label": "Chiave API", - "background-color-tooltip": "Colore di sfondo del lettore di immagini", - "auto-close-menu-tooltip": "Il menu dovrebbe chiudersi automaticamente", - "font-size-book-tooltip": "Percentuale di ridimensionamento da applicare al font nel libro", "kavitaplus-settings-title": "Kavita+", "anilist-scrobbling-tooltip": "Permetti a Kavita di fare Scrobble (sincronizzazione unidirezionale) sul progresso della lettura e sulle valutazioni verso AniList", "anilist-scrobbling-label": "Scrobbling AniList", @@ -840,8 +791,7 @@ "donate-tooltip": "Puoi rimuoverlo iscrivendoti a Kavita+", "back": "Indietro", "more": "Altro", - "customize": "{{settings.customize}}", - "browse-authors": "Sfoglia gli Autori" + "customize": "{{settings.customize}}" }, "library-settings-modal": { "close": "{{common.close}}", @@ -1593,7 +1543,6 @@ }, "manga-reader": { "back": "Indietro", - "save-globally": "Salva Globalmente", "incognito-alt": "La modalità di navigazione in incognito è attiva. Attiva/disattiva per disattivare.", "incognito-title": "Modalità Incognito:", "shortcuts-menu-alt": "Scorciatoie da tastiera modale", @@ -1626,7 +1575,6 @@ "layout-mode-switched": "La modalità layout è passata a Singola a causa dello spazio insufficiente per eseguire il rendering del layout doppio", "no-next-chapter": "Nessun prossimo capitolo", "no-prev-chapter": "Nessun capitolo precedente", - "user-preferences-updated": "Preferenze utente aggiornate", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "series-progress": "Avanzamento della serie: {{percentage}}", "off": "Spegni", @@ -2501,11 +2449,6 @@ "info-tab": "Info", "metadata-tab": "Metadati" }, - "browse-authors": { - "title": "Sfoglia Autori e Scrittori", - "author-count": "{{num}} Persone", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "edit-person-modal": { "title": "{{personName}} Dettagli", "general-tab": "{{edit-series-modal.general-tab}}", diff --git a/UI/Web/src/assets/langs/ja.json b/UI/Web/src/assets/langs/ja.json index 0aa935eee..5e8196f91 100644 --- a/UI/Web/src/assets/langs/ja.json +++ b/UI/Web/src/assets/langs/ja.json @@ -105,55 +105,6 @@ "collapse-series-relationships-tooltip": "Kavita上で関連するシリーズを表示する", "share-series-reviews-label": "レビューを共有する", "share-series-reviews-tooltip": "Kavitaはレビューを他のユーザーに共有する", - "image-reader-settings-title": "画像リーダー", - "reading-direction-label": "綴じ方向", - "reading-direction-tooltip": "次のページに進む場合のクリック場所。右から左にめくる場合は左端をクリックする。", - "scaling-option-label": "スケーリング設定", - "scaling-option-tooltip": "画像の表示を画面に合わせる方法。", - "page-splitting-label": "ページ分割", - "page-splitting-tooltip": "分割されたページを見開きとして表示する", - "reading-mode-label": "読書モード", - "reading-mode-tooltip": "リーダーを垂直に、水平方向に、または無限スクロールを持つように変更", - "layout-mode-label": "レイアウトモード", - "layout-mode-tooltip": "画面に単一の画像をレンダリングするか、横に並べた2つの画像をレンダリングします", - "background-color-label": "背景色", - "background-color-tooltip": "画像リーダーの背景色", - "auto-close-menu-label": "オートクローズメニュー", - "auto-close-menu-tooltip": "メニュー自動閉鎖", - "show-screen-hints-label": "画面ヒントを表示する", - "show-screen-hints-tooltip": "パジネーションエリアと方向を理解するためのオーバーレイを表示", - "emulate-comic-book-label": "コミックのエミュレート", - "emulate-comic-book-tooltip": "書籍から読書をエミュレートする影効果を適用", - "swipe-to-paginate-label": "スワイプでめくる", - "swipe-to-paginate-tooltip": "画面上にスワイプすると、次のページまたは前のページがトリガーされるようになります", - "book-reader-settings-title": "ブックリーダー", - "tap-to-paginate-label": "タップしてめくる", - "tap-to-paginate-tooltip": "画面の端をタップして前/次のページに移動できるようにする", - "immersive-mode-label": "没入モード", - "immersive-mode-tooltip": "リーダードキュメント上のクリックでメニューを非表示にし､タップでページ送りが有効になります", - "reading-direction-book-label": "読書方向", - "reading-direction-book-tooltip": "次のページに移動するにはどちらをクリックしますか？右から左の場合は、次のページに移動するために画面の左側をクリックします。", - "font-family-label": "フォントファミリー", - "font-family-tooltip": "フォントファミリーを読み込みます。デフォルトでは、本のデフォルトのフォントが読み込まれます", - "writing-style-label": "ライティングスタイル", - "writing-style-tooltip": "縦書き､横書きを切り替えます｡水平は左から右、垂直は上から下です。", - "layout-mode-book-label": "レイアウトモード", - "layout-mode-book-tooltip": "コンテンツの表示方法を選択します。\"Scroll\"は本のままスクロール表示されます。1または2列はデバイスの高さに合わせ、1ページに1または2列のテキストが収まります", - "color-theme-book-label": "カラー テーマ:", - "color-theme-book-tooltip": "ブックリーダーのコンテンツとメニューに適用するカラーテーマ", - "font-size-book-label": "文字サイズ", - "font-size-book-tooltip": "本のフォントに適用するスケーリングの割合", - "line-height-book-label": "行間隔", - "line-height-book-tooltip": "書籍の行間の間隔", - "margin-book-label": "余白", - "margin-book-tooltip": "画面の各側面にどれだけの余白を設定しますか？この設定に関わらず、モバイルデバイスでは余白は0になります。", - "pdf-reader-settings-title": "PDFリーダー", - "pdf-scroll-mode-label": "スクロールモード", - "pdf-scroll-mode-tooltip": "ページをスクロールする方法 縦/横/タップでパギン(スクロールなし)", - "pdf-spread-mode-label": "見開き設定", - "pdf-spread-mode-tooltip": "ページのレイアウト。単一または見開き (奇数・偶数)", - "pdf-theme-label": "テーマ", - "pdf-theme-tooltip": "読者の色テーマ", "clients-opds-alert": "このサーバではOPDSが有効になっていません。 立ち読みユーザーには影響しません.", "clients-opds-description": "外部クライアントを使用する場合は以下のAPIもしくは接続用URLを使用してください｡これはパスワードのようなものであるため、公開しないでください。", "clients-api-key-tooltip": "API キーはパスワードのようになります。 リセットすると、既存のクライアントが無効になります.", @@ -1449,7 +1400,6 @@ }, "manga-reader": { "back": "戻る", - "save-globally": "グローバルに保存", "incognito-alt": "シークレットモードがオンです｡切り替えるとオフになります｡", "incognito-title": "シークレットモード:", "shortcuts-menu-alt": "キーボードショートカットモデル", @@ -1482,7 +1432,6 @@ "layout-mode-switched": "レイアウトモードが見開きレイアウトをレンダリングするのに十分な余白がないため、単一レイアウトに切り替えられました｡", "no-next-chapter": "次の章はありません", "no-prev-chapter": "前の章はありません", - "user-preferences-updated": "ユーザー環境設定を更新しました", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "series-progress": "シリーズの進捗: {{percentage}}" }, diff --git a/UI/Web/src/assets/langs/ko.json b/UI/Web/src/assets/langs/ko.json index 449fdcae2..42a181356 100644 --- a/UI/Web/src/assets/langs/ko.json +++ b/UI/Web/src/assets/langs/ko.json @@ -107,55 +107,6 @@ "collapse-series-relationships-tooltip": "Kavita는 관계가 없거나 상위/속편인 시리즈를 표시해야 합니까", "share-series-reviews-label": "시리즈 리뷰 공유", "share-series-reviews-tooltip": "Kavita에 다른 사용자를 위한 시리즈 리뷰를 포함합니까", - "image-reader-settings-title": "이미지 리더", - "reading-direction-label": "읽는 방향", - "reading-direction-tooltip": "다음 페이지로 이동할 때 클릭해야 하는 방향입니다. 오른쪽에서 왼쪽은 화면 왼쪽을 클릭하여 다음 페이지로 이동하는 것을 의미합니다.", - "scaling-option-label": "스케일링 옵션", - "scaling-option-tooltip": "화면에 맞게 이미지 크기를 조정하는 방법.", - "page-splitting-label": "페이지 분할", - "page-splitting-tooltip": "전체 너비 이미지를 분할하는 방법(예: 왼쪽 및 오른쪽 이미지가 모두 결합됨)", - "reading-mode-label": "읽기 모드", - "reading-mode-tooltip": "세로, 가로로 페이지를 매기거나 무한 스크롤이 가능하도록 리더를 변경하세요", - "layout-mode-label": "레이아웃 모드", - "layout-mode-tooltip": "단일 이미지를 화면에 렌더링하거나 두 개의 이미지를 나란히 렌더링합니다", - "background-color-label": "배경색", - "background-color-tooltip": "이미지 리더의 배경색", - "auto-close-menu-label": "자동 메뉴 닫기", - "auto-close-menu-tooltip": "메뉴가 자동으로 닫혀야 하나요", - "show-screen-hints-label": "화면에 힌트 표시", - "show-screen-hints-tooltip": "페이지 매기기 영역과 방향을 이해하는 데 도움이 되는 오버레이 표시", - "emulate-comic-book-label": "만화책 에뮬레이션", - "emulate-comic-book-tooltip": "책 읽기를 에뮬레이트하기 위해 그림자 효과를 적용합니다", - "swipe-to-paginate-label": "스와이프하여 페이지 넘김", - "swipe-to-paginate-tooltip": "화면을 스와이프하면 다음 페이지나 이전 페이지가 실행되어야 합니다", - "book-reader-settings-title": "북 리더", - "tap-to-paginate-label": "탭하여 페이지 넘김", - "tap-to-paginate-tooltip": "북 리더 화면의 측면을 탭하여 이전/다음 페이지로 이동할 수 있습니다", - "immersive-mode-label": "몰입 모드", - "immersive-mode-tooltip": "문서를 클릭하고 탭할 때 페이지 넘기기가 켜져 있으면 메뉴가 숨겨집니다", - "reading-direction-book-label": "읽는 방향", - "reading-direction-book-tooltip": "다음 페이지로 이동할 때 클릭해야 하는 방향입니다. 오른쪽에서 왼쪽은 화면 왼쪽을 클릭하여 다음 페이지로 이동하는 것을 의미합니다.", - "font-family-label": "글꼴", - "font-family-tooltip": "로드할 글꼴 모음입니다. 기본값은 책의 기본 글꼴을 로드합니다", - "writing-style-label": "작문 스타일", - "writing-style-tooltip": "텍스트의 방향을 변경합니다. 가로는 왼쪽에서 오른쪽으로, 세로는 위에서 아래로.", - "layout-mode-book-label": "레이아웃 모드", - "layout-mode-book-tooltip": "콘텐츠를 어떻게 배치할지 정합니다 스크롤은 책에 포함된 대로입니다. 1 또는 2 열은 장치의 높이에 맞게 페이지당 1 또는 2 열의 텍스트가 들어갑니다", - "color-theme-book-label": "색상 테마", - "color-theme-book-tooltip": "북 리더 콘텐츠 및 메뉴에 적용할 색상 테마", - "font-size-book-label": "글꼴 크기", - "font-size-book-tooltip": "책의 글꼴에 적용할 크기 조정 비율", - "line-height-book-label": "줄 간격", - "line-height-book-tooltip": "줄 사이의 간격", - "margin-book-label": "여백", - "margin-book-tooltip": "화면 양쪽의 간격입니다. 이 설정과 상관없이 모바일 장치에서는 0으로 재정의됩니다.", - "pdf-reader-settings-title": "PDF리더", - "pdf-scroll-mode-label": "스크롤 모드", - "pdf-scroll-mode-tooltip": "페이지를 스크롤하는 방법. 수직/수평 및 탭하여 페이지 매김(스크롤 없음)", - "pdf-spread-mode-label": "스프레드 모드", - "pdf-spread-mode-tooltip": "페이지를 배치하는 방법. 싱글 또는 더블(홀수/짝수)", - "pdf-theme-label": "테마", - "pdf-theme-tooltip": "리더의 색상 테마", "clients-opds-alert": "이 서버에서 OPDS를 사용할 수 없습니다. 이것은 Tachiyomi 사용자에게 영향을 미치지 않습니다.", "clients-opds-description": "모든 서드파티 클라이언트는 API 키 또는 아래의 연결 URL을 사용합니다. 이것은 암호와 같으므로 비공개로 유지하십시오.", "clients-api-key-tooltip": "API 키는 비밀번호와 같습니다. 재설정하면 기존 클라이언트가 모두 무효화됩니다.", @@ -168,9 +119,7 @@ "anilist-scrobbling-tooltip": "Kavita가 AniList에 읽기 진행 상황 및 평가를 스크로블(단방향 동기화)하도록 허용", "want-to-read-sync-label": "읽고 싶은 동기화", "want-to-read-sync-tooltip": "Kavita가 AniList 및 MAL의 보류 중인 읽기 목록에 있는 시리즈를 기반으로 '읽고 싶은 목록'에 항목을 추가하도록 허용합니다", - "kavitaplus-settings-title": "Kavita+", - "allow-auto-webtoon-reader-label": "자동 웹툰 리더 모드", - "allow-auto-webtoon-reader-tooltip": "페이지가 웹툰 형식으로 판단될 경우 웹툰 리더 모드로 전환합니다. 일부 잘못된 전환이 일어날 수 있습니다." + "kavitaplus-settings-title": "Kavita+" }, "user-holds": { "title": "스크러블 홀드", @@ -851,7 +800,6 @@ "back": "뒤로가기", "more": "더 보기", "customize": "{{settings.customize}}", - "browse-authors": "작가 찾아보기", "edit": "{{common.edit}}", "cancel-edit": "재정렬 닫기" }, @@ -1624,7 +1572,6 @@ }, "manga-reader": { "back": "뒤로가기", - "save-globally": "전역 설정", "incognito-alt": "시크릿 모드가 켜져 있습니다. 끄려면 전환하세요.", "incognito-title": "시크릿 모드:", "shortcuts-menu-alt": "키보드 단축키 모달", @@ -1659,7 +1606,6 @@ "layout-mode-switched": "이중 레이아웃을 렌더링할 공간이 부족하여 레이아웃 모드가 단일로 전환됨", "no-next-chapter": "다음 챕터 없음", "no-prev-chapter": "이전 챕터 없음", - "user-preferences-updated": "사용자 기본 설정 업데이트됨", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "series-progress": "시리즈 진행률: {{percentage}}" }, @@ -2455,11 +2401,6 @@ "cancel": "{{common.cancel}}", "ok": "Ok" }, - "browse-authors": { - "author-count": "{{num}} 사람", - "cover-image-description": "{{edit-series-modal.cover-image-description}}", - "title": "저자 및 작가 찾아보기" - }, "person-detail": { "known-for-title": "알려진", "individual-role-title": "{{role}} 로서", diff --git a/UI/Web/src/assets/langs/nl.json b/UI/Web/src/assets/langs/nl.json index 57f96555a..d9a3a4df1 100644 --- a/UI/Web/src/assets/langs/nl.json +++ b/UI/Web/src/assets/langs/nl.json @@ -106,41 +106,6 @@ "collapse-series-relationships-tooltip": "Moet Kavita series laten zien die geen relaties hebben of die geen ouder / prequel is", "share-series-reviews-label": "Deel serierecensies", "share-series-reviews-tooltip": "Moet Kavita jouw beoordelingen van Series voor andere gebruikers gebruiken", - "image-reader-settings-title": "Afbeeldingslezer", - "reading-direction-label": "Leesrichting", - "reading-direction-tooltip": "Richting om te klikken om naar de volgende pagina te gaan. Rechts naar links betekent dat u aan de linkerkant van het scherm klikt om naar de volgende pagina te gaan.", - "scaling-option-label": "Schaal opties", - "scaling-option-tooltip": "Hoe de afbeelding naar uw scherm te schalen.", - "page-splitting-label": "Pagina splitsen", - "page-splitting-tooltip": "Een afbeelding over de volledige breedte splitsen (dwz zowel de linker- als de rechterafbeelding worden gecombineerd)", - "reading-mode-label": "Leesmodus", - "layout-mode-label": "Lay-out Modus", - "layout-mode-tooltip": "Geef een enkele afbeelding of twee afbeeldingen naast elkaar weer", - "background-color-label": "Achtergrondkleur", - "auto-close-menu-label": "Menu automatisch sluiten", - "show-screen-hints-label": "Toon schermhints", - "emulate-comic-book-label": "Emuleer Stripverhaal", - "swipe-to-paginate-label": "Veeg om te bladeren", - "book-reader-settings-title": "Boekenlezer", - "tap-to-paginate-label": "Tik om te bladeren", - "tap-to-paginate-tooltip": "Tikken op de zijden van de lezen toestaan om te bladeren naar vorige/volgende pagina", - "immersive-mode-label": "Immersie-modus", - "immersive-mode-tooltip": "Hierdoor wordt het menu verborgen achter een klik op het lezerdocument en wordt de tik om te pagineren ingeschakeld", - "reading-direction-book-label": "Leesrichting", - "reading-direction-book-tooltip": "Richting waarin u klikt om naar de volgende pagina te gaan. Van rechts naar links betekent dat u aan de linkerkant van het scherm klikt om naar de volgende pagina te gaan.", - "font-family-label": "Lettertypefamilie", - "font-family-tooltip": "Lettertypefamilie om te laden. Standaard laadt het standaardlettertype van het boek", - "writing-style-label": "Schrijfstijl", - "writing-style-tooltip": "Verandert de richting van de tekst. Horizontaal is van links naar rechts, verticaal is van boven naar beneden.", - "layout-mode-book-label": "Lay-outmodus", - "layout-mode-book-tooltip": "Hoe de inhoud moet worden ingedeeld. Scroll is zoals het boek het verpakt. 1 of 2 kolommen passen bij de hoogte van het apparaat en er passen 1 of 2 kolommen tekst per pagina", - "color-theme-book-label": "Kleurenthema", - "color-theme-book-tooltip": "Welk kleurenthema moet worden toegepast op de inhoud en het menu van de boeklezer", - "font-size-book-label": "Lettertypegrootte", - "line-height-book-label": "Regelafstand", - "line-height-book-tooltip": "Hoeveel ruimte tussen de regels van het boek", - "margin-book-label": "Marge", - "margin-book-tooltip": "Hoeveel ruimte aan elke kant van het scherm. Dit overschrijft naar 0 op mobiele apparaten, ongeacht deze instelling.", "clients-opds-alert": "OPDS is niet ingeschakeld op deze server. Dit heeft geen invloed op Tachiyomi-gebruikers.", "clients-opds-description": "Alle externe clients gebruiken de API-sleutel of de onderstaande verbindings-URL. Dit zijn net wachtwoorden, houd het privé.", "clients-api-key-tooltip": "De API-sleutel is als een wachtwoord. Houd het geheim, houd het veilig.", @@ -1287,7 +1252,6 @@ }, "manga-reader": { "back": "Terug", - "save-globally": "Globaal opslaan", "incognito-alt": "De incognitomodus staat aan. Schakel om uit te schakelen.", "incognito-title": "Incognito modus:", "shortcuts-menu-alt": "Sneltoetsen Modaal", @@ -1319,7 +1283,6 @@ "layout-mode-switched": "De lay-outmodus is overgeschakeld naar Enkel omdat er onvoldoende ruimte is om een dubbele lay-out weer te geven", "no-next-chapter": "Geen volgend hoofdstuk", "no-prev-chapter": "Geen vorig hoofdstuk", - "user-preferences-updated": "Gebruikersvoorkeuren bijgewerkt", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}" }, "metadata-filter": { diff --git a/UI/Web/src/assets/langs/pl.json b/UI/Web/src/assets/langs/pl.json index 654b6dcb4..8f242ef94 100644 --- a/UI/Web/src/assets/langs/pl.json +++ b/UI/Web/src/assets/langs/pl.json @@ -106,55 +106,6 @@ "collapse-series-relationships-tooltip": "Czy Kavita powinna pokazywać serie, które nie mają powiązań lub są rodzicem/prequelem", "share-series-reviews-label": "Udostępnij recenzje serii", "share-series-reviews-tooltip": "Czy Kavita powinna udostępniać Twoje recenzje serii innym użytkownikom?", - "image-reader-settings-title": "Czytnik obrazów", - "reading-direction-label": "Kierunek czytania", - "reading-direction-tooltip": "Kierunek kliknięcia, aby przejść do następnej strony. Od prawej do lewej oznacza, że należy kliknąć po lewej stronie ekranu, aby przejść do następnej strony.", - "scaling-option-label": "Opcje skalowania", - "scaling-option-tooltip": "Jak skalować obraz do ekranu.", - "page-splitting-label": "Podział stron", - "page-splitting-tooltip": "Jak podzielić obraz o pełnej szerokości (tj. połączyć lewy i prawy obraz)", - "reading-mode-label": "Tryb czytania", - "reading-mode-tooltip": "Zmień czytnik na podział stron pionowo, poziomo lub na nieskończone przewijanie", - "layout-mode-label": "Rodzaj układu", - "layout-mode-tooltip": "Wyświetlaj pojedynczy obraz na ekranie lub dwa obrazy obok siebie", - "background-color-label": "Kolor tła", - "background-color-tooltip": "Kolor tła czytnika obrazów", - "auto-close-menu-label": "Automatyczne zamknięcie menu", - "auto-close-menu-tooltip": "Automatyczne zamykanie menu", - "show-screen-hints-label": "Wyświetlaj podpowiedzi", - "show-screen-hints-tooltip": "Pokaż nakładkę aby lepiej zobrazować strefy paginacji i kierunek czytania", - "emulate-comic-book-label": "Naśladuj komiks", - "emulate-comic-book-tooltip": "Dodaje efekt cienia, aby imitować czytanie z książki", - "swipe-to-paginate-label": "Przesuń, aby zmienić stronę", - "swipe-to-paginate-tooltip": "Czy przesunięcie palcem po ekranie powinno powodować przejście do następnej lub poprzedniej strony", - "book-reader-settings-title": "Czytnik książek", - "tap-to-paginate-label": "Stuknij aby zmienić stronę", - "tap-to-paginate-tooltip": "Czy boki ekranu czytnika książek powinny umożliwiać dotknięcie go w celu przejścia do poprzedniej/następnej strony?", - "immersive-mode-label": "Tryb immersyjny", - "immersive-mode-tooltip": "Spowoduje to ukrycie menu po kliknięciu czytnika i włączenie funkcji podziału na strony", - "reading-direction-book-label": "Kierunek czytania", - "reading-direction-book-tooltip": "Kierunek kliknięcia, aby przejść do następnej strony. Od prawej do lewej oznacza, że należy kliknąć po lewej stronie ekranu, aby przejść do następnej strony.", - "font-family-label": "Rodzina czcionek", - "font-family-tooltip": "Rodzina czcionek do załadowania. Domyślna spowoduje załadowanie domyślnej czcionki książki", - "writing-style-label": "Kierunek tekstu", - "writing-style-tooltip": "Zmienia kierunek tekstu. Poziomo od lewej do prawej, pionowo od góry do dołu.", - "layout-mode-book-label": "Rodzaj układu", - "layout-mode-book-tooltip": "Jak powinna być ułożona treść. Przewijanie jest takie, jak w książce. 1 lub 2 kolumny dopasowują się do wysokości urządzenia i mieszczą 1 lub 2 kolumny tekstu na stronie", - "color-theme-book-label": "Kolor motywu", - "color-theme-book-tooltip": "Jaki motyw kolorystyczny zastosować do treści i menu czytnika książek?", - "font-size-book-label": "Rozmiar czcionki", - "font-size-book-tooltip": "Procent skalowania do zastosowania dla czcionki w książce", - "line-height-book-label": "Odstępy między wierszami", - "line-height-book-tooltip": "Jak duży odstęp między wierszami książki", - "margin-book-label": "Margines", - "margin-book-tooltip": "Odstępy po każdej stronie ekranu. Na urządzeniach mobilnych wartość ta zostanie zastąpiona wartością 0, niezależnie od tego ustawienia.", - "pdf-reader-settings-title": "Czytnik PDF", - "pdf-scroll-mode-label": "Tryb przewijania", - "pdf-scroll-mode-tooltip": "Sposób przewijania stron. Pionowo/poziomo i dotknij, aby zmienić stronę (bez przewijania)", - "pdf-spread-mode-label": "Tryb układu stron", - "pdf-spread-mode-tooltip": "Jak powinny być rozmieszczone strony. Pojedynczo lub podwójnie (zaczynając od nieparzystej/parzystej)", - "pdf-theme-label": "Motyw", - "pdf-theme-tooltip": "Motyw kolorystyczny czytnika", "clients-opds-alert": "OPDS nie jest włączony na tym serwerze. Nie będzie to miało wpływu na użytkowników Tachiyomi.", "clients-opds-description": "Wszystkie zewnętrzne aplikacje będą używać poniższego klucza API lub linku URL. Są one jak hasła, zachowa je w tajemnicy.", "clients-api-key-tooltip": "Klucz API jest jak hasło. Zresetowanie spowoduje unieważnienie wszystkich istniejących klientów.", @@ -167,9 +118,7 @@ "anilist-scrobbling-tooltip": "Pozwól Kavicie Scrobblować (synchronizacja jednostronna) postęp czytania i oceny do AniList", "anilist-scrobbling-label": "AniList Scrobbling", "want-to-read-sync-label": "Synchronizuj Chcę przeczytać", - "want-to-read-sync-tooltip": "Pozwól Kavicie na dodanie do twojej listy Chcę przeczytać na podstawie serii oczekujących na przeczytanie z AniList i MAL", - "allow-auto-webtoon-reader-label": "Automatyczny tryb czytnika Webtoon", - "allow-auto-webtoon-reader-tooltip": "Przełącz się w tryb czytnika webtoon, jeśli strony wyglądają jak webtoon. Mogą wystąpić błędne rozpoznania." + "want-to-read-sync-tooltip": "Pozwól Kavicie na dodanie do twojej listy Chcę przeczytać na podstawie serii oczekujących na przeczytanie z AniList i MAL" }, "user-holds": { "description": "To jest lista serii zarządzana przez użytkownika, które nie będą scrobblowane do zewnętrznych dostawców. Możesz usunąć serię w dowolnym momencie, a następne zdarzenie umożliwiające scrobblowanie (postęp czytania, ocena, status 'chcę przeczytać') wywoła scrobblowanie.", @@ -849,7 +798,6 @@ "back": "Wstecz", "more": "Więcej", "customize": "{{settings.customize}}", - "browse-authors": "Przeglądaj autorów", "edit": "{{common.edit}}", "cancel-edit": "Zamknij zmianę kolejności" }, @@ -1622,7 +1570,6 @@ }, "manga-reader": { "back": "Wstecz", - "save-globally": "Zapisz globalnie", "incognito-alt": "Tryb incognito jest włączony. Przełącz, aby go wyłączyć.", "incognito-title": "Tryb incognito:", "shortcuts-menu-alt": "Tryb skrótów klawiaturowych", @@ -1657,7 +1604,6 @@ "layout-mode-switched": "Tryb układu został przełączony na Pojedynczy z powodu niewystarczającej ilości miejsca do renderowania podwójnego układu", "no-next-chapter": "Brak następnego rozdziału", "no-prev-chapter": "Brak poprzedniego rozdziału", - "user-preferences-updated": "Zaktualizowano preferencje użytkownika", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "series-progress": "Postęp serii: {{percentage}}" }, @@ -2452,11 +2398,6 @@ "browse-person-by-role-title": "Wszystkie dzieła {{name}} jako {{role}}", "anilist-url": "{{edit-person-modal.anilist-tooltip}}" }, - "browse-authors": { - "cover-image-description": "{{edit-series-modal.cover-image-description}}", - "title": "Przeglądaj autorów i pisarzy", - "author-count": "{{num}} osób" - }, "confirm": { "confirm": "Potwierdź", "alert": "Uwaga", diff --git a/UI/Web/src/assets/langs/pt.json b/UI/Web/src/assets/langs/pt.json index 5acfea812..d4922b083 100644 --- a/UI/Web/src/assets/langs/pt.json +++ b/UI/Web/src/assets/langs/pt.json @@ -106,55 +106,6 @@ "collapse-series-relationships-tooltip": "O Kavita deve mostrar Séries que não tenham relações ou é o pai/prequela", "share-series-reviews-label": "Partilhar Críticas de Séries", "share-series-reviews-tooltip": "As suas críticas de Séries devem ser incluídas para outros utilizadores pelo Kavita", - "image-reader-settings-title": "Leitor de Imagens", - "reading-direction-label": "Direção de Leitura", - "reading-direction-tooltip": "Direção a clicar para ir para a próxima página. Direita para a Esquerda significa que se clica no lado esquerdo do ecrã para ir para a página seguinte.", - "scaling-option-label": "Opções de Dimensionamento", - "scaling-option-tooltip": "Como adaptar a dimensão da imagem ao seu ecrã.", - "page-splitting-label": "Separação de Páginas", - "page-splitting-tooltip": "Como separar uma imagem que ocupa a largura completa (p.e., as imagens esquerda e direita estão juntas numa só)", - "reading-mode-label": "Modo de Leitura", - "reading-mode-tooltip": "Alterar o leitor para paginar na vertical, na horizontal, ou ter um scroll infinito", - "layout-mode-label": "Modo de Exibição", - "layout-mode-tooltip": "Mostrar uma única imagem no ecrã ou mostrar duas imagens lado a lado", - "background-color-label": "Cor de Fundo", - "background-color-tooltip": "Cor de Fundo do Leitor de Imagens", - "auto-close-menu-label": "Fechar Menu Automaticamente", - "auto-close-menu-tooltip": "O menu deve fechar-se automaticamente?", - "show-screen-hints-label": "Mostrar Dicas no Ecrã", - "show-screen-hints-tooltip": "Mostrar uma indicação visual que ajude a perceber a área de paginação e a direção", - "emulate-comic-book-label": "Emular livro de BD", - "emulate-comic-book-tooltip": "Aplica um efeito de sobra para emular a leitura num livro", - "swipe-to-paginate-label": "Deslize para Paginar", - "swipe-to-paginate-tooltip": "O gesto de deslizar deve causar que a página seguinte ou anterior seja mostrada?", - "book-reader-settings-title": "Leitor de Livros", - "tap-to-paginate-label": "Toque para Paginar", - "tap-to-paginate-tooltip": "Se é permitido tocar nos lados do ecrã do leitor de livros para ir para a próxima/anterior página", - "immersive-mode-label": "Modo Imersivo", - "immersive-mode-tooltip": "O menu será escondido com um clique no documento e o toque para paginar ficará ativo", - "reading-direction-book-label": "Direção de Leitura", - "reading-direction-book-tooltip": "Direção a clicar para ir para a página seguinte. Direita para Esquerda significa que se clica no lado esquerdo do ecrã para ir para a página seguinte.", - "font-family-label": "Família de Fonte", - "font-family-tooltip": "Família de fonte a carregar. Por defeito será carregado a fonte do livro", - "writing-style-label": "Estilo de Escrita", - "writing-style-tooltip": "Muda a direção do texto. Horizontal é da esquerda para direita, vertical é do topo para o fundo.", - "layout-mode-book-label": "Modo de Exibição", - "layout-mode-book-tooltip": "Como o conteúdo deve ser exibido. A opção Scroll exibe de acordo com o definido no arquivo. As opções 1 ou 2 Colunas, ajustam à altura do dispositivo e mostram 1 ou 2 colunas de texto por página", - "color-theme-book-label": "Tema de Cor", - "color-theme-book-tooltip": "Que tema de cores aplicar ao conteúdo e menu do leitor de livros", - "font-size-book-label": "Tamanho de Fonte", - "font-size-book-tooltip": "Escala em percentagem a aplicar à fonte no livro", - "line-height-book-label": "Espaçamento Entre Linhas", - "line-height-book-tooltip": "Quanto espaçamento entre as linhas do livro", - "margin-book-label": "Margem", - "margin-book-tooltip": "Espaçamento em cada lado do ecrã. Nos dispositivos móveis o valor desta definição será sempre substituído por 0.", - "pdf-reader-settings-title": "Leitor de PDF", - "pdf-scroll-mode-label": "Modo de Rolagem", - "pdf-scroll-mode-tooltip": "Como rola pelas páginas. Vertical/Horizontal e toque para paginar (sem rolagem)", - "pdf-spread-mode-label": "Modo de Propagação", - "pdf-spread-mode-tooltip": "Como as páginas devem ser dispostas. Simples ou duplo (ímpar/par)", - "pdf-theme-label": "Tema", - "pdf-theme-tooltip": "Tema de cores do leitor", "clients-opds-alert": "O OPDS não está habilitado neste servidor. Isto não irá afectar os utilizadores do Tachiyomi.", "clients-opds-description": "Todos os clientes de terceiros utilizarão a chave de API ou URL abaixo. Estes elementos são semelhantes a palavras passe, mantenha-os privados.", "clients-api-key-tooltip": "A chave de API é como uma palavra passe. Se for redefinida, qualquer cliente existente será invalidado.", @@ -167,9 +118,7 @@ "want-to-read-sync-tooltip": "Permitir que o Kavita adicione itens à lista Leituras Futuras com base nas séries da lista de leitura Pendentes do AniList e/ou MAL", "anilist-scrobbling-tooltip": "Permitir que o Kavita faça Scrobble (sincronização unidirecional) do progresso das leituras e classificações para o AniList", "kavitaplus-settings-title": "Kavita+", - "anilist-scrobbling-label": "Scrobbling AniList", - "allow-auto-webtoon-reader-label": "Modo Automático do Leitor Webtoon", - "allow-auto-webtoon-reader-tooltip": "Muda para o modo Leitor Webtoon se as páginas parecem ser um webtoon. Podem acontecer falsos positivos." + "anilist-scrobbling-label": "Scrobbling AniList" }, "user-holds": { "title": "Retenções de Scrobble", @@ -849,7 +798,6 @@ "back": "Voltar", "more": "Mais", "customize": "{{settings.customize}}", - "browse-authors": "Explorar Autores", "edit": "{{common.edit}}", "cancel-edit": "Fechar Reordenar" }, @@ -1622,7 +1570,6 @@ }, "manga-reader": { "back": "Voltar", - "save-globally": "Guardar Globalmente", "incognito-alt": "O modo anónimo está ligado. Pressione novamente para desligar.", "incognito-title": "Modo Incógnito:", "shortcuts-menu-alt": "Modal de Atalhos de Teclado", @@ -1657,7 +1604,6 @@ "layout-mode-switched": "O modo de layout foi mudado para Individual por não haver espaço suficiente para mostrar o layout duplo", "no-next-chapter": "Não há Capítulo Seguinte", "no-prev-chapter": "Não há Capítulo Anterior", - "user-preferences-updated": "Preferência de utilizador atualizadas", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "series-progress": "Progresso da Série: {{percentage}}" }, @@ -2481,11 +2427,6 @@ "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}", "download-coversdb": "Descarregar de CoversDB" }, - "browse-authors": { - "author-count": "{{num}} Pessoas", - "cover-image-description": "{{edit-series-modal.cover-image-description}}", - "title": "Explorar Autores & Escritores" - }, "changelog-update-item": { "fixed": "Corrigido", "published-label": "Publicado: ", diff --git a/UI/Web/src/assets/langs/pt_BR.json b/UI/Web/src/assets/langs/pt_BR.json index bf6029d14..d4aa79571 100644 --- a/UI/Web/src/assets/langs/pt_BR.json +++ b/UI/Web/src/assets/langs/pt_BR.json @@ -83,7 +83,7 @@ }, "user-preferences": { "title": "Painel do Usuário", - "pref-description": "Essas são configurações globais vinculadas à sua conta.", + "pref-description": "Estas são configurações globais vinculadas à sua conta. As configurações do leitor estão localizadas em Perfis de Leitura.", "account-tab": "{{tabs.account-tab}}", "preferences-tab": "{{tabs.preferences-tab}}", "theme-tab": "{{tabs.theme-tab}}", @@ -107,55 +107,6 @@ "collapse-series-relationships-tooltip": "Kavita deve mostrar uma série que não tem relacionamentos ou é derivado/prequela", "share-series-reviews-label": "Compartilhar Análises de Séries", "share-series-reviews-tooltip": "Kavita deve incluir suas análises da série para outros usuários", - "image-reader-settings-title": "Leitor de Imagem", - "reading-direction-label": "Direção de Leitura", - "reading-direction-tooltip": "Direção para clicar para mover para a próxima página. Da direita para a esquerda significa que você clica no lado esquerdo da tela para ir para a próxima página.", - "scaling-option-label": "Opções de Escala", - "scaling-option-tooltip": "Como dimensionar a imagem para sua tela.", - "page-splitting-label": "Divisão de Página", - "page-splitting-tooltip": "Como dividir uma imagem de largura total (ou seja, as imagens esquerda e direita são combinadas)", - "reading-mode-label": "Modo de Leitura", - "reading-mode-tooltip": "Mude o leitor para paginar verticalmente, horizontalmente ou ter uma rolagem infinita", - "layout-mode-label": "Modo de Layout", - "layout-mode-tooltip": "Renderiza uma única imagem na tela ou duas imagens lado a lado", - "background-color-label": "Cor de Fundo", - "background-color-tooltip": "Cor de Fundo do Leitor de Imagens", - "auto-close-menu-label": "Fechar Automaticamente o Menu", - "auto-close-menu-tooltip": "O menu deve fechar automaticamente", - "show-screen-hints-label": "Mostrar Dicas na Tela", - "show-screen-hints-tooltip": "Mostrar uma sobreposição para entender a área e a direção da paginação", - "emulate-comic-book-label": "Emular quadrinhos", - "emulate-comic-book-tooltip": "Aplica um efeito de sombra para emular a leitura de um livro", - "swipe-to-paginate-label": "Deslizar para Paginar", - "swipe-to-paginate-tooltip": "Deslizar na tela deve fazer com que a página seguinte ou anterior seja acionada", - "book-reader-settings-title": "Leitor de Livro", - "tap-to-paginate-label": "Toque para Paginar", - "tap-to-paginate-tooltip": "Se as laterais da tela do leitor de livros permitirem tocar nela para ir para a página anterior/próxima", - "immersive-mode-label": "Modo Imersivo", - "immersive-mode-tooltip": "Isso ocultará o menu atrás de um clique no documento do leitor e gire o toque para paginar", - "reading-direction-book-label": "Direção de Leitura", - "reading-direction-book-tooltip": "Direção para clicar para ir para a próxima página. Da direita para a esquerda significa que você clica no lado esquerdo da tela para ir para a próxima página.", - "font-family-label": "Família da Fonte", - "font-family-tooltip": "Família de fontes para carregar. Padrão carregará a fonte padrão do livro", - "writing-style-label": "Estilo de Escrita", - "writing-style-tooltip": "Altera a direção do texto. Horizontal é da esquerda para a direita, vertical é de cima para baixo.", - "layout-mode-book-label": "Modo de Layout", - "layout-mode-book-tooltip": "Como o conteúdo deve ser apresentado. Rolar é como o livro o embala. 1 ou 2 colunas se ajustam à altura do dispositivo e 1 ou 2 colunas de texto por página", - "color-theme-book-label": "Cor do Tema", - "color-theme-book-tooltip": "Qual tema de cor aplicar ao conteúdo e ao menu do leitor de livros", - "font-size-book-label": "Tamanho da Fonte", - "font-size-book-tooltip": "Porcentagem de escala a ser aplicada à fonte do livro", - "line-height-book-label": "Espaçamento da Linha", - "line-height-book-tooltip": "Quanto espaçamento entre as linhas do livro", - "margin-book-label": "Margem", - "margin-book-tooltip": "Quanto espaçamento em cada lado da tela. Isso será substituído por 0 em dispositivos móveis, independentemente dessa configuração.", - "pdf-reader-settings-title": "Leitor de PDF", - "pdf-scroll-mode-label": "Modo de Rolagem", - "pdf-scroll-mode-tooltip": "Como você rola pelas páginas. Vertical/Horizontal e toque para paginar (sem rolagem)", - "pdf-spread-mode-label": "Modo de Propagação", - "pdf-spread-mode-tooltip": "Como as páginas devem ser dispostas. Simples ou duplo (ímpar/par)", - "pdf-theme-label": "Tema", - "pdf-theme-tooltip": "Tema de cores do leitor", "clients-opds-alert": "O OPDS não está ativado neste servidor. Isso não afetará os usuários do Tachiyomi.", "clients-opds-description": "Todos os clientes de terceiros usarão a chave de API ou o URL de conexão abaixo. Estas são como senhas, mantenha-as privadas.", "clients-api-key-tooltip": "A chave API é como uma senha. Redefini-lo invalidará todos os clientes existentes.", @@ -168,9 +119,7 @@ "anilist-scrobbling-label": "AniList Scrobbling", "anilist-scrobbling-tooltip": "Permitir que Kavita faça scrobble (sincronização unidirecional) de leitura e avaliações para o AniList", "want-to-read-sync-label": "Sincronizar Quero Ler", - "want-to-read-sync-tooltip": "Permitir que Kavita adicione itens à sua lista de Quero Ler com base em séries Anilist e Mal, pendentes na lista de leitura", - "allow-auto-webtoon-reader-label": "Modo de leitor automático de Webtoon", - "allow-auto-webtoon-reader-tooltip": "Mudar para o modo Leitor Webtoon se as páginas parecerem um webtoon. Podem ocorrer alguns falsos positivos." + "want-to-read-sync-tooltip": "Permitir que Kavita adicione itens à sua lista de Quero Ler com base em séries Anilist e Mal, pendentes na lista de leitura" }, "user-holds": { "title": "Paradas do Scrobble", @@ -680,7 +629,10 @@ "incognito-mode-label": "Modo Incógnito", "next": "Seguinte", "previous": "Anterior", - "go-to-page-prompt": "Existem {{totalPages}} páginas. Para qual página você quer ir?" + "go-to-page-prompt": "Existem {{totalPages}} páginas. Para qual página você quer ir?", + "go-to-section": "Ir para seção", + "go-to-section-prompt": "Existem {{totalSections}} seções. Para qual seção você deseja ir?", + "go-to-first-page": "Ir para a primeira página" }, "personal-table-of-contents": { "no-data": "Nada Marcado ainda", @@ -728,7 +680,7 @@ "series-detail": { "page-settings-title": "Configurações da Página", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "Cartão", "layout-mode-option-list": "Lista", "continue-from": "Continuar {{title}}", @@ -851,9 +803,9 @@ "back": "Voltar", "more": "Mais", "customize": "{{settings.customize}}", - "browse-authors": "Navegar pelos Autores", "edit": "{{common.edit}}", - "cancel-edit": "Fechar Reordenar" + "cancel-edit": "Fechar Reordenar", + "browse-people": "Navegar por Pessoas" }, "library-settings-modal": { "close": "{{common.close}}", @@ -916,30 +868,30 @@ }, "reader-settings": { "general-settings-title": "Configurações Gerais", - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", + "font-family-label": "{{manage-reading-profiles.font-family-label}}", + "font-size-label": "{{manage-reading-profiles.font-size-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", "reset-to-defaults": "Redefinir para os Padrões", "reader-settings-title": "Configurações do Leitor", - "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", + "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}", "right-to-left": "Direita para Esquerda", "left-to-right": "Esquerda para Direita", "horizontal": "Horizontal", "vertical": "Vertical", - "writing-style-label": "{{user-preferences.writing-style-label}}", + "writing-style-label": "{{manage-reading-profiles.writing-style-label}}", "writing-style-tooltip": "Altera a direção do texto. Horizontal é da esquerda para a direita, vertical é de cima para baixo.", "tap-to-paginate-label": "Toque em Paginação", "tap-to-paginate-tooltip": "Clique nas bordas da tela para paginar", "on": "Ligado", "off": "Desligado", - "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", + "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}", "immersive-mode-tooltip": "Isso ocultará o menu atrás de um clique no documento do leitor e gire o toque para paginar", "fullscreen-label": "Tela Cheia", "fullscreen-tooltip": "Põe o leitor no modo de tela cheia", "exit": "Sair", "enter": "Entrar", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-tooltip": "Scroll: Espelha o arquivo epub (geralmente uma longa página de rolagem por capítulo).
    1 Coluna: Cria uma única página virtual por vez.
    2 Colunas: Cria duas páginas virtuais por vez dispostas lado a lado.", "layout-mode-option-scroll": "Rolar", "layout-mode-option-1col": "1 Coluna", @@ -948,7 +900,15 @@ "theme-dark": "Escuro", "theme-black": "Preto", "theme-white": "Branco", - "theme-paper": "Papel" + "theme-paper": "Papel", + "update-parent": "Salvar em {{name}}", + "loading": "carregando", + "create-new": "Novo perfil do implícito", + "create-new-tooltip": "Criar um novo perfil gerenciável a partir do seu perfil implícito atual", + "reading-profile-updated": "Perfil de leitura atualizado", + "reading-profile-promoted": "Perfil de leitura promovido", + "line-spacing-min-label": "1x", + "line-spacing-max-label": "2.5x" }, "table-of-contents": { "no-data": "Este livro não tem um índice definido nos metadados ou um arquivo toc" @@ -1389,7 +1349,8 @@ "admin-email-history": "Histórico do e-mail", "admin-matched-metadata": "Metadados Correspondentes", "admin-manage-tokens": "Gerenciar Tokens do Usuário", - "admin-metadata": "Gerenciar Metadados" + "admin-metadata": "Gerenciar Metadados", + "reading-profiles": "Perfis de Leitura" }, "collection-detail": { "no-data": "Não há itens. Tente adicionar uma série.", @@ -1514,7 +1475,9 @@ "all-filters": "Filtros Inteligentes", "nav-link-header": "Opções de Navegação", "close": "{{common.close}}", - "person-aka-status": "Resultados como pseudônimos" + "person-aka-status": "Resultados como pseudônimos", + "browse-tags": "Navegar pelas Etiquetas", + "browse-genres": "Navegar pelos Gêneros" }, "promoted-icon": { "promoted": "{{common.promoted}}" @@ -1625,7 +1588,6 @@ }, "manga-reader": { "back": "Voltar", - "save-globally": "Salvar Globalmente", "incognito-alt": "O modo de navegação anônima está ativado. Alterne para desligar.", "incognito-title": "Modo Incógnito:", "shortcuts-menu-alt": "Modal de Atalhos de Teclado", @@ -1647,9 +1609,9 @@ "height": "Altura", "width": "Largura", "width-override-label": "Substituição de Largura", - "off": "Desligado", + "off": "{{reader-settings.off}}", "original": "Original", - "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", + "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}", "swipe-enabled-label": "Deslizar Ativado", "enable-comic-book-label": "Emular quadrinhos", "brightness-label": "Brilho", @@ -1660,9 +1622,14 @@ "layout-mode-switched": "Modo de layout alterado para Único devido a espaço insuficiente para renderizar layout duplo", "no-next-chapter": "Nenhum Capítulo A Seguir", "no-prev-chapter": "Nenhum Capítulo Anterior", - "user-preferences-updated": "Preferências de usuário atualizadas", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", - "series-progress": "Progresso das Séries: {{percentage}}" + "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}", + "series-progress": "Progresso das Séries: {{percentage}}", + "loading": "{{reader-settings.loading}}", + "create-new-tooltip": "{{reader-settings.create-new-tooltip}}", + "reading-profile-promoted": "Perfil de leitura promovido", + "update-parent": "{{reader-settings.update-parent}}", + "reading-profile-updated": "Perfil de leitura atualizado", + "create-new": "{{reader-settings.create-new}}" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -1719,7 +1686,10 @@ "release-year": "Ano de Lançamento", "read-progress": "Última Leitura", "average-rating": "Avaliação Média", - "random": "Aleatório" + "random": "Aleatório", + "person-name": "Nome", + "person-chapter-count": "Número de Capítulos", + "person-series-count": "Número de Séries" }, "edit-series-modal": { "title": "{{seriesName}} Detalhes", @@ -1856,8 +1826,8 @@ "cover-image-tab": "{{tabs.cover-tab}}", "tasks-tab": "{{tabs.tasks-tab}}", "info-tab": "{{tabs.info-tab}}", - "pages-label": "{{edit-chapter-modal.pages-count}}", - "words-label": "{{edit-chapter-modal.length-title}}", + "pages-label": "{{edit-chapter-modal.pages-label}}", + "words-label": "{{edit-chapter-modal.words-label}}", "pages-count": "{{edit-chapter-modal.pages-count}}", "words-count": "{{edit-chapter-modal.words-count}}", "reading-time-label": "{{edit-chapter-modal.reading-time-label}}", @@ -2078,7 +2048,7 @@ "reading-lists": "{{side-nav.reading-lists}}", "bookmarks": "{{side-nav.bookmarks}}", "all-series": "{{side-nav.all-series}}", - "browse-authors": "{{side-nav.browse-authors}}" + "browse-authors": "{{side-nav.browse-people}}" }, "filter-field-pipe": { "age-rating": "{{metadata-fields.age-rating-title}}", @@ -2254,7 +2224,9 @@ "webtoon-override": "Mudando para o modo Webtoon devido a imagens que representam um Webtoon.", "scrobble-gen-init": "Enfileirou uma tarefa para gerar eventos scrobble a partir do histórico de leitura e avaliações anteriores, sincronizando-os com serviços conectados.", "confirm-delete-multiple-volumes": "Tem certeza de que deseja excluir {{count}} volumes? Isso não modificará os arquivos no disco.", - "series-added-want-to-read": "Série adicionada da lista Quero Ler" + "series-added-want-to-read": "Série adicionada da lista Quero Ler", + "library-bound-to-reading-profile": "Biblioteca vinculada ao Perfil de Leitura {{name}}", + "series-bound-to-reading-profile": "Série vinculada ao Perfil de Leitura {{name}}" }, "read-time-pipe": { "less-than-hour": "<1 Hora", @@ -2330,7 +2302,13 @@ "reorder": "Reordenar", "rename-tooltip": "Renomear o Filtro Inteligente", "rename": "Renomear", - "merge": "Mesclar" + "merge": "Mesclar", + "reading-profiles": "Perfis de Leitura", + "clear-reading-profile": "Limpar Perfil de Leitura", + "clear-reading-profile-tooltip": "Limpar Perfil de Leitura para esta Biblioteca", + "cleared-profile": "Perfil de Leitura Limpo", + "set-reading-profile-tooltip": "Vincular um Perfil de Leitura a esta Biblioteca", + "set-reading-profile": "Definir Perfil de Leitura" }, "preferences": { "left-to-right": "Esquerda para Direita", @@ -2444,19 +2422,21 @@ "issue-num-shorthand": "#{{num}}", "volume-num-shorthand": "Vol. {{num}}", "book-nums": "Livros", - "issue-nums": "Números", + "issue-nums": "Edições", "chapter-nums": "Capítulos", "volume-nums": "Volumes", "author-count": "{{num}} Autores", "chapter-count": "{{num}} Capítulos", - "no-data": "Sem Dados" + "no-data": "Sem Dados", + "issue-count": "{{num}} Edições" }, "confirm": { "confirm": "Confirmar", "alert": "Alerta", "info": "Informações", "cancel": "{{common.cancel}}", - "ok": "Ok" + "ok": "Ok", + "prompt": "Questão" }, "edit-person-modal": { "cover-image-tab": "{{edit-series-modal.cover-image-tab}}", @@ -2485,11 +2465,6 @@ "aliases-tab": "Pseudônimos", "aliases-tooltip": "Quando uma série é etiquetada com um pseudônimo de uma pessoa, a pessoa é atribuída em vez de ser criada uma nova pessoa. Ao eliminar um pseudônimo, terá de voltar a analisar a série para que a alteração seja detectada." }, - "browse-authors": { - "author-count": "{{num}} Pessoas", - "title": "Navegar pelos Autores & Escritores", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "person-detail": { "browse-person-title": "Todas as obras de {{name}}", "browse-person-by-role-title": "Todos os trabalhos de {{name}} como {{role}}", @@ -2552,7 +2527,9 @@ "dont-match-status-label": "{{dont-match-label}}", "actions-header": "Ações", "match-alt": "Correspondente à {{seriesName}}", - "library-name-header": "Biblioteca" + "library-name-header": "Biblioteca", + "matched-state-label": "Estado da Correspondência", + "library-type": "Tipo de Biblioteca" }, "match-series-modal": { "description": "Selecione uma correspondência para religar os metadados do Kavita+ e regenerar eventos scrobble. Não Corresponde pode ser usado para impedir que Kavita corresponda a metadados e scrobbling.", @@ -2690,5 +2667,146 @@ "title": "{{personName}}", "merge-warning": "se prosseguir, a pessoa selecionada será removida. O nome da pessoa selecionada será adicionado como um pseudônimo e todas as suas funções serão transferidas.", "known-for-title": "Conhecido por" + }, + "manage-reading-profiles": { + "swipe-to-paginate-tooltip": "Ao deslizar na tela, a página seguinte ou anterior será acionada", + "no-selected": "Nenhum perfil selecionado", + "selection-tip": "Selecione um perfil da lista ou crie um novo no canto superior direito", + "reading-direction-label": "Direção da Leitura", + "scaling-option-label": "Opções de Escala", + "page-splitting-label": "Divisão de Página", + "reading-mode-label": "Modo de Leitura", + "layout-mode-tooltip": "Renderizar uma única imagem na tela ou duas imagens lado a lado", + "background-color-tooltip": "Cor de Fundo do Leitor de Imagem", + "auto-close-menu-label": "Fechar o Menu Automaticamente", + "auto-close-menu-tooltip": "O menu deve fechar automaticamente", + "show-screen-hints-tooltip": "Mostrar uma sobreposição para ajudar a entender a área de paginação e a direção", + "swipe-to-paginate-label": "Deslizar para Paginar", + "allow-auto-webtoon-reader-label": "Modo de Leitura Automática Webtoon", + "width-override-label": "{{manga-reader.width-override-label}}", + "reset": "{{common.reset}}", + "book-reader-settings-title": "Leitor de Livros", + "tap-to-paginate-label": "Toque para Paginar", + "immersive-mode-label": "Modo Imersivo", + "reading-direction-book-label": "Direção da Leitura", + "font-family-label": "Família da Fonte", + "font-family-tooltip": "Família da fonte para carregar. O padrão carregará a fonte padrão do livro", + "layout-mode-book-label": "Modo de Layout", + "color-theme-book-label": "Cor do Tema", + "font-size-book-label": "Tamanho da Fonte", + "font-size-book-tooltip": "Porcentagem de escala a ser aplicada à fonte do livro", + "line-height-book-label": "Espaçamento entre Linhas", + "line-height-book-tooltip": "Quanto espaçamento entre as linhas do livro", + "pdf-reader-settings-title": "Leitor de PDF", + "pdf-scroll-mode-label": "Modo de Rolagem", + "pdf-theme-label": "Tema", + "pdf-theme-tooltip": "Cor do tema do leitor", + "reading-profile-library-settings-title": "Biblioteca", + "delete": "{{common.delete}}", + "image-reader-settings-title": "Leitor de Imagens", + "extra-tip": "Atribua perfis de leitura por meio do menu de ações em séries e bibliotecas, ou em massa. Ao alterar as configurações em um leitor, um perfil oculto é criado para lembrar suas escolhas para aquela série (exceto para PDFs). Este perfil é removido quando você atribui um dos seus próprios perfis de leitura à série. Mais informações podem ser encontradas em", + "make-default": "Definir como padrão", + "layout-mode-label": "Modo de Layout", + "add": "{{common.add}}", + "scaling-option-tooltip": "Como dimensionar a imagem para sua tela.", + "background-color-label": "Cor do Fundo", + "default-profile": "Padrão", + "description": "Nem todas as suas séries podem ser lidas da mesma forma; crie perfis de leitura distintos por biblioteca ou série para que o retorno às suas séries seja o mais tranquilo possível.", + "show-screen-hints-label": "Mostrar Dicas na Tela", + "width-override-tooltip": "Substituir largura de imagens no leitor", + "pdf-spread-mode-tooltip": "Como as páginas devem ser dispostas. Simples ou duplas (ímpar/par)", + "immersive-mode-tooltip": "Isso ocultará o menu atrás de um clique no documento do leitor e girará o toque para paginar", + "allow-auto-webtoon-reader-tooltip": "Mude para o modo Leitor de Webtoons se as páginas parecerem um webtoon. Podem ocorrer alguns falsos positivos.", + "writing-style-tooltip": "Altera a direção do texto. Horizontal é da esquerda para a direita, vertical é de cima para baixo.", + "writing-style-label": "Estilo da Escrita", + "reading-profile-series-settings-title": "Séries", + "emulate-comic-book-label": "Emular história em quadrinhos", + "profiles-title": "Seus perfis de leitura", + "page-splitting-tooltip": "Como dividir uma imagem de largura total (por exemplo, as imagens esquerda e direita são combinadas)", + "reading-mode-tooltip": "Alterar o leitor para paginar verticalmente, horizontalmente ou ter uma rolagem infinita", + "confirm": "Tem certeza de que deseja excluir o perfil de leitura {{name}}?", + "add-tooltip": "Seu novo perfil será salvo após fazer uma alteração nele", + "reading-direction-tooltip": "Direção para clicar para ir para a próxima página. Da direita para a esquerda significa clicar no lado esquerdo da tela para ir para a próxima página.", + "tap-to-paginate-tooltip": "As laterais da tela do leitor de livros devem permitir que você toque nela para ir para a página anterior/seguinte", + "margin-book-tooltip": "Quanto espaçamento em cada lado da tela. Isso será substituído por 0 em dispositivos móveis, independentemente desta configuração.", + "layout-mode-book-tooltip": "Como o conteúdo deve ser disposto. A rolagem é como o livro o embala. 1 ou 2 colunas se ajustam à altura do dispositivo e comportam 1 ou 2 colunas de texto por página", + "color-theme-book-tooltip": "Qual tema de cor aplicar ao conteúdo e menu do leitor de livros", + "margin-book-label": "Margem", + "pdf-spread-mode-label": "Modo de Propagação", + "pdf-scroll-mode-tooltip": "Como você rola as páginas. Vertical/Horizontal e Toque para Paginar (sem rolagem)", + "emulate-comic-book-tooltip": "Aplica um efeito de sombra para emular a leitura de um livro", + "reading-direction-book-tooltip": "Direção para clicar para ir para a próxima página. Da direita para a esquerda significa clicar no lado esquerdo da tela para ir para a próxima página.", + "wiki-title": "wiki", + "disable-width-override-label": "Desativar substituição de largura", + "disable-width-override-tooltip": "Evitar que a substituição da largura entre em vigor quando a tela estiver pelo menos no ponto de interrupção configurado ou menor" + }, + "bulk-set-reading-profile-modal": { + "title": "Definir perfil de leitura", + "filter-label": "{{common.filter}}", + "clear": "{{common.clear}}", + "loading": "{{common.loading}}", + "create": "{{common.create}}", + "bound": "Vinculado", + "no-data": "Nenhuma coleção criada ainda", + "close": "{{common.close}}" + }, + "browse-people": { + "series-count": "{{common.series-count}}", + "roles-label": "Papéis", + "name-label": "Nome", + "series-count-label": "Número de Séries", + "title": "Navegar por Pessoas", + "sort-label": "Ordenar", + "issue-count-label": "Número de Edições", + "author-count": "{{num}} Pessoas", + "cover-image-description": "{{edit-series-modal.cover-image-description}}", + "issue-count": "{{common.issue-count}}" + }, + "browse-genres": { + "genre-count": "{{num}} Gêneros", + "issue-count": "{{common.issue-count}}", + "title": "Navegar por Gêneros", + "series-count": "{{common.series-count}}" + }, + "browse-tags": { + "issue-count": "{{common.issue-count}}", + "series-count": "{{common.series-count}}", + "title": "Navegar pelas Etiquetas", + "genre-count": "{{num}} Etiquetas" + }, + "browse-title-pipe": { + "age-rating": "Avaliado com {{value}}", + "user-rating": "{{value}} avaliação com estrelas", + "translator": "Traduzido por {{value}}", + "editor": "Editado por {{value}}", + "artist": "Desenhado por {{value}}", + "colorist": "Colorido por {{value}}", + "inker": "Arte-finalizado por {{value}}", + "penciller": "Desenhado por {{value}}", + "genre": "Tem o Gênero {{value}}", + "imprint": "Impressão de {{value}}", + "team": "Equipe {{value}}", + "location": "Em {{value}} localização", + "release-year": "Lançado em {{value}}", + "tag": "Tem a Etiqueta {{value}}", + "writer": "Escrito por {{value}}", + "publication-status": "{{value}} trabalhos", + "format": "Formato de {{value}}", + "letterer": "Com letra de {{value}}", + "library": "Dentro da biblioteca {{value}}", + "character": "Tem o personagem {{value}}", + "publisher": "Publicado por {{value}}" + }, + "breakpoint-pipe": { + "desktop": "Desktop", + "tablet": "Tablet", + "never": "Nunca", + "mobile": "Móvel" + }, + "generic-filter-field-pipe": { + "person-name": "Nome", + "person-role": "Papel", + "person-series-count": "Número de Séries", + "person-chapter-count": "Número de Capítulos" } } diff --git a/UI/Web/src/assets/langs/ru.json b/UI/Web/src/assets/langs/ru.json index 0789c6685..18c9a9a06 100644 --- a/UI/Web/src/assets/langs/ru.json +++ b/UI/Web/src/assets/langs/ru.json @@ -93,7 +93,7 @@ "page-layout-mode-tooltip": "Показывать элементы в виде карточек или списка на странице сведений о серии.", "locale-label": "Язык", "locale-tooltip": "Язык, который должна использовать Кавита", - "blur-unread-summaries-label": "Размытие непрочитанных сводок", + "blur-unread-summaries-label": "Размытие непрочитанного", "blur-unread-summaries-tooltip": "Размытие аннотаций в не прочитанных томах или главах (во избежание спойлеров)", "prompt-on-download-label": "Запрос на загрузку", "prompt-on-download-tooltip": "Запрашивать, когда размер загрузки превышает {{size}} МБ", @@ -103,41 +103,6 @@ "collapse-series-relationships-tooltip": "Должна ли Кавита показывать серии, которые не имеют отношения друг к другу, или это родителаякий серия/приквел", "share-series-reviews-label": "Поделится обзором серий", "share-series-reviews-tooltip": "Должна ли Kavita включать ваши отзывы о сериях для других пользователей", - "image-reader-settings-title": "Просмоторщик изображений", - "reading-direction-label": "Направление чтения", - "reading-direction-tooltip": "Направление нажатия для перехода на следующую страницу. С права на лево означает, что для перехода на следующую страницу нужно нажать в левой части экрана.", - "scaling-option-label": "Параметры масштабирования", - "scaling-option-tooltip": "Как масштабировать изображение для вашего экрана.", - "page-splitting-label": "Разделение страниц", - "page-splitting-tooltip": "Как разделить изображение во всю ширину (т.е. как левое, так и правое изображения объединяются)", - "reading-mode-label": "Режим чтения", - "layout-mode-label": "Режим макета", - "layout-mode-tooltip": "Вывод на экран одного изображения или двух рядом расположенных изображений", - "background-color-label": "Цвет фона", - "auto-close-menu-label": "Автоматическое закрытие меню", - "show-screen-hints-label": "Показывать экранные подсказки", - "emulate-comic-book-label": "Имитация комиксов", - "swipe-to-paginate-label": "Проведите пальцем по страницам", - "book-reader-settings-title": "Читалка", - "tap-to-paginate-label": "Нажмите для пагинации", - "tap-to-paginate-tooltip": "Должны ли боковые стороны экрана читалки позволять нажимать на них для перехода к предыдущей/следующей странице", - "immersive-mode-label": "Режим погружения", - "immersive-mode-tooltip": "Это позволит скрыть меню после щелчка по документу читателя и включить функцию перехода к страницам", - "reading-direction-book-label": "Направление чтения", - "reading-direction-book-tooltip": "Направление нажатия для перехода на следующую страницу. С лева на право означает, что для перехода на следующую страницу нужно щелкнуть в левой части экрана.", - "font-family-label": "Семейство шрифтов", - "font-family-tooltip": "Семейство шрифтов для загрузки. По умолчанию загрузит шрифт, используемый в книге по умолчанию", - "writing-style-label": "Стиль письма", - "writing-style-tooltip": "Изменяет направление текста. Горизонтальное направление - слева направо, вертикальное - сверху вниз.", - "layout-mode-book-label": "Режим макета", - "layout-mode-book-tooltip": "Как должен быть размещен контент. Scroll - так, как это принято в книгах. 1 или 2 колонки соответствуют высоте устройства и вмещают 1 или 2 колонки текста на страницу", - "color-theme-book-label": "Цветовая тема", - "color-theme-book-tooltip": "Какую цветовую тему применить к содержанию и меню программы чтения книг", - "font-size-book-label": "Размер шрифта", - "line-height-book-label": "Межстрочный интервал", - "line-height-book-tooltip": "Размер интервала между строками книги", - "margin-book-label": "Отступ", - "margin-book-tooltip": "Величина интервала с каждой стороны экрана. На мобильных устройствах этот параметр будет иметь значение 0 независимо от этой настройки.", "clients-opds-alert": "OPDS не включен на этом сервере. Это не повлияет на пользователей Tachiyomi.", "clients-opds-description": "Все сторонние клиенты будут использовать либо API-ключ, либо указанный ниже Url подключения. Например пароли, храните их в тайне.", "clients-api-key-tooltip": "Ключ API - это как пароль. Храните его в секрете, берегите его.", @@ -185,7 +150,7 @@ }, "manage-devices": { "title": "Диспетчер устройств", - "description": "Этот раздел предназначен для настройки устройств, которые не могут подключаться к Kavita через веб-браузер, а вместо этого имеют адрес электронной почты, принимающий файлы.", + "description": "Раздел предназначен для настройки устройств, которые не могут подключаться к Kavita через веб-браузер, но используют адрес электронной почты, принимающий файлы.", "devices-title": "Устройства", "no-devices": "Пока нет ни одного настроенного устройства", "platform-label": "Платформа: ", @@ -285,21 +250,25 @@ "open-filtered-search": "Откройте отфильтрованный поиск для {{item}}." }, "user-stats-info-cards": { - "total-pages-read-label": "Всего прочитанных страниц", + "total-pages-read-label": "Прочитанных страниц", "total-pages-read-tooltip": "{{user-stats-info-cards.total-pages-read-label}}: {{value}}", - "total-words-read-label": "Всего слов прочитано", + "total-words-read-label": "Прочитанных слов", "total-words-read-tooltip": "{{user-stats-info-cards.total-words-read-label}}: {{value}}", "time-spent-reading-label": "Время, проведенное за чтением", "time-spent-reading-tooltip": "{{user-stats-info-cards.time-spent-reading-label}}: {{value}}", - "chapters-read-label": "Читать главы", + "chapters-read-label": "Прочитанных глав", "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}", - "avg-reading-per-week-label": "Среднее чтение / неделя", - "last-active-label": "Последний активный", - "chapters": "{{value}} глав" + "avg-reading-per-week-label": "Среднее время чтения / в неделю", + "last-active-label": "Последняя активность", + "chapters": "{{value}} глав", + "pages-count": "{{num}} страниц", + "pages-read-by-year-title": "Прочтено страниц за год", + "words-read-by-year-title": "Прочтенных слов за год", + "words-count": "{{num}} слов" }, "user-stats": { "library-read-progress-title": "Прогресс чтения в библиотеке", - "read-percentage": "% Читать" + "read-percentage": "% Прочитанного" }, "top-readers": { "title": "Лучшие читатели", @@ -510,7 +479,10 @@ "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", "writing-style-label": "{{user-preferences.writing-style-label}}", "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}" + "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "left-to-right": "Слева направо", + "right-to-left": "Справа налево", + "writing-style-tooltip": "Изменяет направление текста. По горизонтали - слева направо, по вертикали - сверху вниз." }, "bookmarks": { "title": "{{side-nav.bookmarks}}", @@ -599,7 +571,11 @@ "reset-to-default": "{{common.reset-to-default}}", "reset": "{{common.reset}}", "save": "{{common.save}}", - "field-required": "{{validation.field-required}}" + "field-required": "{{validation.field-required}}", + "allow-stats-label": "Отправка анонимной статистики", + "port-tooltip": "Порт сервера. Для вступления в силу требуется перезагрузка. Эту настройку нельзя изменить, если вы запускаете образ Docker как пользователь без прав root.", + "port-label": "Порт", + "allow-stats-tooltip-part-1": "Отправляйте анонимные данные об использовании Kavita. Сюда входит информация о некоторых используемых функциях, количестве файлов, версии операционной системы, версии установки Kavita, процессоре и памяти. Мы будем использовать эту информацию для определения приоритетов добавления новых функций, исправления ошибок и оптимизации производительности. Более подробная информация о собираемых данных отражена на https://wiki.kavitareader.com . Для вступления в силу требуется перезагрузка. " }, "manage-tasks-settings": { "reset-to-default": "{{common.reset-to-default}}", @@ -697,7 +673,9 @@ }, "manga-reader": { "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}" + "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", + "right-to-left-alt": "Справа налево", + "left-to-right-alt": "Слево направо" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -814,7 +792,9 @@ "last-30-days": "{{time-periods.last-30-days}}", "last-90-days": "{{time-periods.last-90-days}}", "last-year": "{{time-periods.last-year}}", - "all-time": "{{time-periods.all-time}}" + "all-time": "{{time-periods.all-time}}", + "title": "Активность чтения", + "no-data": "Отсутствует прогресс" }, "series-preview-drawer": { "tags-label": "{{filter-field-pipe.tags}}", @@ -882,12 +862,19 @@ "writers": "{{metadata-fields.writers-title}}" }, "actionable": { - "clear": "{{common.clear}}" + "clear": "{{common.clear}}", + "download": "Скачать", + "add-to": "Добавить к", + "read": "Читать", + "new-collection": "Новая коллекция", + "rename": "Переименовать", + "refresh-covers-tooltip": "Востанавить все обложки" }, "validation": { "required-field": "Это поле обязательно для заполнения", "valid-email": "Это должен быть действительный адрес электронной почты", - "password-validation": "Длина пароля должна составлять от 6 до 32 символов" + "password-validation": "Длина пароля должна составлять от 6 до 32 символов", + "year-validation": "Значение года должно быть настоящий, цифра должна быть больше 1000 и содержать 4 цифры" }, "entity-type": { "volume": "том", @@ -925,6 +912,42 @@ "issue-hash-num": "Вопрос #", "issue-num": "Вопрос", "chapter-num": "Глава", - "volume-num": "Том" + "volume-num": "Том", + "book-num-shorthand": "Книга {{num}}", + "chapter-nums": "Главы", + "volume-nums": "Тома", + "book-nums": "Книги", + "issue-num-shorthand": "#{{num}}", + "volume-num-shorthand": "Том. {{num}}", + "chapter-num-shorthand": "Глава {{num}}", + "chapter-count": "{{num}} Главы", + "no-data": "Нет данных" + }, + "preferences": { + "original": "Оригинал", + "list": "Список", + "pdf-multiple": "По умолчанию", + "left-to-right": "Слева направо", + "right-to-left": "Справа налево" + }, + "toasts": { + "confirm-download-size-ios": "В iOS возникают проблемы с загрузкой файлов размером более 200 МБ, загрузка может завершиться некорректно.", + "confirm-library-type-change": "Смена типа библиотеки вызовет новое сканирование с другими правилами синтаксического анализа и может привести к повторному созданию серий, что может привести к потере прогресса и закладок. Перед началом разумно создать резервную копию. Вы уверены, что хотите продолжить?", + "chapter-deleted": "Удаление главы", + "collection-not-owned": "Вы не являетесь владельцем этой коллекции" + }, + "tabs": { + "devices-tab": "Устройства", + "smart-filters-tab": "Умный фильтр", + "folder-tab": "Папка" + }, + "metadata-setting-field-pipe": { + "chapter-release-date": "Дата Релиза (Главы)" + }, + "read-time-pipe": { + "less-than-hour": "<1 Часа" + }, + "day-breakdown": { + "no-data": "Отсутствует прогресс, отправляйтесь читать =)" } } diff --git a/UI/Web/src/assets/langs/sk.json b/UI/Web/src/assets/langs/sk.json index ac2f5ec6a..e88666343 100644 --- a/UI/Web/src/assets/langs/sk.json +++ b/UI/Web/src/assets/langs/sk.json @@ -72,7 +72,8 @@ "your-review": "Toto je Vaša recenzia", "external-review": "Externá recenzia", "local-review": "Lokálna Recenzia", - "rating-percentage": "Hodnotenie {{r}}%" + "rating-percentage": "Hodnotenie {{r}}%", + "critic": "kritika" }, "want-to-read": { "title": "Chcem prečítať", @@ -82,7 +83,7 @@ }, "user-preferences": { "title": "Používateľský panel", - "pref-description": "Toto sú globálne nastavenia, ktoré sú viazané na Váš účet.", + "pref-description": "Toto sú globálne nastavenia, ktoré sú prepojené s vaším účtom. Nastavenia čitateľa sa nachádzajú v časti Profilov čitateľa.", "account-tab": "{{tabs.account-tab}}", "preferences-tab": "{{tabs.preferences-tab}}", "theme-tab": "{{tabs.theme-tab}}", @@ -106,63 +107,14 @@ "collapse-series-relationships-tooltip": "Mala by Kavita ukázať seriál, ktorý nemá žiadne vzťahy alebo je nadradeným/prequel", "share-series-reviews-label": "Zdieľať recenzie série", "share-series-reviews-tooltip": "Ak má Kavita zahrnúť vaše recenzie na Série pre iných používateľov", - "image-reader-settings-title": "Čítačka obrázkov", - "reading-direction-label": "Smer čítania", - "reading-direction-tooltip": "Smer pre kliknutie na prejdenie na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.", - "scaling-option-label": "Možnosti škálovania", - "scaling-option-tooltip": "Ako zmeniť mierku obrázka na obrazovku.", - "page-splitting-label": "Rozdelenie stránky", - "page-splitting-tooltip": "Ako rozdeliť obrázok na celú šírku (tj ľavý a pravý obrázok sa skombinujú)", - "reading-mode-label": "Režim čítania", - "layout-mode-label": "Režim rozloženia", - "layout-mode-tooltip": "Vykreslite jeden obrázok na obrazovku alebo dva obrázky vedľa seba", - "background-color-label": "Farba pozadia", - "auto-close-menu-label": "Automaticky zatvoriť menu", - "show-screen-hints-label": "Zobraziť tipy na obrazovke", - "emulate-comic-book-label": "Napodobniť komiks", - "swipe-to-paginate-label": "Potiahnuť pre Stránkovanie", - "book-reader-settings-title": "Čítačka kníh", - "tap-to-paginate-label": "Klepnutím môžete stránkovať", - "tap-to-paginate-tooltip": "Ak strany obrazovky čítačky kníh umožňujú ťuknutím na ňu prejsť na predchádzajúcu/nasledujúcu stranu", - "immersive-mode-label": "Imerzívny režim", - "immersive-mode-tooltip": "Ponuka sa skryje pri kliknutí na dokument čítačky a zapne dotyk pre listovanie strán", - "reading-direction-book-label": "Smer čítania", - "reading-direction-book-tooltip": "Smer na kliknutie pre prejdenie na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.", - "font-family-label": "Typ Písma", - "font-family-tooltip": "Typ písma na načítanie. Predvolené načíta predvolené písmo knihy", - "writing-style-label": "Štýl písania", - "writing-style-tooltip": "Zmení smer textu. Horizontálne je zľava doprava, vertikálne je zhora nadol.", - "layout-mode-book-label": "Režim Rozloženia", - "layout-mode-book-tooltip": "Ako by mal byť obsah usporiadaný. Zvitok je taký, ako ho balí kniha. 1 alebo 2 stĺpce sa prispôsobia výške zariadenia a zmestia sa 1 alebo 2 stĺpce textu na stranu", - "color-theme-book-tooltip": "Akú farebnú tému použiť na obsah a ponuku čítačky kníh", - "font-size-book-label": "Veľkosť Písma", - "line-height-book-label": "Riadkovanie", - "line-height-book-tooltip": "Koľko medzier medzi riadkami knihy", - "margin-book-label": "Okraj stránky", - "margin-book-tooltip": "Koľko medzier na každej strane obrazovky. Na mobilných zariadeniach sa to prepíše na 0 bez ohľadu na toto nastavenie.", "clients-opds-description": "Všetci klienti tretích strán budú používať kľúč API alebo pripájaciu adresu URL nižšie. Musí sa s nimi zaobchádzať dôverne, rovnako ako s heslami.", "clients-api-key-tooltip": "Kľúč API je ako heslo. Jeho obnovenie zruší platnosť všetkých existujúcich klientov.", "reset": "{{common.reset}}", "save": "{{common.save}}", - "reading-mode-tooltip": "Zmeňte čítačku na zvislé, vodorovné stránkovanie alebo na nekonečné posúvanie", "clients-opds-alert": "OPDS nie je na tomto serveri povolené. Toto neovplyvní používateľov Tachiyomi.", "clients-opds-url-tooltip": "Pozrite si zoznam podporovaných klientov OPDS: ", - "color-theme-book-label": "Farebný motív", - "pdf-reader-settings-title": "PDF Čítačka", - "pdf-scroll-mode-label": "Režim scrollovania", - "pdf-scroll-mode-tooltip": "Ako listujete stránkami. Vertikálne/horizontálne a stránkovanie klepnutím (bez posúvania)", - "pdf-spread-mode-label": "Režim šírenia", - "swipe-to-paginate-tooltip": "Potiahnutie prstom po obrazovke by malo spôsobiť spustenie nasledujúcej alebo predchádzajúcej stránky", - "font-size-book-tooltip": "Percento mierky, ktorá sa má použiť na písmo v knihe", - "pdf-theme-tooltip": "Farebná téma čitateľa", "clients-opds-url-label": "OPDS URL", "clients-api-key-label": "API kľúč", - "background-color-tooltip": "Farba pozadia čítačky obrázkov", - "auto-close-menu-tooltip": "Malo by sa menu automaticky zatvoriť", - "show-screen-hints-tooltip": "Zobrazte prekrytie, ktoré vám pomôže pochopiť oblasť a smer stránkovania", - "emulate-comic-book-tooltip": "Aplikuje tieňový efekt na emuláciu čítania z knihy", - "pdf-spread-mode-tooltip": "Ako by mali byť stránky usporiadané. Jedno alebo dvojlôžkové (nepárne/párne)", - "pdf-theme-label": "Téma", "kavitaplus-settings-title": "Kavita+", "anilist-scrobbling-label": "AniList Scrobblovanie", "anilist-scrobbling-tooltip": "Umožniť Kavite scrobblovať (jednosmerná synchronizácia) priebeh čítania a hodnotenia do zoznamu AniList", @@ -180,7 +132,7 @@ "theme-manager": { "title": "Správca tém", "site-themes": "Témy/Motívy stránok", - "set-default": "Nastaviť ako predvolené", + "set-default": "Nastaviť predvolené", "download": "{{changelog.download}}", "apply": "{{common.apply}}", "applied": "Aplikované", @@ -677,7 +629,10 @@ "go-to-page-prompt": "Počet stránok: {{totalPages}}. Na akú stránku chceš ísť?", "toc-header": "ToC", "loading-book": "Načítava sa kniha…", - "close-reader": "Zavrieť Čítačku" + "close-reader": "Zavrieť Čítačku", + "go-to-first-page": "Prejsť na prvú stránku", + "go-to-section": "Prejsť do sekcie", + "go-to-section-prompt": "Existuje {{totalSections}} sekcií. Do ktorej sekcie chcete prejsť?" }, "personal-table-of-contents": { "no-data": "Zatiaľ nič nie je v záložkách", @@ -725,7 +680,7 @@ "series-detail": { "page-settings-title": "Nastavenie Stránky", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "Karta", "continue-from": "Pokračovať {{title}}", "read": "{{common.read}}", @@ -769,7 +724,7 @@ "volume-num": "{{common.volume-num}}", "reading-lists-title": "{{side-nav.reading-lists}}", "time-to-read-alt": "{{sort-field-pipe.time-to-read}}", - "scrobbling-tooltip": "{{settings.scrobbling}}", + "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}", "time-left-alt": "Zostávajúci čas", "layout-mode-option-list": "Zoznam", "more-alt": "Viac", @@ -778,7 +733,9 @@ "pages-count": "{{num}} Strán", "words-count": "{{num}} Slov", "weblinks-title": "Odkazy", - "release-date-title": "Vydanie" + "release-date-title": "Vydanie", + "on": "{{reader-settings.on}}", + "off": "{{reader-settings.off}}" }, "metadata-fields": { "collections-title": "{{side-nav.collections}}", @@ -806,7 +763,8 @@ "close": "{{common.close}}", "entry-label": "Pozri detaily", "kavita-tooltip": "Vaše hodnotenie + Celkové", - "kavita-rating-title": "Vaše hodnotenie" + "kavita-rating-title": "Vaše hodnotenie", + "critic": "{{review-card.critic}}" }, "badge-expander": { "more-items": "a {{count}} ďalších" @@ -841,7 +799,8 @@ "back": "Naspäť", "more": "Viac", "customize": "{{settings.customize}}", - "browse-authors": "Prezerať autorov" + "edit": "{{common.edit}}", + "cancel-edit": "Zavrieť zmenu poradia" }, "library-settings-modal": { "close": "{{common.close}}", @@ -852,7 +811,7 @@ "cover-tab": "{{tabs.cover-tab}}", "advanced-tab": "{{tabs.advanced-tab}}", "tasks-tab": "{{tabs.tasks-tab}}", - "name-label": "Názov", + "name-label": "Meno", "library-name-unique": "Názov knižnice musí byť jedinečný", "last-scanned-label": "Naposledy skenované:", "type-label": "Typ", @@ -904,27 +863,27 @@ }, "reader-settings": { "general-settings-title": "Všeobecné Nastavenia", - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", + "font-family-label": "{{manage-reading-profiles.font-family-label}}", + "font-size-label": "{{manage-reading-profiles.font-size-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", "reset-to-defaults": "Obnoviť predvolené nastavenia", "reader-settings-title": "Nastavenia čítačky", - "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", + "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}", "right-to-left": "Zprava doľava", "left-to-right": "Zľava doprava", "horizontal": "Horizontálne", "vertical": "Vertikálne", - "writing-style-label": "{{user-preferences.writing-style-label}}", + "writing-style-label": "{{manage-reading-profiles.writing-style-label}}", "tap-to-paginate-label": "Klepnite na Stránkovanie", "tap-to-paginate-tooltip": "Pre stránkovanie kliknite na okraje obrazovky", "on": "Zapnuté", "off": "Vypnuté", - "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", + "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}", "immersive-mode-tooltip": "Ponuka sa skryje pri kliknutí na dokument čítačky a zapne dotyk pre listovanie strán", "fullscreen-label": "Celá obrazovka", "fullscreen-tooltip": "Prepnite čítačku do režimu celej obrazovky", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-scroll": "Skrolovať", "layout-mode-option-1col": "1 Stĺpec", "layout-mode-option-2col": "2 Stĺpce", @@ -936,7 +895,15 @@ "writing-style-tooltip": "Zmení smer textu. Vodorovný je zľava doprava, zvislý zhora nadol.", "exit": "Ukončiť", "enter": "Enter", - "layout-mode-tooltip": "Posúvanie: Zrkadlí súbor epub (zvyčajne jedna dlhá rolovacia stránka na kapitolu).
    1 stĺpec: Vytvorí jednu virtuálnu stránku naraz.
    2 stĺpec: Vytvorí dve virtuálne stránky naraz rozložené vedľa seba." + "layout-mode-tooltip": "Posúvanie: Zrkadlí súbor epub (zvyčajne jedna dlhá rolovacia stránka na kapitolu).
    1 stĺpec: Vytvorí jednu virtuálnu stránku naraz.
    2 stĺpec: Vytvorí dve virtuálne stránky naraz rozložené vedľa seba.", + "loading": "načítavanie", + "create-new-tooltip": "Vytvorte nový spravovateľný profil z vášho súčasného implicitného profilu", + "reading-profile-updated": "Profil čítania bol aktualizovaný", + "line-spacing-max-label": "2.5x", + "create-new": "Nový profil z implicitného", + "reading-profile-promoted": "Profil čítania bol povýšený", + "update-parent": "Uložiť do {{name}}", + "line-spacing-min-label": "1x" }, "table-of-contents": { "no-data": "Táto kniha nemá v metadátach ani v súbore toc nastavený obsah" @@ -960,7 +927,8 @@ }, "card-detail-layout": { "total-items": "Celkový počet položiek: {{count}}", - "jumpkey-count": "{{count}} Série" + "jumpkey-count": "{{count}} Série", + "no-data": "{{common.no-data}}" }, "card-item": { "cannot-read": "Nedá sa čítať" @@ -986,7 +954,8 @@ "language-title": "{{edit-chapter-modal.language-label}}", "release-title": "{{sort-field-pipe.release-year}}", "format-title": "{{metadata-filter.format-label}}", - "length-title": "{{edit-chapter-modal.words-label}}" + "length-title": "{{edit-chapter-modal.words-label}}", + "age-rating-title": "{{metadata-fields.age-rating-title}}" }, "related-tab": { "reading-lists-title": "{{reading-lists.title}}", @@ -1058,7 +1027,7 @@ "email-settings-title": "Nastavenia e-mailu", "reset": "{{common.reset}}", "test": "Test", - "host-name-tooltip": "Názov domény (reverzného proxy). Vyžaduje sa pre funkčnosť e-mailu. Ak nieje reverzné proxy, použite ľubovoľnú url adresu.", + "host-name-tooltip": "Názov domény vášho reverzného proxy servera, potrebný pre fungovanie e-mailu. Ak nepoužívate reverzný proxy server, môžete použiť ľubovoľnú URL adresu vrátane http://externalip:port/", "host-name-validation": "Hostname musí začínať http(s) a nesmie končiť na /", "sender-address-label": "Adresa odosielateľa", "sender-address-tooltip": "Toto je e-mailová adresa, z ktorej príjemca uvidí, keď dostane e-mail. Zvyčajne ide o e-mailovú adresu priradenú k účtu.", @@ -1299,7 +1268,8 @@ "roles-header": "Roly", "name-header": "Meno", "sharing-header": "Zdieľanie", - "pending-tooltip": "Tento používateľ neoveril svoj e-mail" + "pending-tooltip": "Tento používateľ neoveril svoj e-mail", + "all-libraries": "Všetky knižnice" }, "edit-collection-tags": { "title": "Upraviť zbierku {{collectionName}}", @@ -1311,7 +1281,7 @@ "cover-image-tab": "{{tabs.cover-tab}}", "info-tab": "{{tabs.info-tab}}", "series-tab": "{{tabs.series-tab}}", - "name-label": "Názov", + "name-label": "Meno", "name-validation": "Názov musí byť jedinečný", "promote-label": "Povýšiť", "promote-tooltip": "Povýšenie znamená, že tag možno vidieť na celom serveri, nielen pre správcov. Všetky série, ktoré majú tento tag, budú mať stále obmedzenia prístupu používateľov.", @@ -1365,7 +1335,8 @@ "admin-email-history": "História e-mailov", "admin-matched-metadata": "Zhodné metadáta", "scrobble-holds": "Scrobble chyty", - "admin-metadata": "Spravovať metadáta" + "admin-metadata": "Spravovať metadáta", + "reading-profiles": "Čítanie profilov" }, "collection-detail": { "no-data": "Neexistujú žiadne položky. Skúste pridať sériu.", @@ -1411,7 +1382,8 @@ "provided": "Poskytnuté", "smart-filter": "Smart Filter", "library": "Knižnica", - "external-source": "Externý zdroj" + "external-source": "Externý zdroj", + "delete": "{{common.delete}}" }, "reading-list-detail": { "item-count": "{{common.item-count}}", @@ -1423,7 +1395,19 @@ "read-options-alt": "Možnosti čítania", "incognito-alt": "(Inkognito)", "no-data": "Nič nebolo pridané", - "characters-title": "{{metadata-fields.characters-title}}" + "characters-title": "{{metadata-fields.characters-title}}", + "writers-title": "{{metadata-fields.writers-title}}", + "edit-alt": "{{common.edit}}", + "storyline-tab": "{{series-detail.storyline-tab}}", + "details-tab": "{{series-detail.details-tab}}", + "more-alt": "{{series-detail.more-alt}}", + "cover-artists-title": "{{metadata-fields.cover-artists-title}}", + "publishers-title": "{{metadata-fields.publishers-title}}", + "items-title": "Položky", + "edit-label": "Režim úprav", + "reorder-alt": "Preusporiadať položky", + "date-range-title": "Rozsah dátumov", + "dnd-warning": "Funkcia „drag and drop“ nie je k dispozícii na mobilných zariadeniach alebo ak zoznam na čítanie obsahuje viac ako 100 položiek." }, "events-widget": { "title-alt": "Aktivita", @@ -1476,7 +1460,8 @@ "logout": "Odhlásiť sa", "all-filters": "Smart Filtre", "close": "{{common.close}}", - "nav-link-header": "Možnosti navigácie" + "nav-link-header": "Možnosti navigácie", + "person-aka-status": "Zhoduje sa s aliasom" }, "promoted-icon": { "promoted": "{{common.promoted}}" @@ -1563,7 +1548,6 @@ }, "manga-reader": { "back": "Naspäť", - "save-globally": "Uložiť globálne", "incognito-alt": "Režim inkognito je zapnutý. Prepínačom vypnete.", "incognito-title": "Režim inkognito:", "shortcuts-menu-alt": "Modálne klávesové skratky", @@ -1584,7 +1568,7 @@ "height": "Výška", "width": "Šírka", "original": "Originál", - "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", + "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}", "swipe-enabled-label": "Potiahnutie prstom je povolené", "enable-comic-book-label": "Napodobniť komiks", "brightness-label": "Jas", @@ -1595,12 +1579,17 @@ "layout-mode-switched": "Režim rozloženia bol prepnutý na Single z dôvodu nedostatku miesta na vykreslenie dvojitého rozloženia", "no-next-chapter": "Žiadna ďalšia kapitola", "no-prev-chapter": "Žiadna predchádzajúca kapitola", - "user-preferences-updated": "Predvoľby používateľa boli aktualizované", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", + "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}", "series-progress": "Priebeh série: {{percentage}}", "collapse": "Zabaliť", - "off": "Vypnuté", - "width-override-label": "Prepísanie šírky" + "off": "{{reader-settings.off}}", + "width-override-label": "Prepísanie šírky", + "create-new-tooltip": "{{reader-settings.create-new-tooltip}}", + "create-new": "{{reader-settings.create-new}}", + "loading": "{{reader-settings.loading}}", + "update-parent": "{{reader-settings.update-parent}}", + "reading-profile-updated": "Profil čítania bol aktualizovaný", + "reading-profile-promoted": "Profil čítania bol povýšený" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -1689,7 +1678,7 @@ "publication-status-label": "Stav publikácie", "required-field": "{{validation.required-field}}", "close": "{{common.close}}", - "name-label": "Názov", + "name-label": "Meno", "sort-name-label": "Triediť podľa názvu", "localized-name-label": "Lokalizovaný názov", "summary-label": "Zhrnutie", @@ -1793,8 +1782,8 @@ "cover-image-tab": "{{tabs.cover-tab}}", "tasks-tab": "{{tabs.tasks-tab}}", "info-tab": "{{tabs.info-tab}}", - "pages-label": "{{edit-chapter-modal.pages-count}}", - "words-label": "{{edit-chapter-modal.length-title}}", + "pages-label": "{{edit-chapter-modal.pages-label}}", + "words-label": "{{edit-chapter-modal.words-label}}", "pages-count": "{{edit-chapter-modal.pages-count}}", "words-count": "{{edit-chapter-modal.words-count}}", "reading-time-label": "{{edit-chapter-modal.reading-time-label}}", @@ -1942,7 +1931,8 @@ "save": "{{common.save}}", "add": "{{common.add}}", "filter": "{{common.filter}}", - "clear": "{{common.clear}}" + "clear": "{{common.clear}}", + "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}" }, "customize-sidenav-streams": { "no-data": "Všetky Smart filtre boli pridané do bočnej navigácie alebo ešte neboli vytvorené žiadne.", @@ -1970,13 +1960,21 @@ "no-data": "Neboli vytvorené žiadne Smart filtre", "filter": "{{common.filter}}", "clear": "{{common.clear}}", - "errored": "Vo filtri je chyba kódovania. Musíte to znova vytvoriť." + "errored": "Vo filtri je chyba kódovania. Musíte to znova vytvoriť.", + "save": "{{common.save}}", + "edit-smart-filter": "Upraviť {{name}}", + "name-label": "Meno", + "required-field": "Inteligentné filtre potrebujú názov", + "close": "{{common.close}}", + "filter-name-unique": "Názvy inteligentných filtrov musia byť jedinečné", + "edit": "{{common.edit}}", + "cancel": "{{common.cancel}}" }, "edit-external-source-item": { "not-unique": "Externý zdroj už existuje s týmto host-om. Uistite sa, že nemáte duplikáty", "title": "Nový externý zdroj", "host-label": "Host", - "name-label": "Názov", + "name-label": "Meno", "api-key-label": "API kľúč", "save": "{{common.save}}", "edit": "{{common.edit}}", @@ -2168,7 +2166,12 @@ "confirm-delete-multiple-chapters": "Naozaj chcete odstrániť {{count}} kapitolu/zväzky? Nezmení súbory na disku.", "bulk-delete-libraries": "Naozaj chcete odstrániť {{count}} knižnice?", "match-success": "Séria správne priradená", - "webtoon-override": "Prepnutie do režimu Webtoon kvôli obrázkom reprezentujúcim webtoon." + "webtoon-override": "Prepnutie do režimu Webtoon kvôli obrázkom reprezentujúcim webtoon.", + "confirm-delete-multiple-volumes": "Naozaj chcete odstrániť {{count}} zväzkov? Týmto sa nezmenia súbory na disku.", + "library-bound-to-reading-profile": "Knižnica prepojená s čitateľským profilom {{name}}", + "scrobble-gen-init": "Zaradená úloha na generovanie udalostí Scrobblingu z histórie čítania a hodnotení v minulosti a ich synchronizáciu s pripojenými službami.", + "series-added-want-to-read": "Séria bola pridaná zo zoznamu Chcem si prečítať", + "series-bound-to-reading-profile": "Séria viazaná na čitateľský profil {{name}}" }, "actionable": { "scan-library": "Skenovať knižnicu", @@ -2235,7 +2238,17 @@ "unpromote-tooltip": "Obmedzte viditeľnosť iba na svoj účet", "copy-settings": "Kopírovať nastavenia z", "match": "Zhoda", - "match-tooltip": "Zoraďte sériu s Kavitou+ manuálne" + "match-tooltip": "Zoraďte sériu s Kavitou+ manuálne", + "merge": "Zlúčiť", + "clear-reading-profile": "Vymazať profil čítania", + "clear-reading-profile-tooltip": "Vymazať profil čítania pre túto knižnicu", + "cleared-profile": "Vymazaný profil čítania", + "reading-profiles": "Profily čítania", + "set-reading-profile-tooltip": "Prepojiť čitateľský profil s touto knižnicou", + "reorder": "Zmeniť poradie", + "rename": "Premenovať", + "rename-tooltip": "Premenovanie inteligentného filtra", + "set-reading-profile": "Nastaviť profil čítania" }, "preferences": { "left-to-right": "Zľava doprava", @@ -2333,17 +2346,14 @@ "browse-person-title": "Všetky diela {{name}}", "known-for-title": "Známy pre", "browse-person-by-role-title": "Všetky diela {{name}} ako {{role}}", - "anilist-url": "{{edit-person-modal.anilist-tooltip}}" + "anilist-url": "{{edit-person-modal.anilist-tooltip}}", + "aka-title": "Tiež známe ako ", + "no-info": "Žiadne informácie o tejto osobe" }, "download-button": { "download-tooltip": "Stiahnuť", "downloading-status": "Sťahuje sa…" }, - "browse-authors": { - "title": "Prezerať autorov a spisovateľov", - "author-count": "{{num}} Ľudí", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "pdf-scroll-mode-pipe": { "horizontal": "Horizontálne", "page": "Klepnutím môžete stránkovať", @@ -2404,7 +2414,8 @@ "confirm": "Potvrdiť", "info": "Info", "cancel": "{{common.cancel}}", - "ok": "Ok" + "ok": "Ok", + "prompt": "Otázka" }, "collection-owner": { "collection-created-label": "Vytvorené: {{owner}}", @@ -2431,7 +2442,11 @@ "cover-image-description-extra": "Alternatívne si môžete stiahnuť obal z CoversDB, ak je k dispozícii.", "cover-image-description": "{{edit-series-modal.cover-image-description}}", "save": "{{common.save}}", - "download-coversdb": "Stiahnuť z CoversDB" + "download-coversdb": "Stiahnuť z CoversDB", + "aliases-tab": "Aliasy", + "aliases-label": "Upraviť aliasy", + "alias-overlap": "Tento alias už odkazuje na inú osobu alebo je menom tejto osoby, zvážte ich zlúčenie.", + "aliases-tooltip": "Keď je séria označená aliasom osoby, táto osoba je priradená, nie je vytvorená nová osoba. Pri odstraňovaní aliasu budete musieť znova prehľadať sériu, aby sa zmena prejavila." }, "kavitaplus-metadata-breakdown-stats": { "completed-series-label": "Dokončené série", @@ -2505,7 +2520,7 @@ "close": "{{common.close}}", "no-results": "Nedá sa nájsť zhoda. Skúste pridať adresu URL od podporovaného poskytovateľa a skúste to znova.", "query-label": "Dopyt", - "query-tooltip": "Zadajte názov série, webovú adresu AniList/MyAnimeList. Adresy URL budú používať priame vyhľadávanie.", + "query-tooltip": "Zadajte názov série, URL adresu AniList/MyAnimeList/ComicBookRoundup. URL adresy budú používať priame vyhľadávanie.", "dont-match-label": "Nezhoduj", "dont-match-tooltip": "Rozhodnite sa pre túto sériu z párovania a scrobblingu", "search": "Hľadať" @@ -2534,7 +2549,8 @@ "volume-count": "{{server-stats.volume-count}}", "releasing": "Vydanie", "details": "Zobraziť stránku", - "updating-metadata-status": "Aktualizácia metadát" + "updating-metadata-status": "Aktualizácia metadát", + "issue-count": "{{common.issue-count}}" }, "manage-metadata-settings": { "tag": "Tag/Značka", @@ -2575,7 +2591,18 @@ "remove-source-tag-label": "Odstrániť zdroj značky/tagu", "first-last-name-label": "Meno Priezvisko Pomenovanie", "person-roles-label": "Roly", - "first-last-name-tooltip": "Uistite sa, že mená osôb sú napísané najprv s krstným menom a potom s priezviskom" + "first-last-name-tooltip": "Uistite sa, že mená osôb sú napísané najprv s krstným menom a potom s priezviskom", + "enable-chapter-release-date-label": "Dátum vydania", + "enable-chapter-release-date-tooltip": "Umožniť napísanie dátumu vydania kapitoly/čísla", + "enable-chapter-publisher-label": "Vydavateľ", + "enable-chapter-publisher-tooltip": "Povoliť vydavateľovi kapitoly/čísla napísať", + "enable-chapter-cover-label": "Obálka kapitoly", + "enable-chapter-cover-tooltip": "Povoliť nastavenie obálky kapitoly/čísla", + "chapter-header": "Polia kapitoly", + "enable-chapter-title-label": "Názov", + "enable-chapter-title-tooltip": "Umožniť napísanie názvu kapitoly/vydania", + "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}", + "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}" }, "metadata-setting-field-pipe": { "start-date": "{{manage-metadata-settings.enable-start-date-label}}", @@ -2586,6 +2613,129 @@ "people": "{{tabs.people-tab}}", "summary": "{{filter-field-pipe.summary}}", "tags": "{{metadata-fields.tags-title}}", - "localized-name": "{{edit-series-modal.localized-name-label}}" + "localized-name": "{{edit-series-modal.localized-name-label}}", + "chapter-covers": "Obálky (kapitola)", + "chapter-title": "Názov (kapitola)", + "chapter-release-date": "Dátum vydania (kapitola)", + "chapter-summary": "Zhrnutie (kapitola)", + "chapter-publisher": "{{person-role-pipe.publisher}} (Chapter)" + }, + "log-level-pipe": { + "trace": "Trace/stopy", + "warning": "Pozor", + "critical": "Kritické", + "debug": "Debugovanie", + "information": "Informácie" + }, + "role-localized-pipe": { + "change-password": "Zmeniť heslo", + "download": "Stiahnuť", + "login": "Prihlásenie", + "change-restriction": "Zmeniť obmedzenie", + "admin": "Admin", + "bookmark": "Záložka", + "promote": "Propagovať", + "read-only": "Iba na čítanie" + }, + "merge-person-modal": { + "title": "{{personName}}", + "src": "Zlúčiť osobu", + "save": "{{common.save}}", + "close": "{{common.close}}", + "known-for-title": "Známy pre", + "merge-warning": "Ak budete pokračovať, vybraná osoba bude odstránená. Meno vybranej osoby bude pridané ako alias a všetky jej role budú prenesené.", + "alias-title": "Nové aliasy" + }, + "manage-reading-profiles": { + "no-selected": "Nie je vybratý žiadny profil", + "confirm": "Naozaj chcete odstrániť čitateľský profil {{name}}?", + "scaling-option-tooltip": "Ako prispôsobiť obrázok veľkosti obrazovky.", + "auto-close-menu-label": "Menu automatického zatvorenia", + "auto-close-menu-tooltip": "Ponuka by sa mala automaticky zatvoriť", + "show-screen-hints-label": "Zobraziť rady na obrazovke", + "show-screen-hints-tooltip": "Zobraziť prekrytie, ktoré pomôže pochopiť oblasť a smer stránkovania", + "width-override-label": "{{manga-reader.width-override-label}}", + "reset": "{{common.reset}}", + "book-reader-settings-title": "Čítačka kníh", + "tap-to-paginate-label": "Klepnutie pre stránkovanie", + "tap-to-paginate-tooltip": "Mali by bočné strany obrazovky čítačky kníh umožňovať klepnutie na prechod na predchádzajúcu/nasledujúcu stranu", + "immersive-mode-label": "Imerzívny režim", + "reading-direction-book-label": "Smer čítania", + "reading-direction-book-tooltip": "Smer kliknutia pre presun na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.", + "font-family-label": "Skupina písma", + "writing-style-label": "Štýl písania", + "writing-style-tooltip": "Mení smer textu. Horizontálne je zľava doprava, vertikálne je zhora nadol.", + "layout-mode-book-label": "Režim rozloženia", + "font-size-book-label": "Veľkosť písma", + "margin-book-label": "Okraj", + "margin-book-tooltip": "Veľkosť rozstupu na každej strane obrazovky. Na mobilných zariadeniach sa táto hodnota prepíše na 0 bez ohľadu na toto nastavenie.", + "pdf-reader-settings-title": "PDF Čítačka", + "pdf-scroll-mode-label": "Režim scrolovania", + "pdf-scroll-mode-tooltip": "Spôsob posúvania medzi stránkami. Vertikálne/vodorovne a klepnutím pre stránkovanie (bez posúvania)", + "pdf-theme-tooltip": "Farebná téma čítačky", + "reading-profile-series-settings-title": "Série", + "profiles-title": "Vaše čitateľské profily", + "add": "{{common.add}}", + "delete": "{{common.delete}}", + "selection-tip": "Vyberte profil zo zoznamu alebo si vytvorte nový v pravom hornom rohu", + "font-size-book-tooltip": "Percentuálna zmena mierky, ktorá sa má použiť na písmo v knihe", + "line-height-book-tooltip": "Aké medzery medzi riadkami v knihe", + "extra-tip": "Priraďte čitateľské profily prostredníctvom ponuky akcií v sériách a knižniciach alebo hromadne. Pri zmene nastavení v čítačke sa vytvorí skrytý profil, ktorý si pamätá vaše voľby pre danú sériu (nie pre súbory PDF). Tento profil sa odstráni, keď k sérii priradíte alebo aktualizujete jeden z vlastných čitateľských profilov.", + "default-profile": "Predvolené", + "add-tooltip": "Váš nový profil bude uložený po vykonaní zmien", + "make-default": "Nastaviť ako predvolené", + "scaling-option-label": "Možnosti škálovania", + "description": "Nie všetky vaše série sa dajú čítať rovnakým spôsobom, preto si pre každú knižnicu alebo sériu nastavte samostatné čitateľské profily, aby bol návrat k sérii čo najplynulejší.", + "immersive-mode-tooltip": "Týmto sa ponuka skryje za kliknutím na dokument čítačky a zapne sa možnosť klepnutia pre stránkovanie", + "image-reader-settings-title": "Čítačka obrázkov", + "pdf-spread-mode-tooltip": "Ako by mali byť stránky rozložené. Jednoduché alebo dvojité (párne/nepárne)", + "page-splitting-label": "Rozdelenie stránky", + "swipe-to-paginate-tooltip": "Malo by potiahnutie prstom po obrazovke spustiť ďalšiu alebo predchádzajúcu stránku", + "layout-mode-book-tooltip": "Ako by mal byť obsah rozložený. Posúvanie je také, aké je v knihe. 1 alebo 2 stĺpce sa prispôsobia výške zariadenia a zmestia sa 1 alebo 2 stĺpce textu na stranu", + "color-theme-book-label": "Farebný motív", + "page-splitting-tooltip": "Ako rozdeliť obrázok na celú šírku (t. j. ľavý aj pravý obrázok sa spoja)", + "allow-auto-webtoon-reader-label": "Automatický režim čítačky webových karikatúr", + "reading-direction-label": "Smer čítania", + "reading-direction-tooltip": "Smer kliknutia pre presun na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.", + "emulate-comic-book-tooltip": "Aplikuje efekt tieňa na emuláciu čítania z knihy", + "background-color-tooltip": "Farba pozadia čítačky obrázkov", + "reading-mode-tooltip": "Zmeňte čítačku na vertikálne, horizontálne stránkovanie alebo nekonečné posúvanie", + "layout-mode-label": "Režim rozloženia", + "allow-auto-webtoon-reader-tooltip": "Ak stránky vyzerajú ako webtoon, prepnite do režimu čítačky webtoonov. Môžu sa vyskytnúť falošne pozitívne výsledky.", + "pdf-spread-mode-label": "Režim šírenia", + "layout-mode-tooltip": "Zobrazenie jedného obrázka na obrazovke alebo dvoch obrázkov vedľa seba", + "emulate-comic-book-label": "Napodobniť komiks", + "swipe-to-paginate-label": "Prejdením prstom prejdete na stránkovanie", + "line-height-book-label": "Riadkovanie", + "background-color-label": "Farba pozadia", + "reading-profile-library-settings-title": "Knižnica", + "width-override-tooltip": "Prepísať šírku obrázkov v čítačke", + "font-family-tooltip": "Skupina písiem, ktoré sa majú načítať. Predvolené načíta predvolené písmo knihy", + "color-theme-book-tooltip": "Akú farebnú tému použiť na obsah a ponuku čítačky kníh", + "reading-mode-label": "Režim čítania", + "pdf-theme-label": "Téma" + }, + "bulk-set-reading-profile-modal": { + "close": "{{common.close}}", + "title": "Nastaviť profil čítania", + "filter-label": "{{common.filter}}", + "clear": "{{common.clear}}", + "no-data": "Zatiaľ nie sú vytvorené žiadne zbierky", + "loading": "{{common.loading}}", + "bound": "Väzba", + "create": "{{common.create}}" + }, + "reviews": { + "user-reviews-local": "Miestne recenzie", + "user-reviews-plus": "Externé recenzie" + }, + "review-modal": { + "title": "Upraviť recenziu", + "review-label": "Recenzia", + "close": "{{common.close}}", + "save": "{{common.save}}", + "delete": "{{common.delete}}", + "min-length": "Recenzia musí mať aspoň {{count}} znakov", + "required": "{{validation.required-field}}" } } diff --git a/UI/Web/src/assets/langs/sv.json b/UI/Web/src/assets/langs/sv.json index f18657fe4..5dfd7a1c0 100644 --- a/UI/Web/src/assets/langs/sv.json +++ b/UI/Web/src/assets/langs/sv.json @@ -79,71 +79,20 @@ "blur-unread-summaries-label": "Censurera olästa sammanfattningar", "blur-unread-summaries-tooltip": "Cencurera handlingen på volymer eller kapitel som inte har någon läsprogress (för att undvika spoilers)", "disable-animations-tooltip": "Inaktivera animationer på sidan. Användbart på e-ink-läsare.", - "reading-mode-label": "Läsläge", - "layout-mode-label": "Layoutläge", - "show-screen-hints-label": "Visa Skärmtips", - "immersive-mode-label": "Immersionsläge", - "layout-mode-book-tooltip": "Hur innehåll ska visas. Bläddra är som boken har packat det. 1 eller 2 Kolumn anpassar till höjden på enheten och passar in 1 eller 2 kolumner av text per sida", - "pdf-spread-mode-label": "Visningsläge", - "pdf-scroll-mode-tooltip": "Hur du bläddrar mellan sidorna. Vertikal/Horisontell eller Tryck för att Paginera (ingen bläddring)", "share-series-reviews-tooltip": "Ska Kavita inkludera dina recensioner av Serier för andra användare", "kavitaplus-settings-title": "Kavita+", "anilist-scrobbling-label": "AniList Scrobbling", "anilist-scrobbling-tooltip": "Tillåt Kavita att Scrobbla (envägssynk) läsförlopp och betygsättningar till AniList", "want-to-read-sync-label": "Vill Läsa Synk", "want-to-read-sync-tooltip": "Tillåt Kavita att lägga till artiklar till din Vill Läsa-lista baserat på AniList- och MAL-serier i Väntande läslista", - "reading-direction-tooltip": "Riktning att klicka för att gå till nästa sida. Höger till Vänster betyder att du klickar på vänster sida om skärmen för att gå till nästa sida.", - "scaling-option-label": "Skalningsalternativ", - "background-color-label": "Bakgrundsfärg", - "auto-close-menu-label": "Stäng Meny Automatiskt", - "show-screen-hints-tooltip": "Visa en overlay för att hjälpa till att förstå pagineringsområde och riktning", - "emulate-comic-book-label": "Emulera serietidning", - "emulate-comic-book-tooltip": "Applicerar en skuggeffekt för att efterlikna läsning från en bok", - "swipe-to-paginate-label": "Svep för att Paginera", - "swipe-to-paginate-tooltip": "Ska svepning på skärmen leda till nästa eller föregående sida", - "book-reader-settings-title": "Bokläsare", - "immersive-mode-tooltip": "Detta döljer menyn bakom ett klick på läsarens dokument och anger tryck för att paginera på", - "reading-direction-book-label": "Läsriktning", - "reading-direction-book-tooltip": "Riktning att klicka för att gå til nästa sida. Höger till Vänster betyder att du klickar på vänster sida av skärmen för att gå till nästa sida.", - "font-family-label": "Typsnittsfamilj", - "font-family-tooltip": "Typsnitt att ladda. Standard kommer ladda bokens standardtypsnitt", - "layout-mode-book-label": "Layoutläge", - "color-theme-book-label": "Färgtema", - "color-theme-book-tooltip": "Vilket färgtema ska appliceras till bokläsarinnehåll och meny", - "line-height-book-label": "Radavstånd", - "line-height-book-tooltip": "Hur stort avstånd det ska vara mellan rader i boken", - "margin-book-label": "Marginal", - "pdf-reader-settings-title": "PDF-Läsare", - "image-reader-settings-title": "Bildläsare", - "reading-direction-label": "Läsriktning", - "page-splitting-label": "Siddelning", - "scaling-option-tooltip": "Hur du skalar bilden till din skärm.", - "tap-to-paginate-label": "Tryck för att Paginera", - "tap-to-paginate-tooltip": "Ska sidorna av bokläsarskärmen tillåta tryck för att gå till föregående/nästa sida", - "writing-style-tooltip": "Ändrar riktningen av texten. Horisontal är vänster till höger, vertikal är uppifrån och ner.", - "font-size-book-label": "Typsnittsstorlek", - "margin-book-tooltip": "Hur stort avstånd det ska vara på endera sida av skärmen. Detta skrivs över av 0 på mobila enheter oavsett inställning.", - "pdf-scroll-mode-label": "Bläddringsläge", "collapse-series-relationships-label": "Dölj Serierelationer", - "background-color-tooltip": "Bakgrundsfärg för Bildläsaren", "collapse-series-relationships-tooltip": "Ska Kavita visa Serier som saknar relation eller är förälder/uppföljare", - "auto-close-menu-tooltip": "Ska menyn stängas automatiskt", - "font-size-book-tooltip": "Procent skalning att applicera på typsnitt i boken", - "pdf-spread-mode-tooltip": "Hur sidor ska visas. Enkel eller dubbel (udda/jämna)", "share-series-reviews-label": "Dela Serierecensioner", - "page-splitting-tooltip": "Hur man delar en fullbreddsbild (dvs både den vänsta och högra bilden är sammanfogade)", - "reading-mode-tooltip": "Ändra läsaren till att paginera (numrera) vertikalt, horisontellt, eller att ha oändlig bläddring", - "writing-style-label": "Skrivstil", - "layout-mode-tooltip": "Återge en enstaka bild på skärmen eller två sida-vid-sida-bilder", - "pdf-theme-label": "Utseende", "clients-opds-url-label": "OPDS-länk", "clients-api-key-label": "API-nyckel", "clients-opds-url-tooltip": "Se en lista av kompatibla OPDS klienter. ", "clients-opds-description": "Alla tredje partens klienter kommer använda antingen API-nyckeln eller Anslutnings-länken nedan. Dessa är som lösenord, håll dem hemliga.", "clients-opds-alert": "OPDS är inte aktiverat på denna server. Detta kommer inte påverka Tachiyomi användare.", - "pdf-theme-tooltip": "Läsarens färgschema", - "allow-auto-webtoon-reader-label": "Automatisk Webtoon Läsarläge", - "allow-auto-webtoon-reader-tooltip": "Byt till Webtoon Läsarläge om sidor liknar webtoon. Vissa kan visas som falskpositiv.", "clients-api-key-tooltip": "API-nyckeln är som ett lösenord. Återställs den tas alla anslutningar till klienter bort." }, "user-holds": { @@ -660,7 +609,6 @@ "home": "Hem", "all-series": "Alla Serier", "want-to-read": "Vill läsa", - "browse-authors": "Bläddra Författare", "donate": "Donera" }, "library-settings-modal": { @@ -1338,7 +1286,6 @@ "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "image-splitting-label": "Bilduppdelning", - "user-preferences-updated": "Användarinställningar uppdaterade", "prev-page-tooltip": "Föregående Sida", "next-page-tooltip": "Nästa Sida", "unbookmark-page-tooltip": "Ta bort Bokmärning av Sida", @@ -1369,7 +1316,6 @@ "back": "Bakåt", "swipe-enabled-label": "Svep Aktiverat", "bookmark-page-tooltip": "Bokmärk Sida", - "save-globally": "Spara Globalt", "reading-mode-tooltip": "Läsläge", "off": "Av", "first-time-reading-manga": "Tryck på bilden när som helst för att öppna menyn. Du kan konfigurera olika inställningar eller gå till en sida genom att klicka på progressbaren. Tryck på sidorna av bilden för att gå till nästa eller föregående sida.", @@ -1964,11 +1910,6 @@ "downloading-status": "Laddar ner…", "download-tooltip": "Ladda ner" }, - "browse-authors": { - "cover-image-description": "{{edit-series-modal.cover-image-description}}", - "author-count": "{{num}} Personer", - "title": "Bläddra Författare" - }, "file-type-group-pipe": { "archive": "Arkiv", "epub": "Epub", diff --git a/UI/Web/src/assets/langs/ta.json b/UI/Web/src/assets/langs/ta.json index 5b61fd060..73df4f370 100644 --- a/UI/Web/src/assets/langs/ta.json +++ b/UI/Web/src/assets/langs/ta.json @@ -820,14 +820,12 @@ "unbookmark-page-tooltip": "புத்தகமன் பக்கம்", "bookmarks-title": "புக்மார்க்குகள்", "collapse": "சரிவு", - "save-globally": "உலகளவில் சேமிக்கவும்", "incognito-alt": "மறைநிலை பயன்முறை இயக்கத்தில் உள்ளது. அணைக்க மாற்று.", "back": "பின்", "first-time-reading-manga": "மெனுவைத் திறக்க எந்த நேரத்திலும் படத்தைத் தட்டவும். முன்னேற்றப் பட்டியைக் சொடுக்கு செய்வதன் மூலம் நீங்கள் வெவ்வேறு அமைப்புகளை உள்ளமைக்கலாம் அல்லது பக்கத்திற்குச் செல்லலாம். படத்தின் பக்கங்களைத் தட்டவும் அடுத்த/முந்தைய பக்கத்திற்கு நகர்த்தவும்.", "layout-mode-switched": "இரட்டை தளவமைப்பை வழங்க போதுமான இடம் இல்லாததால் தளவமைப்பு பயன்முறை ஒற்றைக்கு மாறியது", "no-next-chapter": "அடுத்த அத்தியாயம் இல்லை", "no-prev-chapter": "முந்தைய அத்தியாயம் இல்லை", - "user-preferences-updated": "பயனர் விருப்பத்தேர்வுகள் புதுப்பிக்கப்பட்டன", "emulate-comic-book-label": "{{பயனர்-முன்னுரிமைகள்.இமுலேட்-காமிக்-புத்தக-லேபிள்}}", "series-progress": "தொடர் முன்னேற்றம்: {{percentage}}}" }, @@ -1215,8 +1213,6 @@ "create": "{{common.create}}" }, "user-preferences": { - "background-color-label": "பின்னணி நிறம்", - "margin-book-label": "விளிம்பு", "title": "பயனர் டாச்போர்டு", "pref-description": "இவை உங்கள் கணக்கிற்கு கட்டுப்பட்ட உலகளாவிய அமைப்புகள்.", "account-tab": "{{tabs.account-tab}}}", @@ -1242,53 +1238,6 @@ "collapse-series-relationships-tooltip": "உறவுகள் இல்லாத அல்லது பெற்றோர்/முன்னுரை இல்லாத கவிதா நிகழ்ச்சிகளைக் காட்ட வேண்டுமா", "share-series-reviews-label": "பங்கு தொடர் மதிப்புரைகளைப் பகிரவும்", "share-series-reviews-tooltip": "கவிதா மற்ற பயனர்களுக்கான தொடரின் உங்கள் மதிப்புரைகளை சேர்க்க வேண்டுமா", - "image-reader-settings-title": "பட வாசகர்", - "reading-direction-label": "வாசிப்பு திசை", - "reading-direction-tooltip": "அடுத்த பக்கத்திற்கு செல்ல சொடுக்கு செய்வதற்கான திசை. வலதுபுறம் இடதுபுறம் என்பது அடுத்த பக்கத்திற்கு செல்ல திரையின் இடது பக்கத்தில் சொடுக்கு செய்க.", - "scaling-option-label": "அளவிடுதல் விருப்பங்கள்", - "scaling-option-tooltip": "உங்கள் திரையில் படத்தை எவ்வாறு அளவிடுவது.", - "page-splitting-label": "பக்கம் பிரித்தல்", - "page-splitting-tooltip": "ஒரு முழு அகல படத்தை எவ்வாறு பிரிப்பது (அதாவது இடது மற்றும் வலது படங்கள் இணைக்கப்படுகின்றன)", - "reading-mode-label": "படித்தல் பயன்முறை", - "reading-mode-tooltip": "வாசகரை செங்குத்தாக, கிடைமட்டமாக, அல்லது எல்லையற்ற சுருளாக மாற்றவும்", - "layout-mode-label": "தளவமைப்பு பயன்முறை", - "layout-mode-tooltip": "ஒரு படத்தை திரையில் அல்லது இரண்டு பக்கவாட்டு படங்களை வழங்கவும்", - "background-color-tooltip": "பட வாசகரின் பின்னணி நிறம்", - "auto-close-menu-label": "ஆட்டோ மூடு பட்டியல்", - "auto-close-menu-tooltip": "பட்டியல் தானாக மூட வேண்டும்", - "show-screen-hints-label": "திரை குறிப்புகளைக் காட்டு", - "show-screen-hints-tooltip": "மண்பாண்டம் மற்றும் திசையைப் புரிந்துகொள்ள உதவும் மேலடுக்கு ஒரு மேலடுக்கைக் காட்டு", - "emulate-comic-book-label": "காமிக் புத்தகத்தைப் பின்பற்றுங்கள்", - "emulate-comic-book-tooltip": "ஒரு புத்தகத்திலிருந்து வாசிப்பைப் பின்பற்ற ஒரு நிழல் விளைவைப் பயன்படுத்துகிறது", - "swipe-to-paginate-label": "புறக்கணிக்க ச்வைப் செய்யவும்", - "swipe-to-paginate-tooltip": "திரையில் ச்வைப் செய்வது அடுத்த அல்லது முந்தைய பக்கம் தூண்டப்பட வேண்டும்", - "book-reader-settings-title": "புத்தக வாசகர்", - "tap-to-paginate-label": "புறக்கணிக்க தட்டவும்", - "tap-to-paginate-tooltip": "புத்தக வாசகர் திரையின் பக்கங்கள் முந்தைய/அடுத்த பக்கத்திற்கு செல்ல அதைத் தட்ட அனுமதிக்க வேண்டும்", - "immersive-mode-label": "அதிவேக முறை", - "immersive-mode-tooltip": "இது ரீடர் ஆவணத்தில் ஒரு கிளிக்கின் பின்னால் உள்ள மெனுவை மறைத்து, தட்டுதல்", - "reading-direction-book-label": "வாசிப்பு திசை", - "reading-direction-book-tooltip": "அடுத்த பக்கத்திற்கு செல்ல சொடுக்கு செய்வதற்கான திசை. வலதுபுறம் இடதுபுறம் என்பது அடுத்த பக்கத்திற்கு செல்ல திரையின் இடது பக்கத்தில் சொடுக்கு செய்க.", - "font-family-label": "எழுத்துரு குடும்பம்", - "font-family-tooltip": "ஏற்றுவதற்கு எழுத்துரு குடும்பம். இயல்புநிலை புத்தகத்தின் இயல்புநிலை எழுத்துருவை ஏற்றும்", - "writing-style-label": "எழுதும் நடை", - "writing-style-tooltip": "உரையின் திசையை மாற்றுகிறது. கிடைமட்டமானது இடமிருந்து வலமாக உள்ளது, செங்குத்து மேலிருந்து கீழாக உள்ளது.", - "layout-mode-book-label": "தளவமைப்பு பயன்முறை", - "layout-mode-book-tooltip": "உள்ளடக்கம் எவ்வாறு அமைக்கப்பட வேண்டும். நூல் அதை பொதி செய்வது போல உருள் உள்ளது. 1 அல்லது 2 நெடுவரிசை சாதனத்தின் உயரத்திற்கு பொருந்துகிறது மற்றும் ஒரு பக்கத்திற்கு 1 அல்லது 2 நெடுவரிசைகளுக்கு பொருந்துகிறது", - "color-theme-book-label": "வண்ண கருப்பொருள்", - "color-theme-book-tooltip": "புத்தக வாசகர் உள்ளடக்கம் மற்றும் மெனுவுக்கு என்ன வண்ண கருப்பொருள் பொருந்தும்", - "font-size-book-label": "எழுத்துரு அளவு", - "font-size-book-tooltip": "புத்தகத்தில் எழுத்துருவுக்கு விண்ணப்பிக்க அளவிடுதலின் விழுக்காடு", - "line-height-book-label": "வரி இடைவெளி", - "line-height-book-tooltip": "புத்தகத்தின் வரிகளுக்கு இடையில் எவ்வளவு இடைவெளி", - "margin-book-tooltip": "திரையின் ஒவ்வொரு பக்கத்திலும் எவ்வளவு இடைவெளி. இந்த அமைப்பைப் பொருட்படுத்தாமல் இது மொபைல் சாதனங்களில் 0 ஆக மேலெழுதும்.", - "pdf-reader-settings-title": "PDF ரீடர்", - "pdf-scroll-mode-label": "உருள் பயன்முறை", - "pdf-scroll-mode-tooltip": "நீங்கள் பக்கங்கள் வழியாக எப்படி உருட்டுகிறீர்கள். செங்குத்து/கிடைமட்ட மற்றும் புறக்கணிப்பு (சுருள் இல்லை)", - "pdf-spread-mode-label": "பரவல் பயன்முறை", - "pdf-spread-mode-tooltip": "பக்கங்கள் எவ்வாறு அமைக்கப்பட வேண்டும். ஒற்றை அல்லது இரட்டை (ஒற்றைப்படை/கூட)", - "pdf-theme-label": "கருப்பொருள்", - "pdf-theme-tooltip": "வாசகரின் வண்ண கருப்பொருள்", "clients-opds-alert": "இந்த சேவையகத்தில் OPDS இயக்கப்படவில்லை. இது டச்சியோமி பயனர்களை பாதிக்காது.", "clients-opds-description": "அனைத்து 3 வது தரப்பு வாடிக்கையாளர்களும் பநிஇ விசை அல்லது கீழே உள்ள இணைப்பு முகவரி ஐப் பயன்படுத்துவார்கள். இவை கடவுச்சொற்கள் போன்றவை, அதை தனிப்பட்டதாக வைத்திருங்கள்.", "clients-api-key-tooltip": "பநிஇ விசை கடவுச்சொல் போன்றது. அதை மீட்டமைப்பது தற்போதுள்ள எந்த வாடிக்கையாளர்களையும் செல்லாது.", @@ -1898,7 +1847,6 @@ "collections": "சேகரிப்புகள்", "reading-lists": "பட்டியல்களைப் படித்தல்", "bookmarks": "புக்மார்க்குகள்", - "browse-authors": "ஆசிரியர்களை உலாவுக", "filter-label": "{{common.filter}}}", "all-series": "அனைத்து தொடர்களும்", "clear": "{{common.clear}}}", @@ -1908,11 +1856,6 @@ "more": "மேலும்", "customize": "{{settings.customize}}" }, - "browse-authors": { - "title": "ஆசிரியர்கள் மற்றும் எழுத்தாளர்களை உலாவுக", - "author-count": "{{num}} மக்கள்", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "person-detail": { "known-for-title": "அறியப்படுகிறது", "individual-role-title": "ஒரு {{role}}", diff --git a/UI/Web/src/assets/langs/th.json b/UI/Web/src/assets/langs/th.json index 059c707e6..d09001c7b 100644 --- a/UI/Web/src/assets/langs/th.json +++ b/UI/Web/src/assets/langs/th.json @@ -99,42 +99,6 @@ "collapse-series-relationships-tooltip": "Kavita ควรแสดงซีรีส์ที่ไม่มีความสัมพันธ์หรือเป็นพาเรนต์/พรีเควล", "share-series-reviews-label": "แบ่งปันบทวิจารณ์ซีรีส์", "share-series-reviews-tooltip": "Kavita ควรรวมบทวิจารณ์ซีรี่ส์ของคุณสำหรับผู้ใช้รายอื่นหรือไม่", - "image-reader-settings-title": "โปรแกรมอ่านรูปภาพ", - "reading-direction-label": "ทิศทางการอ่าน", - "reading-direction-tooltip": "ทิศทางการคลิกเพื่อไปยังหน้าถัดไป ขวาไปซ้าย หมายถึงคุณคลิกที่ด้านซ้ายของหน้าจอเพื่อไปยังหน้าถัดไป", - "scaling-option-label": "ตัวเลือกการปรับขนาด", - "scaling-option-tooltip": "วิธีปรับขนาดภาพให้พอดีกับหน้าจอของคุณ", - "page-splitting-label": "การแยกหน้า", - "page-splitting-tooltip": "วิธีแยกภาพเต็มความกว้าง (เช่น รวมภาพซ้ายและขวาเข้าด้วยกัน)", - "reading-mode-label": "โหมดการอ่าน", - "layout-mode-label": "โหมดเค้าโครง", - "layout-mode-tooltip": "เรนเดอร์ภาพเดียวไปที่หน้าจอหรือสองภาพเคียงข้างกัน", - "background-color-label": "สีพื้นหลัง", - "auto-close-menu-label": "ปิดเมนูอัตโนมัติ", - "show-screen-hints-label": "แสดงคำแนะนำบนหน้าจอ", - "emulate-comic-book-label": "เลียนแบบหนังสือการ์ตูน", - "swipe-to-paginate-label": "ปัดเพื่อเปลี่ยนหน้า", - "book-reader-settings-title": "เครื่องอ่านหนังสือ", - "tap-to-paginate-label": "แตะเพื่อเปลี่ยนหน้า", - "tap-to-paginate-tooltip": "อนุญาตให้แตะมุมหนังสือเพื่อเลื่อนไปยังหน้าก่อนหน้า/ถัดไป", - "immersive-mode-label": "โหมดดื่มด่ำ", - "immersive-mode-tooltip": "วิธีนี้จะซ่อนเมนูหลังการคลิกบนเอกสารของผู้อ่านและเปิดการแตะเพื่อแบ่งหน้า", - "reading-direction-book-label": "ทิศทางการอ่าน", - "reading-direction-book-tooltip": "ทิศทางการคลิกเพื่อไปยังหน้าถัดไป ขวาไปซ้าย หมายถึงคุณคลิกที่ด้านซ้ายของหน้าจอเพื่อไปยังหน้าถัดไป", - "font-family-label": "ตระกูลฟอนต์", - "font-family-tooltip": "ตระกูลฟอนต์เริ่มต้น ค่าเริ่มต้นจะโหลดแบบอักษรเริ่มต้นของหนังสือ", - "writing-style-label": "สไตล์การเขียน", - "writing-style-tooltip": "เปลี่ยนทิศทางของข้อความ แนวนอนคือซ้ายไปขวา แนวตั้งคือบนลงล่าง", - "layout-mode-book-label": "โหมดเค้าโครง", - "layout-mode-book-tooltip": "ควรจัดวางเนื้อหาอย่างไร เลื่อนเป็นไปตามที่หนังสือบรรจุไว้ 1 หรือ 2 คอลัมน์พอดีกับความสูงของอุปกรณ์ และพอดีกับ 1 หรือ 2 คอลัมน์ของข้อความต่อหน้า", - "color-theme-book-label": "ธีมสี", - "color-theme-book-tooltip": "ธีมสีใดที่จะใช้กับเนื้อหาและเมนูของผู้อ่านหนังสือ", - "font-size-book-label": "ขนาดตัวอักษร", - "line-height-book-label": "ระยะห่างบรรทัด", - "line-height-book-tooltip": "ระยะห่างระหว่างบรรทัดของหนังสือมากน้อยเพียงใด", - "margin-book-label": "ระยะขอบ", - "margin-book-tooltip": "ระยะห่างแต่ละด้านของหน้าจอเท่าใด ค่านี้จะแทนที่เป็น 0 บนอุปกรณ์เคลื่อนที่โดยไม่คำนึงถึงการตั้งค่านี้", - "pdf-reader-settings-title": "โปรแกรมอ่าน PDF", "clients-opds-alert": "OPDS ไม่ได้เปิดใช้งานบนเซิร์ฟเวอร์นี้ สิ่งนี้จะไม่ส่งผลกระทบต่อผู้ใช้ Tachiyomi", "clients-opds-description": "ไคลแอนบุคคลที่สามทั้งหมดจะใช้คีย์ API หรือ URL การเชื่อมต่อด้านล่าง สิ่งเหล่านี้เป็นเหมือนรหัสผ่าน โปรดเก็บไว้เป็นส่วนตัว", "clients-api-key-tooltip": "คีย์ API เป็นเหมือนรหัสผ่าน เก็บเป็นความลับ เก็บไว้ให้ปลอดภัย", @@ -787,7 +751,6 @@ "close": "{{common.close}}" }, "manga-reader": { - "save-globally": "บันทึก", "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}" }, diff --git a/UI/Web/src/assets/langs/tr.json b/UI/Web/src/assets/langs/tr.json index eb08d66df..31de092a6 100644 --- a/UI/Web/src/assets/langs/tr.json +++ b/UI/Web/src/assets/langs/tr.json @@ -23,7 +23,8 @@ "cancel": "{{common.cancel}}", "saving": "Kaydediliyor…", "update": "Güncelle", - "account-detail-title": "Hesap ayrıntıları" + "account-detail-title": "Hesap ayrıntıları", + "invalid-email-warning": "Doğru olmayan bir e-posta, Kavita'nın bazı işlevlerini engelleyecektir" }, "user-scrobble-history": { "title": "Arşiv geçmişi", @@ -90,32 +91,12 @@ "disable-animations-tooltip": "Sitedeki animasyonları kapat. E-kitap okuyucular için ideal.", "share-series-reviews-label": "Seri incelemelerini paylaş", "share-series-reviews-tooltip": "Kavita, Seriler hakkındaki yorumlarınızı diğer kullanıcılar için eklemeli mi?", - "image-reader-settings-title": "Resim okuyucu", - "reading-direction-label": "Okuma yönü", - "scaling-option-label": "Ölçekleme Ayarları", - "page-splitting-label": "Sayfa bölmesi", - "reading-mode-label": "Okuma Modu", - "layout-mode-label": "Düzen modu", - "background-color-label": "Arka plan rengi", - "auto-close-menu-label": "Otomatik Kapatma Menüsü", - "show-screen-hints-label": "Ekran ipuçlarını göster", - "emulate-comic-book-label": "Çizgi romanı emüle et", - "book-reader-settings-title": "Kitap okuyucu", - "reading-direction-book-label": "Okuma yönü", - "font-family-label": "Font ailesi", - "writing-style-label": "Yazı stili", - "color-theme-book-label": "Renk teması", - "font-size-book-label": "Font Boyutu", - "line-height-book-label": "Satır Aralığı", - "line-height-book-tooltip": "Kitapta satır aralıları ne kadar olmalıdır", - "margin-book-label": "Birleştir", "clients-opds-alert": "OPDS bu sunucuda aktif değil. Bu Tachiyomi kullanıcıları etkilemeyecek.", "clients-opds-description": "Tüm 3. Parti istemciler API key ya da alttaki bağlantı linkini kullanmak zorundadır. Bunlar şifre gibidir, başkalarıyla paylaşmayın.", "clients-api-key-tooltip": "API anahtarı bir şifre gibidir. Sıfırlamak mevcut istemcileri geçersiz kılar.", "clients-opds-url-tooltip": "Desteklenen OPDS istemcilerinin listesine bakın: ", "reset": "{{common.reset}}", "save": "{{common.save}}", - "pdf-reader-settings-title": "PDF okuyucu", "kavitaplus-settings-title": "Kavita+" }, "user-holds": { @@ -147,7 +128,9 @@ "not-applicable-for-admins": "Bu yöneticiler için uygullanamaz.", "age-rating-label": "{{metadata-fields.age-rating-title}}", "no-restriction": "Hiçbir sınırlama yok", - "include-unknowns-label": "Bilinmeyenleri ekle" + "include-unknowns-label": "Bilinmeyenleri ekle", + "description": "Seçildiğinde, seçilen kısıtlamadan daha büyük olan en az bir ögeye sahip tüm seri ve okuma listeleri sonuçlardan kaldırılır.", + "include-unknowns-tooltip": "Eğer doğruysa, bilinmeyenlere yaş kısıtlaması ile izin verilecektir. Bu, yaş kısıtlamaları olan kullanıcılara atılmayan medyanın sızmasına yol açabilir." }, "site-theme-provider-pipe": { "system": "Sistem", @@ -161,7 +144,9 @@ "delete": "{{common.delete}}", "edit": "{{common.edit}}", "no-data": "{{typeahead.no-data}}", - "actions-header": "{{manage-users.actions-header}}" + "actions-header": "{{manage-users.actions-header}}", + "email-setup-alert": "Cihazlarınıza dosya göndermek ister misiniz? Önce yönetici kurulum e-posta ayarlarınızı alın!", + "email-label": "E-posta" }, "edit-device-modal": { "device-name-label": "{{manage-devices.name-label}}", @@ -171,7 +156,8 @@ "close": "{{common.close}}", "cancel": "{{common.cancel}}", "required-field": "{{validation.required-field}}", - "valid-email": "{{validation.valid-email}}" + "valid-email": "{{validation.valid-email}}", + "email-tooltip": "Bu e-posta, dosya göndermeyi kabul etmek için kullanılacaktır" }, "change-password": { "password-label": "{{common.password}}", @@ -194,13 +180,18 @@ "setup-user-account": "Kullanıcının hesabını kur", "email-title": "E-posta", "email-label": "Yeni e-posta", - "current-password-label": "Geçerli parola" + "current-password-label": "Geçerli parola", + "email-updated-title": "E-posta güncellendi", + "email-not-confirmed": "Bu e-posta onaylanmadı", + "email-confirmed": "Bu e-posta onaylandı" }, "change-age-restriction": { "reset": "{{common.reset}}", "edit": "{{common.edit}}", "cancel": "{{common.cancel}}", - "save": "{{common.save}}" + "save": "{{common.save}}", + "age-restriction-label": "Yaş kısıtlaması", + "unknowns": "Bilinmeyenler" }, "scrobbling-providers": { "instructions": "Kullanıcılar ilk kez Kavita+'nın {{service}} ile iletişimine izin vermek için aşağıdaki \"{{scrobbling-providers.generate}}\" üzerine tıklamalıdır. Uygulamaya yetki verdikten sonra, jetonu kopyalayıp aşağıdaki girişe yapıştırın. Jetonunuzu istediğiniz zaman yenileyebilirsiniz.", @@ -209,7 +200,8 @@ "save": "{{common.save}}", "loading": "{{common.loading}}", "anilist-first-later": "Sonra", - "anilist-first-now": "Şimdi" + "anilist-first-now": "Şimdi", + "generate": "Üret" }, "typeahead": { "close": "{{common.close}}", @@ -225,7 +217,9 @@ "total-pages-read-tooltip": "{{user-stats-info-cards.total-pages-read-label}}: {{value}}", "total-words-read-tooltip": "{{user-stats-info-cards.total-words-read-label}}: {{value}}", "time-spent-reading-tooltip": "{{user-stats-info-cards.time-spent-reading-label}}: {{value}}", - "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}" + "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}", + "total-words-read-label": "Toplam okunan sözcük", + "total-pages-read-label": "Toplam okunan sayfa" }, "top-readers": { "this-week": "{{time-periods.this-week}}", @@ -237,12 +231,17 @@ }, "role-selector": { "deselect-all": "{{common.deselect-all}}", - "select-all": "{{common.select-all}}" + "select-all": "{{common.select-all}}", + "title": "Roller" }, "directory-picker": { "close": "{{common.close}}", "cancel": "{{common.cancel}}", - "help": "{{common.help}}" + "help": "{{common.help}}", + "path-label": "Yol", + "type-header": "Tür", + "name-header": "Ad", + "share": "Paylaş" }, "library-access-modal": { "select-all": "{{common.select-all}}", @@ -310,7 +309,8 @@ "save": "{{common.save}}" }, "book-reader": { - "bookmarks-header": "{{side-nav.bookmarks}}" + "bookmarks-header": "{{side-nav.bookmarks}}", + "go-to-page-prompt": "{{totalPages}} sayfa vardır. Hangi sayfaya gitmek istiyorsunuz?" }, "confirm-email": { "username-label": "{{common.username}}", @@ -467,7 +467,8 @@ "entity-title": { "issue-num": "{{common.issue-hash-num}}", "chapter": "{{common.chapter-num}}", - "book-num": "{{common.book-num-shorthand}}" + "book-num": "{{common.book-num-shorthand}}", + "single-volume": "Tek cilt" }, "manage-media-issues": { "filter-label": "{{common.filter}}" @@ -561,7 +562,8 @@ "close": "{{common.close}}" }, "shortcuts-modal": { - "close": "{{common.close}}" + "close": "{{common.close}}", + "double-click": "çift tık" }, "grouped-typeahead": { "genres": "{{metadata-fields.genres-title}}", @@ -604,7 +606,8 @@ }, "manga-reader": { "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}" + "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", + "layout-mode-switched": "Düzen modu, çift düzeni oluşturmak için yetersiz alan nedeniyle tek düzene geçti" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -731,7 +734,14 @@ }, "server-stats": { "tags": "{{metadata-fields.tags-title}}", - "genres": "{{metadata-fields.genres-title}}" + "genres": "{{metadata-fields.genres-title}}", + "total-genres-tooltip": "Toplam tür: {{count}}", + "total-read-time-tooltip": "Toplam okuma süresi: {{count}}", + "total-volumes-tooltip": "Toplam cilt: {{count}}", + "total-files-tooltip": "Toplam dosya: {{count}}", + "total-tags-tooltip": "Toplam etiket: {{count}}", + "total-people-tooltip": "Toplam kişi: {{count}}", + "total-read-time-label": "Toplam okuma süresi" }, "customize-dashboard-modal": { "close": "{{common.close}}", @@ -797,7 +807,10 @@ "1-column": "1 Sütun", "2-column": "2 Sütun", "cards": "Kartlar", - "up-to-down": "Yukarıdan Aşağıya" + "up-to-down": "Yukarıdan Aşağıya", + "double": "Çift", + "single": "Tek", + "double-manga": "Çift (Manga)" }, "validation": { "required-field": "Bu alan gereklidir" @@ -828,7 +841,8 @@ "account-migration-complete": "Hesap taşıma tamamlandı", "reset-ip-address": "IP adresleri sıfırla", "password-reset": "Parola sıfırla", - "email-service-reset": "E-posta hizmeti sıfırla" + "email-service-reset": "E-posta hizmeti sıfırla", + "age-restriction-updated": "Yaş kısıtlaması güncellendi" }, "api-key": { "hide": "Gizle", @@ -841,5 +855,40 @@ }, "publication-status-pipe": { "cancelled": "İptal edildi" + }, + "day-of-week-pipe": { + "monday": "Pazartesi", + "sunday": "Pazar", + "tuesday": "Salı", + "thursday": "Perşembe", + "friday": "Cuma", + "saturday": "Cumartesi", + "wednesday": "Çarşamba" + }, + "role-localized-pipe": { + "change-restriction": "Kısıtlamayı değiştir" + }, + "file-breakdown-stats": { + "total-file-size-title": "Toplam dosya boyutu:" + }, + "cbl-import-result-pipe": { + "failure": "Başarısız", + "success": "Başarılı", + "partial": "Kısmi" + }, + "relationship-pipe": { + "other": "Diğer", + "prequel": "Önsöz", + "character": "Karakter", + "parent": "Ebeveyn" + }, + "manage-metadata-settings": { + "derive-publication-status-tooltip": "Yayın durumunun toplam bölüm/cilt sayılarından türetilmesine izin ver." + }, + "card-detail-layout": { + "total-items": "Toplam {{count}} öge" + }, + "pdf-layout-mode-pipe": { + "single": "Tek sayfa" } } diff --git a/UI/Web/src/assets/langs/uk.json b/UI/Web/src/assets/langs/uk.json index 37e2c1131..bef4f81cf 100644 --- a/UI/Web/src/assets/langs/uk.json +++ b/UI/Web/src/assets/langs/uk.json @@ -71,26 +71,11 @@ "reset": "{{common.reset}}", "save": "{{common.save}}", "locale-label": "Мова", - "margin-book-label": "Поля", - "immersive-mode-tooltip": "Ховатиме меню по клацу на документ читалки й вмикатиме тапання для перегортання сторінок", - "image-reader-settings-title": "Читач зображень", - "layout-mode-label": "Вигляд макету", - "background-color-label": "Колір тла", - "color-theme-book-tooltip": "Який набір кольорів має бути застосовний до контенту та меню читалки", "blur-unread-summaries-tooltip": "Розмиває текст описів непрочитаних томів чи глав, аби не натрапити на спойлери", "disable-animations-tooltip": "Вимкнути анімації на сайті. Доречно для електронних читалок.", "collapse-series-relationships-tooltip": "Чи має Kavita показувати серії, у яких немає взаємозвʼязків чи які є найпершими або приквелами", - "reading-direction-tooltip": "Напрям, в якому треба клацати, щоб перейти на наступну сторінку. Ліворуч – треба клацнути на ліву частину екрана, щоб перейти на наступну сторінку.", - "auto-close-menu-label": "Меню автозакриття", - "show-screen-hints-label": "Показувати підказки екрана", - "emulate-comic-book-label": "Симулювати комікс", - "reading-direction-book-label": "Напрям читання", - "font-family-label": "Сімейство шрифтів", - "reading-direction-book-tooltip": "\"Ліворуч\" – клацання по лівій частині екрана перемикатиме на наступну сторінку.", - "writing-style-tooltip": "Змінює напрям тексту. Горизонтальний – зліва направо, вертикальний – зверху вниз.", "clients-opds-description": "Всі сторонні клієнти мають використовувати API-ключ або URL для звʼязку нижче. Це як паролі, зберігайте їх у таємниці.", "title": "Панель користувача", - "pdf-scroll-mode-label": "Режим прокрутки", "share-series-reviews-tooltip": "Чи має Kavita показувати ваші огляди серій іншим користувачам", "pref-description": "Це глобальні налаштування вашого облікового запису.", "success-toast": "Налаштування користувача оновлені", @@ -103,43 +88,9 @@ "disable-animations-label": "Відключити анімації", "collapse-series-relationships-label": "Згорнути взаємозвʼязки серій", "share-series-reviews-label": "Ділитися оглядами серій", - "reading-direction-label": "Напрям читання", - "scaling-option-label": "Налаштування масштабу", - "scaling-option-tooltip": "Як збільшувати зображення на вашому екрані.", - "page-splitting-label": "Розбивка сторінки", - "page-splitting-tooltip": "Як розбивати зображення на весь розворот", - "reading-mode-label": "Режим читання", - "layout-mode-tooltip": "Показувати зображення цілим на екрані чи як два зображення поруч одне з одним", - "swipe-to-paginate-label": "Свайпати для перегортання", - "book-reader-settings-title": "Читач книжок", - "tap-to-paginate-label": "Тапати для перегортання", - "tap-to-paginate-tooltip": "Чи тапання по боках екрана з текстом має перегортати сторінки", - "immersive-mode-label": "Режим занурення", - "font-family-tooltip": "Яке сімейство шрифтів має завантажуватись. За замовчуванням завантажується шрифт книги", - "writing-style-label": "Стиль письма", - "layout-mode-book-label": "Режим макету", - "layout-mode-book-tooltip": "Як має бути розташований контент. Прокрутка – стандартна реалізація книги. 1 чи 2 колонки – текст відповідає висоті пристрою й представляється 1 чи 2 колонками тексту на кожній сторінці", - "color-theme-book-label": "Кольорова тема", "clients-opds-alert": "OPDS не ввімкнуто на цьому сервері. Це не зачепить користувачів Tachiyomi.", "clients-api-key-tooltip": "API-ключ – як пароль. Його скидання унеможливить роботу усіх чинних клієнтів.", - "pdf-spread-mode-label": "Режим розподілу", - "reading-mode-tooltip": "Змінити розділення на сторінки на вертикальне, горизонтальне, чи нескінченну прокрутку", - "background-color-tooltip": "Колір тла у читача зображень", - "auto-close-menu-tooltip": "Чи має меню автоматично закриватися", - "show-screen-hints-tooltip": "Показувати підказки про область пагінації та напрям читання", - "emulate-comic-book-tooltip": "Застосовує ефект тіні, як при читанні з книги", - "swipe-to-paginate-tooltip": "Чи має проведення пальця по сторінці перегортати книгу на наступну чи попередню сторінку", "locale-tooltip": "Мова інтерфейсу Kavita", - "font-size-book-label": "Розмір шрифта", - "font-size-book-tooltip": "Розмір шрифту в книзі", - "line-height-book-label": "Міжрядковий інтервал", - "line-height-book-tooltip": "Скільки вільного місця має бути між рядками в книзі", - "margin-book-tooltip": "Скільки вільного місця має бути з кожного боку сторінки. На мобільних пристроях значення завжди 0.", - "pdf-reader-settings-title": "PDF-читалка", - "pdf-scroll-mode-tooltip": "Як відбувається прокрутка сторінок – вертикальна, горизонтальна, або перегортання сторінку по клацу", - "pdf-spread-mode-tooltip": "Як повинні бути розміщені сторінки – як одинарні чи подвійні (парні/непарні)", - "pdf-theme-label": "Тема", - "pdf-theme-tooltip": "Кольорова тема читалки", "clients-opds-url-label": "OPDS-посилання", "clients-api-key-label": "API-ключ", "clients-opds-url-tooltip": "Список підтримуваних OPDS-клієнтів: " diff --git a/UI/Web/src/assets/langs/vi.json b/UI/Web/src/assets/langs/vi.json index 2dd4fbc96..beb2a3353 100644 --- a/UI/Web/src/assets/langs/vi.json +++ b/UI/Web/src/assets/langs/vi.json @@ -61,20 +61,7 @@ "smart-filters-tab": "{{tabs.smart-filters-tab}}", "reset": "{{common.reset}}", "save": "{{common.save}}", - "reading-mode-label": "Chế Độ Đọc", - "background-color-label": "Màu nền", - "show-screen-hints-tooltip": "Hiển thị lớp phủ để giúp hiểu khu vực phân trang và hướng", - "tap-to-paginate-label": "Chạm để Chuyển Trang", - "swipe-to-paginate-label": "Vuốt để chuyển trang", - "reading-direction-book-tooltip": "Hướng nhấp để chuyển sang trang tiếp theo. Từ phải sang trái có nghĩa là bạn nhấp vào bên trái màn hình để chuyển sang trang tiếp theo.", - "layout-mode-book-label": "Bố Cục", - "layout-mode-book-tooltip": "Nội dung nên được trình bày như thế nào. Cuộn là cách mà cuốn sách được đóng gói. 1 hoặc 2 cột phù hợp với chiều cao của thiết bị và phù hợp với 1 hoặc 2 cột văn bản trên mỗi trang", "clients-opds-description": "Tất cả các khách hàng của bên thứ 3 sẽ sử dụng khóa API hoặc URL kết nối bên dưới. Chúng giống như mật khẩu, hãy giữ bí mật.", - "pdf-theme-tooltip": "Màu chủ đề của trình đọc", - "layout-mode-label": "Bố Cục", - "margin-book-label": "Căn Lề", - "font-size-book-label": "Kích Thước Phông Chữ", - "background-color-tooltip": "Màu nền của Trình Đọc Truyện Tranh", "page-layout-mode-label": "Chế Độ Bố Trí Trang", "title": "Bảng điều khiển người dùng", "pref-description": "Đây là cài đặt chung được liên kết với tài khoản của bạn.", @@ -93,42 +80,6 @@ "collapse-series-relationships-tooltip": "Kavita có nên hiển thị mối quan hệ của các truyện không (phần phụ/phần tiền truyện)", "share-series-reviews-label": "Chia sẻ đánh giá của Truyện", "share-series-reviews-tooltip": "Kavita có nên đưa đánh giá của bạn về truyện này cho những người dùng khác không", - "reading-direction-label": "Hướng Đọc", - "reading-direction-tooltip": "Hướng nhấp để chuyển sang trang tiếp theo. Từ phải sang trái có nghĩa là bạn nhấp vào bên trái màn hình để chuyển sang trang tiếp theo.", - "scaling-option-label": "Cài Đặt Thu Phóng", - "scaling-option-tooltip": "Cách thu phóng hình ảnh theo màn hình của bạn.", - "page-splitting-label": "Phân Trang", - "page-splitting-tooltip": "Cách chia một hình ảnh có chiều rộng đầy đủ (tức là cả hình ảnh bên trái và bên phải được kết hợp)", - "reading-mode-tooltip": "Thay đổi trình đọc để phân trang theo chiều dọc, chiều ngang hoặc cuộn vô hạn", - "layout-mode-tooltip": "Hiển thị một hình ảnh duy nhất trên màn hình hoặc hai hình ảnh cạnh nhau", - "image-reader-settings-title": "Trình Đọc Truyện Tranh", - "auto-close-menu-label": "Tự Động Đóng Menu", - "auto-close-menu-tooltip": "Menu có nên tự động đóng", - "show-screen-hints-label": "Hiển Thị Gợi Ý Màn Hình", - "emulate-comic-book-label": "Giả Lập Truyện Tranh", - "emulate-comic-book-tooltip": "Áp dụng hiệu ứng đổ bóng để mô phỏng việc đọc sách", - "swipe-to-paginate-tooltip": "Vuốt trên màn hình có khiến trang tiếp theo hoặc trang trước đó được hiển thị không", - "book-reader-settings-title": "Trình Đọc Sách", - "tap-to-paginate-tooltip": "Các cạnh của màn hình đọc sách có cho phép chạm vào để chuyển sang trang trước/trang tiếp theo không", - "immersive-mode-label": "Chế Độ Sống Động", - "immersive-mode-tooltip": "Thao tác này sẽ ẩn menu sau khi nhấp vào tài liệu đọc và bật chạm để chuyển trang", - "reading-direction-book-label": "Hướng Đọc", - "font-family-label": "Phông chữ", - "font-family-tooltip": "Phông chữ để hiển thị trang sách. Mặc định sẽ tải phông chữ mặc định của sách", - "writing-style-label": "Phong Cách Viết", - "writing-style-tooltip": "Thay đổi hướng của văn bản. Ngang là từ trái sang phải, dọc là từ trên xuống dưới.", - "color-theme-book-label": "Màu Chủ Đề", - "color-theme-book-tooltip": "Áp dụng chủ đề màu nào cho nội dung và menu của trình đọc sách", - "font-size-book-tooltip": "Tỷ lệ phần trăm áp dụng cho phông chữ trong sách", - "line-height-book-label": "Khoảng Cách Dòng", - "line-height-book-tooltip": "Khoảng cách giữa các dòng trong sách là bao nhiêu", - "margin-book-tooltip": "Khoảng cách giữa mỗi bên màn hình là bao nhiêu. Cài đặt này sẽ tự động bị ghi đè bằng 0 trên thiết bị di động.", - "pdf-reader-settings-title": "Trình Đọc PDF", - "pdf-scroll-mode-label": "Chế Độ Cuộn", - "pdf-scroll-mode-tooltip": "Cách bạn cuộn qua các trang. Dọc/Ngang và Chạm để Chuyển trang (không cuộn)", - "pdf-spread-mode-tooltip": "Cách bố trí các trang. Đơn hoặc đôi (lẻ/chẵn)", - "pdf-spread-mode-label": "Chế Độ Mở Rộng", - "pdf-theme-label": "Chủ Đề", "clients-opds-alert": "OPDS không được bật trên máy chủ này. Điều này sẽ không ảnh hưởng đến người dùng Tachiyomi.", "clients-api-key-tooltip": "Khóa API giống như mật khẩu. Việc đặt lại khóa sẽ làm mất hiệu lực mọi ứng dụng khách hiện có.", "clients-opds-url-tooltip": "Xem danh sách các máy khách OPDS được hỗ trợ: ", @@ -606,7 +557,6 @@ "filter-label": "{{common.filter}}", "clear": "{{common.clear}}", "customize": "{{settings.customize}}", - "browse-authors": "Duyệt Theo Tác Giả", "reading-lists": "Danh Sách Đọc", "bookmarks": "Dấu Trang", "all-series": "Tất Cả Series", @@ -1269,7 +1219,6 @@ "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "back": "Trở Về", - "save-globally": "Lưu Tất Cả", "reading-direction-tooltip": "Hướng Đọc: ", "reading-mode-tooltip": "Chế Độ Đọc", "fullscreen": "Toàn Màn Hình", @@ -1279,7 +1228,6 @@ "brightness-label": "Độ Sáng", "unbookmark-page-tooltip": "Bỏ Đánh Dấu Trang", "no-prev-chapter": "Không có chương trước đó", - "user-preferences-updated": "Tùy chọn người dùng đã được cập nhật", "width": "Chiều Rộng", "height": "Chiều Cao", "bookmarks-title": "Dấu Trang", @@ -1917,11 +1865,6 @@ "browse-person-title": "Tất cả các tác phẩm của {{name}}", "browse-person-by-role-title": "Tất cả các tác phẩm của {{name}} với tư cách là {{role}}" }, - "browse-authors": { - "title": "Duyệt Theo Tác Giả & Nhà Văn", - "author-count": "{{num}} Người", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" - }, "download-button": { "downloading-status": "Đang Tải Xuống.…", "download-tooltip": "Tải Xuống" diff --git a/UI/Web/src/assets/langs/zh_Hans.json b/UI/Web/src/assets/langs/zh_Hans.json index af222921d..e35b8a171 100644 --- a/UI/Web/src/assets/langs/zh_Hans.json +++ b/UI/Web/src/assets/langs/zh_Hans.json @@ -83,7 +83,7 @@ }, "user-preferences": { "title": "用户面板", - "pref-description": "这些是与您的帐户绑定的全局设置。", + "pref-description": "这些是与您的帐户绑定的全局设置。阅读器设置位于“阅读配置文件”中。", "account-tab": "{{tabs.account-tab}}", "preferences-tab": "{{tabs.preferences-tab}}", "theme-tab": "{{tabs.theme-tab}}", @@ -107,55 +107,6 @@ "collapse-series-relationships-tooltip": "是否显示没有关联的系列或者前传", "share-series-reviews-label": "分享系列评论", "share-series-reviews-tooltip": "是否对其他用户显示你的评论", - "image-reader-settings-title": "图像阅读器", - "reading-direction-label": "阅读方向", - "reading-direction-tooltip": "单击方向移动到下一页。从右到左意味着您单击屏幕左侧以移至下一页。", - "scaling-option-label": "缩放选项", - "scaling-option-tooltip": "图片在屏幕上的缩放方式。", - "page-splitting-label": "页面分割", - "page-splitting-tooltip": "如何分割全宽图像（即左右图像合并）", - "reading-mode-label": "阅读模式", - "reading-mode-tooltip": "将阅读器更改为垂直、水平分页或无限滚动", - "layout-mode-label": "布局模式", - "layout-mode-tooltip": "将单个图像或两个并排图像渲染到屏幕上", - "background-color-label": "背景色", - "background-color-tooltip": "图像阅读器的背景颜色", - "auto-close-menu-label": "自动关闭菜单", - "auto-close-menu-tooltip": "菜单应该自动关闭", - "show-screen-hints-label": "显示屏幕提示", - "show-screen-hints-tooltip": "显示一个覆盖图层以帮助了解分页区域和方向", - "emulate-comic-book-label": "模仿漫画书", - "emulate-comic-book-tooltip": "应用阴影效果来模拟书籍", - "swipe-to-paginate-label": "滑动翻页", - "swipe-to-paginate-tooltip": "在屏幕上滑动是否应触发下一页或上一页", - "book-reader-settings-title": "书籍阅读器", - "tap-to-paginate-label": "点击翻页", - "tap-to-paginate-tooltip": "是否允许点击书籍阅读器屏幕的两侧翻页", - "immersive-mode-label": "沉浸模式", - "immersive-mode-tooltip": "点击阅读器的文档后隐藏菜单并打开“点击翻页”功能", - "reading-direction-book-label": "阅读方向", - "reading-direction-book-tooltip": "切换至下一页的点击位置。从右至左表示您需点击屏幕左侧以切换至下一页。", - "font-family-label": "字体", - "font-family-tooltip": "要加载的字体，默认加载书籍的默认字体", - "writing-style-label": "书籍排版", - "writing-style-tooltip": "更改文本排版方向。横向从左到右，竖向从上到下。", - "layout-mode-book-label": "布局模式", - "layout-mode-book-tooltip": "确定内容如何布局，滚屏就像把书塞满屏幕，单列或双列匹配设备屏幕的高度且每个页面容纳单列或双列文本", - "color-theme-book-label": "主题颜色", - "color-theme-book-tooltip": "书籍阅读器目录和菜单的主题颜色", - "font-size-book-label": "字体大小", - "font-size-book-tooltip": "书籍中字体的缩放百分比", - "line-height-book-label": "行间距", - "line-height-book-tooltip": "书籍中每行之间的间距", - "margin-book-label": "页边距", - "margin-book-tooltip": "屏幕两侧的间距，移动设备与此设置无关，间距固定为 0。", - "pdf-reader-settings-title": "PDF 阅读器", - "pdf-scroll-mode-label": "滚动模式", - "pdf-scroll-mode-tooltip": "您如何滚动页面。垂直/水平和点击翻页（无滚动）", - "pdf-spread-mode-label": "展开模式", - "pdf-spread-mode-tooltip": "页面应该如何布局。单页或双页（奇数/偶数）", - "pdf-theme-label": "主题", - "pdf-theme-tooltip": "阅读器的主题颜色", "clients-opds-alert": "此服务器未启用OPDS，不会影响Tachiyomi用户。", "clients-opds-description": "所有第三方客户端均使用下方的API密钥或链接。它们就像密码一样，请保密。", "clients-api-key-tooltip": "API 密钥等同于密码。重置密钥将导致所有客户端失效。", @@ -168,9 +119,7 @@ "kavitaplus-settings-title": "Kavita+", "anilist-scrobbling-label": "AniList Scrobbling", "want-to-read-sync-label": "想要阅读同步", - "want-to-read-sync-tooltip": "允许 Kavita 根据待读列表中的 AniList 和 MAL 系列将项目添加到您的想读列表中", - "allow-auto-webtoon-reader-tooltip": "如果页面看起来像网络漫画，请切换到网络漫画阅读器模式。可能会出现一些误报。", - "allow-auto-webtoon-reader-label": "自动网络漫画阅读器模式" + "want-to-read-sync-tooltip": "允许 Kavita 根据待读列表中的 AniList 和 MAL 系列将项目添加到您的想读列表中" }, "user-holds": { "title": "刮削暂停", @@ -680,7 +629,10 @@ "incognito-mode-label": "隐身模式", "next": "下一个", "previous": "上一个", - "go-to-page-prompt": "一共{{totalPages}}页，您想跳转至哪一页？" + "go-to-page-prompt": "共有 {{totalPages}} 页。您想转到哪一页？", + "go-to-section": "转到节", + "go-to-section-prompt": "共有 {{totalSections}} 节。您想转到哪一节？", + "go-to-first-page": "转到第一页" }, "personal-table-of-contents": { "no-data": "尚未添加书签", @@ -728,7 +680,7 @@ "series-detail": { "page-settings-title": "页面设置", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "卡片", "layout-mode-option-list": "列表", "continue-from": "继续{{title}}", @@ -851,9 +803,9 @@ "back": "后退", "more": "更多", "customize": "{{settings.customize}}", - "browse-authors": "浏览作者", "edit": "{{common.edit}}", - "cancel-edit": "取消重新排序" + "cancel-edit": "取消重新排序", + "browse-people": "浏览人物" }, "library-settings-modal": { "close": "{{common.close}}", @@ -916,30 +868,30 @@ }, "reader-settings": { "general-settings-title": "常规设置", - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", + "font-family-label": "{{manage-reading-profiles.font-family-label}}", + "font-size-label": "{{manage-reading-profiles.font-size-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", "reset-to-defaults": "恢复默认设置", "reader-settings-title": "阅读器设置", - "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", + "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}", "right-to-left": "从右到左", "left-to-right": "从左到右", "horizontal": "横向", "vertical": "竖向", - "writing-style-label": "{{user-preferences.writing-style-label}}", + "writing-style-label": "{{manage-reading-profiles.writing-style-label}}", "writing-style-tooltip": "更改文本排版方向。横向是从左到右，竖向是从上到下。", "tap-to-paginate-label": "点击翻页", "tap-to-paginate-tooltip": "点击屏幕边缘进行翻页", "on": "开", "off": "关", - "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", + "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}", "immersive-mode-tooltip": "点击阅读器的文档后隐藏菜单并打开“点击翻页”功能", "fullscreen-label": "全屏", "fullscreen-tooltip": "将阅读器设置为全屏模式", "exit": "退出", "enter": "打开", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-tooltip": "滚屏：镜像epub文件（通常每章节一个滚屏页面）
    单列：每次创建一个单独的虚拟页面
    双列：每次创建两个并排布置的虚拟页面。", "layout-mode-option-scroll": "滚屏", "layout-mode-option-1col": "单列", @@ -948,7 +900,15 @@ "theme-dark": "黑暗", "theme-black": "黑色", "theme-white": "白色", - "theme-paper": "纸张" + "theme-paper": "纸张", + "create-new-tooltip": "从当前隐式配置文件创建新的可管理配置文件", + "loading": "加载中", + "create-new": "从隐式配置文件中新建配置文件", + "line-spacing-min-label": "1x", + "reading-profile-updated": "阅读配置文件已更新", + "reading-profile-promoted": "推广阅读配置文件", + "line-spacing-max-label": "2.5x", + "update-parent": "保存到 {{name}}" }, "table-of-contents": { "no-data": "这本书没有在元数据或toc文件中设置目录" @@ -1323,7 +1283,7 @@ "loading": "{{common.loading}}", "actions-header": "活动", "pending-tooltip": "此用户尚未验证其电子邮件", - "all-libraries": "所有库" + "all-libraries": "所有资料库" }, "edit-collection-tags": { "title": "编辑 {{collectionName}} 收藏", @@ -1389,7 +1349,8 @@ "admin-email-history": "电子邮件历史记录", "admin-matched-metadata": "匹配的元数据", "scrobble-holds": "Scrobble 持有", - "admin-metadata": "管理元数据" + "admin-metadata": "管理元数据", + "reading-profiles": "阅读配置文件" }, "collection-detail": { "no-data": "暂无项目。请尝试添加一个系列。", @@ -1514,7 +1475,9 @@ "all-filters": "智能筛选", "nav-link-header": "导航选项", "close": "{{common.close}}", - "person-aka-status": "匹配别名" + "person-aka-status": "匹配别名", + "browse-genres": "浏览类型", + "browse-tags": "浏览标签" }, "promoted-icon": { "promoted": "{{common.promoted}}" @@ -1625,7 +1588,6 @@ }, "manga-reader": { "back": "返回", - "save-globally": "全局保存", "incognito-alt": "隐身模式已开启。切换以关闭。", "incognito-title": "隐身模式:", "shortcuts-menu-alt": "键盘快捷键模式", @@ -1647,9 +1609,9 @@ "height": "高度", "width": "宽度", "width-override-label": "宽度覆盖", - "off": "关", + "off": "{{reader-settings.off}}", "original": "原始尺寸", - "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}", + "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}", "swipe-enabled-label": "启用滑动手势", "enable-comic-book-label": "模拟漫画书", "brightness-label": "亮度", @@ -1660,9 +1622,14 @@ "layout-mode-switched": "由于空间不足以呈现双页布局，布局模式已切换为单页", "no-next-chapter": "没有下一章节", "no-prev-chapter": "没有上一章节", - "user-preferences-updated": "用户偏好已更新", - "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", - "series-progress": "系列进度： {{percentage}}" + "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}", + "series-progress": "系列进度： {{percentage}}", + "reading-profile-promoted": "推广阅读配置文件", + "create-new": "{{reader-settings.create-new}}", + "loading": "{{reader-settings.loading}}", + "create-new-tooltip": "{{reader-settings.create-new-tooltip}}", + "reading-profile-updated": "阅读配置文件已更新", + "update-parent": "{{reader-settings.update-parent}}" }, "metadata-filter": { "filter-title": "{{common.filter}}", @@ -1719,7 +1686,10 @@ "release-year": "发行年份", "read-progress": "上次阅读", "average-rating": "平均评分", - "random": "随机" + "random": "随机", + "person-series-count": "系列数", + "person-chapter-count": "章节数", + "person-name": "名称" }, "edit-series-modal": { "title": "{{seriesName}} 详细信息", @@ -1856,8 +1826,8 @@ "cover-image-tab": "{{tabs.cover-tab}}", "tasks-tab": "{{tabs.tasks-tab}}", "info-tab": "{{tabs.info-tab}}", - "pages-label": "{{edit-chapter-modal.pages-count}}", - "words-label": "{{edit-chapter-modal.length-title}}", + "pages-label": "{{edit-chapter-modal.pages-label}}", + "words-label": "{{edit-chapter-modal.words-label}}", "pages-count": "{{edit-chapter-modal.pages-count}}", "words-count": "{{edit-chapter-modal.words-count}}", "reading-time-label": "{{edit-chapter-modal.reading-time-label}}", @@ -2078,7 +2048,7 @@ "reading-lists": "{{side-nav.reading-lists}}", "bookmarks": "{{side-nav.bookmarks}}", "all-series": "{{side-nav.all-series}}", - "browse-authors": "{{side-nav.browse-authors}}" + "browse-authors": "{{side-nav.browse-people}}" }, "filter-field-pipe": { "age-rating": "{{metadata-fields.age-rating-title}}", @@ -2254,7 +2224,9 @@ "webtoon-override": "由于图片代表网络漫画，因此切换到网络漫画模式。", "scrobble-gen-init": "将一项任务加入队列，该任务将根据过去的阅读历史和评分生成 scrobble 事件，并将其与已连接的服务同步。", "confirm-delete-multiple-volumes": "您确定要删除这 {{count}} 个卷吗？这不会修改磁盘上的文件。", - "series-added-want-to-read": "从“想读”列表中添加的系列" + "series-added-want-to-read": "从“想读”列表中添加的系列", + "series-bound-to-reading-profile": "系列绑定到阅读配置文件 {{name}}", + "library-bound-to-reading-profile": "资料库绑定到阅读配置文件 {{name}}" }, "read-time-pipe": { "less-than-hour": "<1 小时", @@ -2330,7 +2302,13 @@ "reorder": "重新排序", "rename-tooltip": "重命名智能筛选", "rename": "重命名", - "merge": "合并" + "merge": "合并", + "reading-profiles": "阅读配置文件", + "set-reading-profile": "设置阅读配置文件", + "set-reading-profile-tooltip": "将阅读配置文件绑定到此资料库", + "clear-reading-profile": "清除阅读配置文件", + "cleared-profile": "清除阅读配置文件", + "clear-reading-profile-tooltip": "清除此资料库的阅读配置文件" }, "preferences": { "left-to-right": "从左到右", @@ -2432,8 +2410,8 @@ "promoted": "推广", "select-all": "全选", "deselect-all": "取消全选", - "series-count": "{{num}}系列", - "item-count": "{{num}}条目", + "series-count": "{{num}} 系列", + "item-count": "{{num}} 条目", "book-num": "书籍", "issue-hash-num": "期 #", "issue-num": "期", @@ -2449,14 +2427,16 @@ "volume-nums": "卷", "author-count": "{{num}} 作者", "chapter-count": "{{num}} 章", - "no-data": "无数据" + "no-data": "无数据", + "issue-count": "{{num}} 期" }, "confirm": { "confirm": "确认", "alert": "注意", "info": "信息", "cancel": "{{common.cancel}}", - "ok": "确定" + "ok": "确定", + "prompt": "问题" }, "edit-person-modal": { "mal-id-label": "MAL Id", @@ -2495,11 +2475,6 @@ "no-info": "没有关于此人的信息", "aka-title": "又名 " }, - "browse-authors": { - "author-count": "{{num}} 人", - "cover-image-description": "{{edit-series-modal.cover-image-description}}", - "title": "浏览作者和作家" - }, "match-series-modal": { "close": "{{common.close}}", "save": "{{common.save}}", @@ -2527,7 +2502,9 @@ "dont-match-status-label": "{{dont-match-label}}", "library-name-header": "资料库", "actions-header": "活动", - "match-alt": "匹配 {{seriesName}}" + "match-alt": "匹配 {{seriesName}}", + "matched-state-label": "匹配状态", + "library-type": "资料库类型" }, "changelog-update-item": { "removed": "已移除", @@ -2690,5 +2667,146 @@ "merge-warning": "如果继续，所选人员将被移除。所选人员的姓名将被添加为别名，并且其所有角色都将被转移。", "alias-title": "新别名", "save": "{{common.save}}" + }, + "manage-reading-profiles": { + "description": "并非所有系列都以相同的方式阅读，请为每个资料库或系列设置不同的阅读配置文件，以尽可能无缝地回到您的系列中。", + "tap-to-paginate-tooltip": "电子书阅读器屏幕的侧面是否允许点击以移动到上一页/下一页", + "immersive-mode-tooltip": "这将隐藏阅读器文档上的菜单，并点击翻页", + "add": "{{common.add}}", + "layout-mode-book-tooltip": "内容布局方式。滚动方式与书籍内容大小一致。1 列或 2 列适合设备高度，每页可容纳 1 列或 2 列文本", + "profiles-title": "您的阅读配置文件", + "default-profile": "默认", + "make-default": "设为默认值", + "no-selected": "未选择配置文件", + "confirm": "您确定要删除阅读配置文件 {{name}} 吗？", + "image-reader-settings-title": "图像阅读器", + "reading-direction-label": "阅读方向", + "reading-direction-tooltip": "点击方向为移至下一页。从右到左表示点击屏幕左侧即可移至下一页。", + "scaling-option-label": "缩放选项", + "scaling-option-tooltip": "如何将图像缩放到适合您的屏幕。", + "page-splitting-label": "页面拆分", + "reading-mode-label": "阅读模式", + "reading-mode-tooltip": "将阅读器更改为垂直、水平分页或无限滚动", + "layout-mode-label": "布局模式", + "layout-mode-tooltip": "将单幅图像或两幅并排图像渲染到屏幕上", + "background-color-label": "背景颜色", + "background-color-tooltip": "图像阅读器的背景颜色", + "auto-close-menu-label": "自动关闭菜单", + "auto-close-menu-tooltip": "菜单是否自动关闭", + "show-screen-hints-label": "显示屏幕提示", + "show-screen-hints-tooltip": "显示覆盖层以帮助理解分页区域和方向", + "emulate-comic-book-label": "模拟漫画书", + "emulate-comic-book-tooltip": "应用阴影效果来模拟读书", + "swipe-to-paginate-label": "滑动即可分页", + "swipe-to-paginate-tooltip": "在屏幕上滑动是否应该触发下一页或上一页", + "allow-auto-webtoon-reader-label": "自动网络漫画阅读器模式", + "allow-auto-webtoon-reader-tooltip": "如果页面看起来像网络漫画，请切换到网络漫画阅读器模式。可能会出现一些误报。", + "width-override-label": "{{manga-reader.width-override-label}}", + "width-override-tooltip": "覆盖阅读器中的图像宽度", + "book-reader-settings-title": "图书阅读器", + "immersive-mode-label": "沉浸模式", + "reading-direction-book-label": "阅读方向", + "reading-direction-book-tooltip": "点击方向为移至下一页。从右到左表示点击屏幕左侧即可移至下一页。", + "font-family-label": "字体系列", + "font-family-tooltip": "要加载的字体系列。默认将加载本书的默认字体", + "writing-style-tooltip": "更改文本的方向。水平表示从左到右，垂直表示从上到下。", + "layout-mode-book-label": "布局模式", + "writing-style-label": "文章风格", + "color-theme-book-tooltip": "图书阅读器内容和菜单应采用什么颜色主题", + "font-size-book-label": "字体大小", + "font-size-book-tooltip": "应用于书中字体的缩放百分比", + "line-height-book-label": "行距", + "line-height-book-tooltip": "书的行距是多少", + "margin-book-label": "边距", + "margin-book-tooltip": "屏幕两侧的间距。无论此设置如何，在移动设备上都会覆盖为 0。", + "pdf-spread-mode-tooltip": "页面布局。单页还是双页（奇数/偶数）", + "pdf-spread-mode-label": "展开模式", + "pdf-theme-label": "主题", + "pdf-theme-tooltip": "阅读器的颜色主题", + "reading-profile-series-settings-title": "系列", + "reading-profile-library-settings-title": "资料库", + "delete": "{{common.delete}}", + "tap-to-paginate-label": "点击分页", + "page-splitting-tooltip": "如何分割全宽图像（即合并左右图像）", + "pdf-scroll-mode-tooltip": "如何滚动页面。垂直/水平滚动以及点击翻页（无滚动）", + "pdf-reader-settings-title": "PDF 阅读器", + "color-theme-book-label": "颜色主题", + "pdf-scroll-mode-label": "滚动模式", + "extra-tip": "通过系列和资料库的操作菜单或批量设置来分配阅读配置文件。更改阅读器中的设置时，会创建一个隐藏的配置文件，用于记住您对该系列的选择（PDF 除外）。当您为该系列分配您自己的阅读配置文件时，此配置文件会被移除。更多信息，请访问", + "reset": "{{common.reset}}", + "selection-tip": "从列表中选择一个配置文件，或在右上角创建一个新的配置文件", + "add-tooltip": "您的新配置文件将在更改后保存", + "wiki-title": "维基百科", + "disable-width-override-label": "禁用宽度覆盖", + "disable-width-override-tooltip": "当屏幕尺寸至少等于或小于配置的断点时，防止宽度覆盖生效" + }, + "bulk-set-reading-profile-modal": { + "title": "设置阅读配置文件", + "filter-label": "{{common.filter}}", + "clear": "{{common.clear}}", + "no-data": "尚未创建收藏", + "loading": "{{common.loading}}", + "create": "{{common.create}}", + "bound": "边界", + "close": "{{common.close}}" + }, + "browse-people": { + "issue-count": "{{common.issue-count}}", + "title": "浏览人物", + "author-count": "{{num}} 人", + "cover-image-description": "{{edit-series-modal.cover-image-description}}", + "sort-label": "排序", + "name-label": "名称", + "issue-count-label": "期刊数", + "series-count-label": "系列数", + "series-count": "{{common.series-count}}", + "roles-label": "角色" + }, + "browse-genres": { + "series-count": "{{common.series-count}}", + "title": "浏览类型", + "genre-count": "{{num}} 类型", + "issue-count": "{{common.issue-count}}" + }, + "browse-title-pipe": { + "publication-status": "{{value}} 作品", + "age-rating": "评价 {{value}}", + "publisher": "由 {{value}} 发布", + "genre": "类型为 {{value}}", + "editor": "由 {{value}} 编辑", + "format": "{{value}} 的格式", + "imprint": "{{value}} 的压印", + "character": "有字符 {{value}}", + "artist": "由 {{value}} 绘制", + "letterer": "由 {{value}} 书写", + "colorist": "按 {{value}} 着色", + "writer": "由 {{value}} 撰写", + "library": "在 {{value}} 资料库中", + "release-year": "发布于 {{value}}", + "team": "团队 {{value}}", + "location": "在 {{value}} 位置", + "tag": "有标签 {{value}}", + "user-rating": "{{value}} 星级", + "penciller": "由 {{value}} 铅笔画", + "translator": "翻译者 {{value}}", + "inker": "由 {{value}} 执笔" + }, + "browse-tags": { + "genre-count": "{{num}} 标签", + "series-count": "{{common.series-count}}", + "title": "浏览标签", + "issue-count": "{{common.issue-count}}" + }, + "generic-filter-field-pipe": { + "person-chapter-count": "章节数", + "person-series-count": "系列数", + "person-role": "角色", + "person-name": "名称" + }, + "breakpoint-pipe": { + "mobile": "手机", + "tablet": "平板", + "desktop": "桌面", + "never": "从不" } } diff --git a/UI/Web/src/assets/langs/zh_Hant.json b/UI/Web/src/assets/langs/zh_Hant.json index 8e5841f26..b8a08eff9 100644 --- a/UI/Web/src/assets/langs/zh_Hant.json +++ b/UI/Web/src/assets/langs/zh_Hant.json @@ -25,7 +25,8 @@ "cancel": "{{common.cancel}}", "saving": "儲存…", "update": "更新", - "account-detail-title": "帳戶詳細資訊" + "account-detail-title": "帳戶詳細資訊", + "invalid-email-warning": "無效的電子郵件會使 Kavita 的某些功能無法運作" }, "user-scrobble-history": { "title": "Scrobble歷史", @@ -38,7 +39,7 @@ "series-header": "系列", "data-header": "資料", "is-processed-header": "已處理", - "no-data": "沒有資料", + "no-data": "{{common.no-data}}", "volume-and-chapter-num": "第{{v}}卷 第{{n}}章", "volume-num": "{{num}} 卷", "chapter-num": "章節 {{num}}", @@ -46,7 +47,10 @@ "not-applicable": "不適用", "processed": "處理", "not-processed": "未處理", - "special": "{{entity-title.special}}" + "special": "{{entity-title.special}}", + "scrobbling-disabled": "你的帳戶設定中已停用Scrobbling。", + "generate-scrobble-events": "回填事件", + "token-expired": "你的 AniList 權杖已過期！在你於帳戶頁面更新之前，追蹤事件將無法處理。" }, "scrobble-event-type-pipe": { "chapter-read": "閱讀進度", @@ -98,67 +102,18 @@ "prompt-on-download-tooltip": "下載大小超過{{size}}MB時提示", "disable-animations-label": "禁用動畫", "disable-animations-tooltip": "關閉網站中的動畫，對於電子書閱讀器很有用。", - "collapse-series-relationships-label": "摺疊系列", + "collapse-series-relationships-label": "摺疊系列關係", "collapse-series-relationships-tooltip": "Kavita是否展示沒有關係的系列或前傳", "share-series-reviews-label": "分享系列評論", "share-series-reviews-tooltip": "是否對其他用戶顯示您對系列的評論", - "image-reader-settings-title": "圖片閱讀器", - "reading-direction-label": "閱讀方向", - "reading-direction-tooltip": "單擊方向或滑動畫面移動到下一頁。", - "scaling-option-label": "縮放選項", - "scaling-option-tooltip": "如何將影像縮放到螢幕大小。", - "page-splitting-label": "頁面分割", - "page-splitting-tooltip": "如何分割全寬影像(擊左右影像合併)", - "reading-mode-label": "閱讀模式", - "layout-mode-label": "佈局模式", - "layout-mode-tooltip": "將單個影像或兩個並排影像顯示到螢幕上", - "background-color-label": "背景顏色", - "auto-close-menu-label": "自動關閉選單", - "show-screen-hints-label": "顯示螢幕提示", - "emulate-comic-book-label": "模擬漫畫書", - "swipe-to-paginate-label": "滑動到分頁", - "book-reader-settings-title": "書本閱讀器", - "tap-to-paginate-label": "點擊翻頁", - "tap-to-paginate-tooltip": "書本閱讀器的畫面兩側是否允許點擊以移到上一頁/下一頁", - "immersive-mode-label": "沉浸式模式", - "immersive-mode-tooltip": "這將隱藏點擊閱讀器文檔後的選單，然後打開“點擊翻頁”功能", - "reading-direction-book-label": "閱讀方向", - "reading-direction-book-tooltip": "單擊方向移動到下一頁。 從右到左意味著您單擊屏幕左側以移至下一頁。", - "font-family-label": "字體系列", - "font-family-tooltip": "要加載的字體系列。 默認將加載書籍的默認字體", - "writing-style-label": "文字排版", - "writing-style-tooltip": "更改文字方向。橫向從左到右，縱向從上到下。", - "layout-mode-book-label": "佈局模式", - "layout-mode-book-tooltip": "決定內容在設備螢幕上的呈現方式。“滾動”會按書本內容自然上下滾動，而“單欄”或“雙欄”會根據設備高度調整，一頁顯示一欄或兩欄文字", - "color-theme-book-label": "主題顏色", - "color-theme-book-tooltip": "閱讀器內容與選單的主題顏色", - "font-size-book-label": "字體大小", - "line-height-book-label": "單行間距", - "line-height-book-tooltip": "書的行距是多少", - "margin-book-label": "頁邊距", - "margin-book-tooltip": "與螢幕兩側的距離，在行動裝置上會忽略此設定，間距固定為0。", - "pdf-reader-settings-title": "PDF 閱讀器", - "pdf-scroll-mode-label": "全螢幕模式", - "pdf-scroll-mode-tooltip": "當您瀏覽頁面時，可以選擇垂直/水平滾動，或者點擊分頁(無需滾動)", - "pdf-spread-mode-label": "跨頁模式", - "pdf-spread-mode-tooltip": "頁面應該如何排列。第一頁為單頁或雙頁（奇數跨頁/偶數跨頁）", - "pdf-theme-label": "主題", "clients-opds-alert": "此伺服器上未啟用 OPDS。 這不會影響 Tachiyomi 用戶。", "clients-opds-description": "所有第三方客戶端都將使用 API 密鑰或下面的連接 URL。 這些就像密碼一樣，請保密。", "clients-api-key-tooltip": "API 金鑰就像密碼一樣。重置它會使任何現有的客戶端失效。", "clients-opds-url-tooltip": "查看支持的 OPDS 客户端列表： ", "reset": "{{common.reset}}", "save": "{{common.save}}", - "background-color-tooltip": "圖片閱讀器的背景顏色", - "auto-close-menu-tooltip": "菜單是否應自動關閉", - "show-screen-hints-tooltip": "顯示一個覆蓋層，以幫助理解翻頁區域和方向", - "swipe-to-paginate-tooltip": "在屏幕上滑動是否應移到上一頁/下一頁", - "font-size-book-tooltip": "書中字體的縮放比例", "clients-opds-url-label": "OPDS 網址", - "clients-api-key-label": "API 密鑰", - "reading-mode-tooltip": "將閱讀器更改為縱向翻頁、橫向翻頁，或設置為無限滾動", - "emulate-comic-book-tooltip": "套用陰影以模擬書籍閱讀效果", - "pdf-theme-tooltip": "閱讀器的顏色主題" + "clients-api-key-label": "API 密鑰" }, "user-holds": { "title": "記錄保留", @@ -439,20 +394,20 @@ "years-ago": "{{value}}年前" }, "relationship-pipe": { - "adaptation": "適應", - "alternative-setting": "替代設定", - "alternative-version": "替代版本", - "character": "角色", + "adaptation": "改編", + "alternative-setting": "同世界觀", + "alternative-version": "IF線", + "character": "客串角色", "contains": "包含", "doujinshi": "同人", "other": "其他", "prequel": "前傳", "sequel": "續集", "side-story": "番外", - "spin-off": "拆分", - "parent": "家長", - "edition": "編輯", - "annual": "年度" + "spin-off": "衍伸作", + "parent": "主系列", + "edition": "特別版", + "annual": "年度特刊" }, "publication-status-pipe": { "ongoing": "連載中", @@ -773,8 +728,7 @@ "all-series": "所有系列", "more": "更多", "donate-tooltip": "您可以通過訂閱 Kavita+ 來移除這個", - "donate": "捐款", - "browse-authors": "瀏覽作者" + "donate": "捐款" }, "library-settings-modal": { "close": "{{common.close}}", @@ -1428,7 +1382,6 @@ "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}", "series-progress": "系列進度：{{percentage}}", "back": "返回", - "save-globally": "全域儲存", "left-to-right-alt": "從左到右", "reading-direction-tooltip": "閱讀方向： ", "reading-mode-tooltip": "閱讀模式", @@ -1449,7 +1402,6 @@ "next-page-tooltip": "下一頁", "unbookmark-page-tooltip": "移除書籤", "bookmarks-title": "書籤", - "user-preferences-updated": "使用者偏好更新", "height": "高度", "shortcuts-menu-alt": "鍵盤快捷鍵視窗", "incognito-title": "無痕模式：", @@ -2388,9 +2340,12 @@ "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}", "cover-image-description-extra": "或者，您可以從 CoversDB 下載封面（如果有）。" }, - "browse-authors": { - "title": "瀏覽作者／作家", - "author-count": "{{num}} 人", - "cover-image-description": "{{edit-series-modal.cover-image-description}}" + "reviews": { + "user-reviews-local": "本地評論", + "user-reviews-plus": "外部評論" + }, + "review-modal": { + "title": "編輯評論", + "review-label": "評論" } } diff --git a/UI/Web/src/styles.scss b/UI/Web/src/styles.scss index c79a27fa3..eef1b565d 100644 --- a/UI/Web/src/styles.scss +++ b/UI/Web/src/styles.scss @@ -47,6 +47,7 @@ @use './theme/components/table'; @use './theme/components/alerts'; @use './theme/components/typeahead'; +@use './theme/components/tooltip'; @use './theme/utilities/headings'; @use './theme/utilities/utilities'; diff --git a/UI/Web/src/theme/components/_buttons.scss b/UI/Web/src/theme/components/_buttons.scss index 09ce4157b..82603e761 100644 --- a/UI/Web/src/theme/components/_buttons.scss +++ b/UI/Web/src/theme/components/_buttons.scss @@ -31,9 +31,9 @@ border-color: var(--btn-outline-primary-border-color); &:hover { - color: var(--btn-outline-primary-hover-text-color); - background-color: var(--btn-outline-primary-hover-bg-color); - border-color: var(--btn-outline-primary-hover-border-color); + color: var(--btn-outline-primary-hover-text-color) !important; + background-color: var(--btn-outline-primary-hover-bg-color) !important; + border-color: var(--btn-outline-primary-hover-border-color) !important; } } diff --git a/UI/Web/src/theme/components/_sidenav.scss b/UI/Web/src/theme/components/_sidenav.scss index c724cec17..33faf7d82 100644 --- a/UI/Web/src/theme/components/_sidenav.scss +++ b/UI/Web/src/theme/components/_sidenav.scss @@ -28,7 +28,7 @@ } //START closed state of the sidebar &.closed { - width: 2.825rem; + width: 3.125rem; overflow-x: hidden; overflow-y: hidden; background-color: var(--side-nav-closed-bg-color); @@ -36,6 +36,11 @@ height: calc((var(--vh) * 100) - 6.5rem); border-radius: unset; + // For Firefox + @supports (-moz-appearance: none) { + width: 2.5rem; + } + .side-nav { .side-nav-item { color: var(--side-nav-item-closed-color); @@ -46,6 +51,10 @@ } } + .phone-hidden:first-of-type { + margin-left: unset; + } + .active-highlight { opacity: 0; } @@ -83,10 +92,10 @@ display: flex; &:first-of-type { - text-align: center; width: 2.5rem; min-width: 2.5rem; margin-left: 0.3rem; + justify-content: center; } &:last-child { @@ -95,9 +104,7 @@ } div { - align-items: center; height: 100%; - justify-content: inherit; padding: 0 0.625rem; i { @@ -193,10 +200,12 @@ .side-nav { overflow-x: hidden; padding-bottom: 0.625rem; + padding-left: 1.125rem; .side-nav-header { color: #ffffff; font-size: 1rem; + margin-left: unset; &:first-of-type { margin-top: 0.7rem; @@ -207,7 +216,6 @@ font-size: 1rem; min-height: 1.875rem; justify-content: unset; - margin-left: 1.125rem; &.active { .side-nav-text { @@ -220,6 +228,14 @@ margin-left: 0.75rem; font-size: 0.9rem; color: #999999; + + div { + display: flex; + + .badge { + align-self: center; + } + } } .card-actions { @@ -278,9 +294,9 @@ } } } - //START sidebar closed + //START sidebar bottom closed &.closed { - width: 3.4375rem; + width: 2.5rem; overflow-x: hidden; overflow-y: auto; background-color: unset; @@ -295,7 +311,7 @@ } } } - //END sidebar closed + //END sidebar bottom closed } //END kavita+ subscription bottom heart button diff --git a/UI/Web/src/theme/components/_tooltip.scss b/UI/Web/src/theme/components/_tooltip.scss new file mode 100644 index 000000000..d351b6b3a --- /dev/null +++ b/UI/Web/src/theme/components/_tooltip.scss @@ -0,0 +1,4 @@ +.tooltip { + --bs-tooltip-opacity: 1; + //--bs-tooltip-color: +} diff --git a/UI/Web/src/theme/themes/dark.scss b/UI/Web/src/theme/themes/dark.scss index e61f386a8..7ec33d613 100644 --- a/UI/Web/src/theme/themes/dark.scss +++ b/UI/Web/src/theme/themes/dark.scss @@ -59,7 +59,6 @@ --select2-option-highlighted-background: var(--dropdown-item-hover-bg-color); - /* Theming colors that performs a gradient for background. Can be disabled else automatically applied based on cover image colors. * --colorscape-primary-color and the alpha variants will be updated in real time. the default variant is fixed and represents the default state and should * match the non-default/alpha on launch. @@ -443,4 +442,10 @@ /** Search **/ --input-hint-border-color: #aeaeae; --input-hint-text-color: lightgrey; + + /** Breakpoint **/ + --setting-mobile-breakpoint: 768; + --setting-tablet-breakpoint: 1280; + --setting-desktop-breakpoint: 1440; + } diff --git a/openapi.json b/openapi.json index 27452fb02..bfcb28ef8 100644 --- a/openapi.json +++ b/openapi.json @@ -2,12 +2,12 @@ "openapi": "3.0.4", "info": { "title": "Kavita", - "description": "Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v0.8.6.10", + "description": "Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v0.8.6.14", "license": { "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.8.6.10" + "version": "0.8.6.14" }, "servers": [ { @@ -429,7 +429,7 @@ "tags": [ "Account" ], - "summary": "Requests the Invite Url for the UserId. Will return error if user is already validated.", + "summary": "Requests the Invite Url for the AppUserId. Will return error if user is already validated.", "parameters": [ { "name": "userId", @@ -4065,6 +4065,64 @@ } } }, + "/api/Metadata/genres-with-counts": { + "post": { + "tags": [ + "Metadata" + ], + "summary": "Returns a list of Genres with counts for counts when Genre is on Series/Chapter", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserParams" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserParams" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/UserParams" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/BrowseGenreDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/BrowseGenreDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/BrowseGenreDto" + } + } + } + } + } + } + } + }, "/api/Metadata/people-by-role": { "get": { "tags": [ @@ -4229,6 +4287,64 @@ } } }, + "/api/Metadata/tags-with-counts": { + "post": { + "tags": [ + "Metadata" + ], + "summary": "Returns a list of Tags with counts for counts when Tag is on Series/Chapter", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserParams" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserParams" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/UserParams" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/BrowseTagDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/BrowseTagDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/BrowseTagDto" + } + } + } + } + } + } + } + }, "/api/Metadata/age-ratings": { "get": { "tags": [ @@ -5644,6 +5760,25 @@ } } ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BrowsePersonFilterDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/BrowsePersonFilterDto" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/BrowsePersonFilterDto" + } + } + } + }, "responses": { "200": { "description": "OK", @@ -8678,6 +8813,593 @@ } } }, + "/api/reading-profile/all": { + "get": { + "tags": [ + "ReadingProfile" + ], + "summary": "Gets all non-implicit reading profiles for a user", + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + } + } + }, + "/api/reading-profile/{seriesId}": { + "get": { + "tags": [ + "ReadingProfile" + ], + "summary": "Returns the ReadingProfile that should be applied to the given series, walks up the tree.\nSeries -> Library -> Default", + "parameters": [ + { + "name": "seriesId", + "in": "path", + "description": "", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "skipImplicit", + "in": "query", + "description": "", + "schema": { + "type": "boolean" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + } + }, + "/api/reading-profile/library": { + "get": { + "tags": [ + "ReadingProfile" + ], + "summary": "Returns the (potential) Reading Profile bound to the library", + "parameters": [ + { + "name": "libraryId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + } + }, + "/api/reading-profile/create": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Creates a new reading profile for the current user", + "requestBody": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + } + }, + "/api/reading-profile/promote": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Promotes the implicit profile to a user profile. Removes the series from other profiles", + "parameters": [ + { + "name": "profileId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + } + }, + "/api/reading-profile/series": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Update the implicit reading profile for a series, creates one if none exists", + "description": "Any modification to the reader settings during reading will create an implicit profile. Use \"update-parent\" to save to the bound series profile.", + "parameters": [ + { + "name": "seriesId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "requestBody": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + } + }, + "/api/reading-profile/update-parent": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Updates the non-implicit reading profile for the given series, and removes implicit profiles", + "parameters": [ + { + "name": "seriesId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "requestBody": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + } + }, + "/api/reading-profile": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Updates the given reading profile, must belong to the current user", + "description": "This does not update connected series and libraries.", + "requestBody": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserReadingProfileDto" + } + } + } + } + } + }, + "delete": { + "tags": [ + "ReadingProfile" + ], + "summary": "Deletes the given profile, requires the profile to belong to the logged-in user", + "parameters": [ + { + "name": "profileId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/api/reading-profile/series/{seriesId}": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Sets the reading profile for a given series, removes the old one", + "parameters": [ + { + "name": "seriesId", + "in": "path", + "description": "", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "profileId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + } + }, + "delete": { + "tags": [ + "ReadingProfile" + ], + "summary": "Clears the reading profile for the given series for the currently logged-in user", + "parameters": [ + { + "name": "seriesId", + "in": "path", + "description": "", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/api/reading-profile/library/{libraryId}": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Sets the reading profile for a given library, removes the old one", + "parameters": [ + { + "name": "libraryId", + "in": "path", + "description": "", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "profileId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + } + }, + "delete": { + "tags": [ + "ReadingProfile" + ], + "summary": "Clears the reading profile for the given library for the currently logged-in user", + "parameters": [ + { + "name": "libraryId", + "in": "path", + "description": "", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/api/reading-profile/bulk": { + "post": { + "tags": [ + "ReadingProfile" + ], + "summary": "Assigns the reading profile to all passes series, and deletes their implicit profiles", + "parameters": [ + { + "name": "profileId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "requestBody": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + } + } + }, + "application/*+json": { + "schema": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + } + } + } + } + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, "/api/Recommended/quick-reads": { "get": { "tags": [ @@ -10561,7 +11283,7 @@ { "name": "libraryId", "in": "query", - "description": "", + "description": "This is not in use", "schema": { "type": "integer", "format": "int32", @@ -15425,6 +16147,13 @@ "userPreferences": { "$ref": "#/components/schemas/AppUserPreferences" }, + "readingProfiles": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AppUserReadingProfile" + }, + "nullable": true + }, "bookmarks": { "type": "array", "items": { @@ -16342,6 +17071,239 @@ }, "additionalProperties": false }, + "AppUserReadingProfile": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "name": { + "type": "string", + "nullable": true + }, + "normalizedName": { + "type": "string", + "nullable": true + }, + "appUserId": { + "type": "integer", + "format": "int32" + }, + "appUser": { + "$ref": "#/components/schemas/AppUser" + }, + "kind": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "format": "int32" + }, + "libraryIds": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + }, + "nullable": true + }, + "seriesIds": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + }, + "nullable": true + }, + "readingDirection": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "description": "Manga Reader Option: What direction should the next/prev page buttons go", + "format": "int32" + }, + "scalingOption": { + "enum": [ + 0, + 1, + 2, + 3 + ], + "type": "integer", + "description": "Manga Reader Option: How should the image be scaled to screen", + "format": "int32" + }, + "pageSplitOption": { + "enum": [ + 0, + 1, + 2, + 3 + ], + "type": "integer", + "description": "Manga Reader Option: Which side of a split image should we show first", + "format": "int32" + }, + "readerMode": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "description": "Manga Reader Option: How the manga reader should perform paging or reading of the file\n\nWebtoon uses scrolling to page, MANGA_LR uses paging by clicking left/right side of reader, MANGA_UD uses paging\nby clicking top/bottom sides of reader.\n", + "format": "int32" + }, + "autoCloseMenu": { + "type": "boolean", + "description": "Manga Reader Option: Allow the menu to close after 6 seconds without interaction" + }, + "showScreenHints": { + "type": "boolean", + "description": "Manga Reader Option: Show screen hints to the user on some actions, ie) pagination direction change" + }, + "emulateBook": { + "type": "boolean", + "description": "Manga Reader Option: Emulate a book by applying a shadow effect on the pages" + }, + "layoutMode": { + "enum": [ + 1, + 2, + 3 + ], + "type": "integer", + "description": "Manga Reader Option: How many pages to display in the reader at once", + "format": "int32" + }, + "backgroundColor": { + "type": "string", + "description": "Manga Reader Option: Background color of the reader", + "nullable": true + }, + "swipeToPaginate": { + "type": "boolean", + "description": "Manga Reader Option: Should swiping trigger pagination" + }, + "allowAutomaticWebtoonReaderDetection": { + "type": "boolean", + "description": "Manga Reader Option: Allow Automatic Webtoon detection" + }, + "widthOverride": { + "type": "integer", + "description": "Manga Reader Option: Optional fixed width override", + "format": "int32", + "nullable": true + }, + "disableWidthOverride": { + "enum": [ + 0, + 1, + 2, + 3 + ], + "type": "integer", + "description": "Manga Reader Option: Disable the width override if the screen is past the breakpoint", + "format": "int32" + }, + "bookReaderMargin": { + "type": "integer", + "description": "Book Reader Option: Override extra Margin", + "format": "int32" + }, + "bookReaderLineSpacing": { + "type": "integer", + "description": "Book Reader Option: Override line-height", + "format": "int32" + }, + "bookReaderFontSize": { + "type": "integer", + "description": "Book Reader Option: Override font size", + "format": "int32" + }, + "bookReaderFontFamily": { + "type": "string", + "description": "Book Reader Option: Maps to the default Kavita font-family (inherit) or an override", + "nullable": true + }, + "bookReaderTapToPaginate": { + "type": "boolean", + "description": "Book Reader Option: Allows tapping on side of screens to paginate" + }, + "bookReaderReadingDirection": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "description": "Book Reader Option: What direction should the next/prev page buttons go", + "format": "int32" + }, + "bookReaderWritingStyle": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "description": "Book Reader Option: Defines the writing styles vertical/horizontal", + "format": "int32" + }, + "bookThemeName": { + "type": "string", + "description": "Book Reader Option: The color theme to decorate the book contents", + "nullable": true + }, + "bookReaderLayoutMode": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "description": "Book Reader Option: The way a page from a book is rendered. Default is as book dictates, 1 column is fit to height,\n2 column is fit to height, 2 columns", + "format": "int32" + }, + "bookReaderImmersiveMode": { + "type": "boolean", + "description": "Book Reader Option: A flag that hides the menu-ing system behind a click on the screen. This should be used with tap to paginate, but the app doesn't enforce this." + }, + "pdfTheme": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "description": "PDF Reader: Theme of the Reader", + "format": "int32" + }, + "pdfScrollMode": { + "enum": [ + 0, + 1, + 3 + ], + "type": "integer", + "description": "PDF Reader: Scroll mode of the reader", + "format": "int32" + }, + "pdfSpreadMode": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "description": "PDF Reader: Spread Mode of the reader", + "format": "int32" + } + }, + "additionalProperties": false + }, "AppUserRole": { "type": "object", "properties": { @@ -16779,6 +17741,33 @@ }, "additionalProperties": false }, + "BrowseGenreDto": { + "required": [ + "title" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + }, + "seriesCount": { + "type": "integer", + "description": "Number of Series this Entity is on", + "format": "int32" + }, + "chapterCount": { + "type": "integer", + "description": "Number of Chapters this Entity is on", + "format": "int32" + } + }, + "additionalProperties": false + }, "BrowsePersonDto": { "required": [ "name" @@ -16844,15 +17833,81 @@ "description": "Number of Series this Person is the Writer for", "format": "int32" }, - "issueCount": { + "chapterCount": { "type": "integer", - "description": "Number or Issues this Person is the Writer for", + "description": "Number of Issues this Person is the Writer for", "format": "int32" } }, "additionalProperties": false, "description": "Used to browse writers and click in to see their series" }, + "BrowsePersonFilterDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "description": "Not used - For parity with Series Filter", + "format": "int32" + }, + "name": { + "type": "string", + "description": "Not used - For parity with Series Filter", + "nullable": true + }, + "statements": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PersonFilterStatementDto" + }, + "nullable": true + }, + "combination": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "format": "int32" + }, + "sortOptions": { + "$ref": "#/components/schemas/PersonSortOptions" + }, + "limitTo": { + "type": "integer", + "description": "Limit the number of rows returned. Defaults to not applying a limit (aka 0)", + "format": "int32" + } + }, + "additionalProperties": false + }, + "BrowseTagDto": { + "required": [ + "title" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + }, + "seriesCount": { + "type": "integer", + "description": "Number of Series this Entity is on", + "format": "int32" + }, + "chapterCount": { + "type": "integer", + "description": "Number of Chapters this Entity is on", + "format": "int32" + } + }, + "additionalProperties": false + }, "BulkActionDto": { "type": "object", "properties": { @@ -20419,6 +21474,11 @@ "description": "Represents an option in the UI layer for Filtering", "format": "int32" }, + "libraryType": { + "type": "integer", + "description": "Library Type in int form. -1 indicates to ignore the field.", + "format": "int32" + }, "searchTerm": { "type": "string", "nullable": true @@ -21216,6 +22276,49 @@ }, "additionalProperties": false }, + "PersonFilterStatementDto": { + "type": "object", + "properties": { + "comparison": { + "enum": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16 + ], + "type": "integer", + "format": "int32" + }, + "field": { + "enum": [ + 1, + 2, + 3, + 4 + ], + "type": "integer", + "format": "int32" + }, + "value": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false + }, "PersonMergeDto": { "required": [ "destId", @@ -21236,6 +22339,25 @@ }, "additionalProperties": false }, + "PersonSortOptions": { + "type": "object", + "properties": { + "sortField": { + "enum": [ + 1, + 2, + 3 + ], + "type": "integer", + "format": "int32" + }, + "isAscending": { + "type": "boolean" + } + }, + "additionalProperties": false, + "description": "All Sorting Options for a query related to Person Entity" + }, "PersonalToCDto": { "required": [ "chapterId", @@ -21668,6 +22790,11 @@ "type": "integer", "description": "The highest age rating from all Series within the reading list", "format": "int32" + }, + "ownerUserName": { + "type": "string", + "description": "Username of the User that owns (in the case of a promoted list)", + "nullable": true } }, "additionalProperties": false @@ -25858,163 +26985,36 @@ }, "additionalProperties": false }, + "UserParams": { + "type": "object", + "properties": { + "pageNumber": { + "type": "integer", + "format": "int32" + }, + "pageSize": { + "type": "integer", + "description": "If set to 0, will set as MaxInt", + "format": "int32" + } + }, + "additionalProperties": false + }, "UserPreferencesDto": { "required": [ - "allowAutomaticWebtoonReaderDetection", - "autoCloseMenu", - "backgroundColor", "blurUnreadSummaries", - "bookReaderFontFamily", - "bookReaderFontSize", - "bookReaderImmersiveMode", - "bookReaderLayoutMode", - "bookReaderLineSpacing", - "bookReaderMargin", - "bookReaderReadingDirection", - "bookReaderTapToPaginate", - "bookReaderThemeName", - "bookReaderWritingStyle", "collapseSeriesRelationships", - "emulateBook", - "globalPageLayoutMode", - "layoutMode", "locale", "noTransitions", - "pageSplitOption", - "pdfScrollMode", - "pdfSpreadMode", - "pdfTheme", "promptForDownloadSize", - "readerMode", - "readingDirection", - "scalingOption", "shareReviews", - "showScreenHints", - "swipeToPaginate", "theme" ], "type": "object", "properties": { - "readingDirection": { - "enum": [ - 0, - 1 - ], - "type": "integer", - "format": "int32" - }, - "scalingOption": { - "enum": [ - 0, - 1, - 2, - 3 - ], - "type": "integer", - "format": "int32" - }, - "pageSplitOption": { - "enum": [ - 0, - 1, - 2, - 3 - ], - "type": "integer", - "format": "int32" - }, - "readerMode": { - "enum": [ - 0, - 1, - 2 - ], - "type": "integer", - "format": "int32" - }, - "layoutMode": { - "enum": [ - 1, - 2, - 3 - ], - "type": "integer", - "format": "int32" - }, - "emulateBook": { - "type": "boolean" - }, - "backgroundColor": { - "minLength": 1, - "type": "string" - }, - "swipeToPaginate": { - "type": "boolean" - }, - "autoCloseMenu": { - "type": "boolean" - }, - "showScreenHints": { - "type": "boolean" - }, - "allowAutomaticWebtoonReaderDetection": { - "type": "boolean" - }, - "bookReaderMargin": { - "type": "integer", - "format": "int32" - }, - "bookReaderLineSpacing": { - "type": "integer", - "format": "int32" - }, - "bookReaderFontSize": { - "type": "integer", - "format": "int32" - }, - "bookReaderFontFamily": { - "minLength": 1, - "type": "string" - }, - "bookReaderTapToPaginate": { - "type": "boolean" - }, - "bookReaderReadingDirection": { - "enum": [ - 0, - 1 - ], - "type": "integer", - "format": "int32" - }, - "bookReaderWritingStyle": { - "enum": [ - 0, - 1 - ], - "type": "integer", - "description": "Represents the writing styles for the book-reader", - "format": "int32" - }, "theme": { "$ref": "#/components/schemas/SiteThemeDto" }, - "bookReaderThemeName": { - "minLength": 1, - "type": "string" - }, - "bookReaderLayoutMode": { - "enum": [ - 0, - 1, - 2 - ], - "type": "integer", - "format": "int32" - }, - "bookReaderImmersiveMode": { - "type": "boolean" - }, "globalPageLayoutMode": { "enum": [ 0, @@ -26042,33 +27042,6 @@ "minLength": 1, "type": "string" }, - "pdfTheme": { - "enum": [ - 0, - 1 - ], - "type": "integer", - "format": "int32" - }, - "pdfScrollMode": { - "enum": [ - 0, - 1, - 3 - ], - "type": "integer", - "description": "Enum values match PdfViewer's enums", - "format": "int32" - }, - "pdfSpreadMode": { - "enum": [ - 0, - 1, - 2 - ], - "type": "integer", - "format": "int32" - }, "aniListScrobblingEnabled": { "type": "boolean" }, @@ -26118,6 +27091,218 @@ }, "additionalProperties": false }, + "UserReadingProfileDto": { + "required": [ + "allowAutomaticWebtoonReaderDetection", + "autoCloseMenu", + "backgroundColor", + "bookReaderFontFamily", + "bookReaderFontSize", + "bookReaderImmersiveMode", + "bookReaderLayoutMode", + "bookReaderLineSpacing", + "bookReaderMargin", + "bookReaderReadingDirection", + "bookReaderTapToPaginate", + "bookReaderThemeName", + "bookReaderWritingStyle", + "emulateBook", + "layoutMode", + "pageSplitOption", + "pdfScrollMode", + "pdfSpreadMode", + "pdfTheme", + "readerMode", + "readingDirection", + "scalingOption", + "showScreenHints", + "swipeToPaginate" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "userId": { + "type": "integer", + "format": "int32" + }, + "name": { + "type": "string", + "nullable": true + }, + "kind": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "format": "int32" + }, + "readingDirection": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "format": "int32" + }, + "scalingOption": { + "enum": [ + 0, + 1, + 2, + 3 + ], + "type": "integer", + "format": "int32" + }, + "pageSplitOption": { + "enum": [ + 0, + 1, + 2, + 3 + ], + "type": "integer", + "format": "int32" + }, + "readerMode": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "format": "int32" + }, + "autoCloseMenu": { + "type": "boolean" + }, + "showScreenHints": { + "type": "boolean" + }, + "emulateBook": { + "type": "boolean" + }, + "layoutMode": { + "enum": [ + 1, + 2, + 3 + ], + "type": "integer", + "format": "int32" + }, + "backgroundColor": { + "minLength": 1, + "type": "string" + }, + "swipeToPaginate": { + "type": "boolean" + }, + "allowAutomaticWebtoonReaderDetection": { + "type": "boolean" + }, + "widthOverride": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "disableWidthOverride": { + "enum": [ + 0, + 1, + 2, + 3 + ], + "type": "integer", + "format": "int32" + }, + "bookReaderMargin": { + "type": "integer", + "format": "int32" + }, + "bookReaderLineSpacing": { + "type": "integer", + "format": "int32" + }, + "bookReaderFontSize": { + "type": "integer", + "format": "int32" + }, + "bookReaderFontFamily": { + "minLength": 1, + "type": "string" + }, + "bookReaderTapToPaginate": { + "type": "boolean" + }, + "bookReaderReadingDirection": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "format": "int32" + }, + "bookReaderWritingStyle": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "description": "Represents the writing styles for the book-reader", + "format": "int32" + }, + "bookReaderThemeName": { + "minLength": 1, + "type": "string" + }, + "bookReaderLayoutMode": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "format": "int32" + }, + "bookReaderImmersiveMode": { + "type": "boolean" + }, + "pdfTheme": { + "enum": [ + 0, + 1 + ], + "type": "integer", + "format": "int32" + }, + "pdfScrollMode": { + "enum": [ + 0, + 1, + 3 + ], + "type": "integer", + "description": "Enum values match PdfViewer's enums", + "format": "int32" + }, + "pdfSpreadMode": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "format": "int32" + } + }, + "additionalProperties": false + }, "UserReviewDto": { "type": "object", "properties": {