misc stuff to avoid scan loop (#1389)
* Implemented a workaround for nginx users with BlockCommonExploits enabled, which would interfere with book image escaping done by Kavita when images had ../ in their path. * Added back to top support on all pages but those that untilize virtual scrolling without a parent scroll. * Hide jumpbar on pages where there is no scroll * Refactored jumbar code into a dedicated service * Stash some jumpkey resume code as I can't get it working with the virtual scroller. * Don't allow non-admins to see File locations on card detail drawer. * Some cleanup on GetServerInfo * When an error occurs in register, delete the user on exception. * Fixed a NPE in Stat collection for brand new users * When we catch an exception on registering a new user, delete the user as rolling back doesn't do anything. * Don't close typeahead when we are selecting options from it * Added shortcut key H to open shortcut modal on manga reader * When processing progress updates on cards, for volumes, properly find the chapter to update pages read. * Hide cover image on reading list if it's not set and fixed a missing closing div tag * Hide collection poster when nothing is set on collection detail * Small fix around updating state * Sped up the bookmark image call by removing one DB call * Fixed broken test from change in bookmark code * Fixed an oversight where if there is no tag in ComicInfo after a chapter was updated with People or Genres, then the People/Genres would never be removed. * Added test with TagHelper * Fixed a bug where 2 clear buttons would show on search bar due to browser injecting their own. Search bar wont show clear button until text is typed. * Fixed a bug where InstallID wasn't being selected correctly in converter
This commit is contained in:
Joseph Milazzo
GitHub
parent
b90c6aa76c
commit
5812588fe5
36 changed files with 474 additions and 249 deletions
|
|
@ -121,7 +121,7 @@ namespace API.Services
|
|||
return contentType;
|
||||
}
|
||||
|
||||
public static void UpdateLinks(HtmlNode anchor, Dictionary<string, int> mappings, int currentPage)
|
||||
private static void UpdateLinks(HtmlNode anchor, Dictionary<string, int> mappings, int currentPage)
|
||||
{
|
||||
if (anchor.Name != "a") return;
|
||||
var hrefParts = CleanContentKeys(anchor.GetAttributeValue("href", string.Empty))
|
||||
|
|
@ -278,7 +278,8 @@ namespace API.Services
|
|||
|
||||
var imageFile = GetKeyForImage(book, image.Attributes[key].Value);
|
||||
image.Attributes.Remove(key);
|
||||
image.Attributes.Add(key, $"{apiBase}" + imageFile);
|
||||
// UrlEncode here to transform ../ into an escaped version, which avoids blocking on nginx
|
||||
image.Attributes.Add(key, $"{apiBase}" + HttpUtility.UrlEncode(imageFile));
|
||||
|
||||
// Add a custom class that the reader uses to ensure images stay within reader
|
||||
parent.AddClass("kavita-scale-width-container");
|
||||
|
|
|
|||
|
|
@ -89,11 +89,10 @@ public class BookmarkService : IBookmarkService
|
|||
return false;
|
||||
}
|
||||
|
||||
var fileInfo = new FileInfo(imageToBookmark);
|
||||
var bookmarkDirectory =
|
||||
(await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.BookmarkDirectory)).Value;
|
||||
var fileInfo = _directoryService.FileSystem.FileInfo.FromFileName(imageToBookmark);
|
||||
var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync();
|
||||
var targetFolderStem = BookmarkStem(userWithBookmarks.Id, bookmarkDto.SeriesId, bookmarkDto.ChapterId);
|
||||
var targetFilepath = Path.Join(bookmarkDirectory, targetFolderStem);
|
||||
var targetFilepath = Path.Join(settings.BookmarksDirectory, targetFolderStem);
|
||||
|
||||
var bookmark = new AppUserBookmark()
|
||||
{
|
||||
|
|
@ -111,8 +110,7 @@ public class BookmarkService : IBookmarkService
|
|||
_unitOfWork.UserRepository.Update(userWithBookmarks);
|
||||
await _unitOfWork.CommitAsync();
|
||||
|
||||
var convertToWebP = bool.Parse((await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.ConvertBookmarkToWebP)).Value);
|
||||
if (convertToWebP)
|
||||
if (settings.ConvertBookmarkToWebP)
|
||||
{
|
||||
// Enqueue a task to convert the bookmark to webP
|
||||
BackgroundJob.Enqueue(() => ConvertBookmarkToWebP(bookmark.Id));
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class MetadataService : IMetadataService
|
|||
private readonly IReadingItemService _readingItemService;
|
||||
private readonly IDirectoryService _directoryService;
|
||||
private readonly ChapterSortComparerZeroFirst _chapterSortComparerForInChapterSorting = new ChapterSortComparerZeroFirst();
|
||||
private IList<SignalRMessage> _updateEvents = new List<SignalRMessage>();
|
||||
private readonly IList<SignalRMessage> _updateEvents = new List<SignalRMessage>();
|
||||
public MetadataService(IUnitOfWork unitOfWork, ILogger<MetadataService> logger,
|
||||
IEventHub eventHub, ICacheHelper cacheHelper,
|
||||
IReadingItemService readingItemService, IDirectoryService directoryService)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
|
@ -983,9 +984,6 @@ public class ScannerService : IScannerService
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (comicInfo.Year > 0)
|
||||
{
|
||||
var day = Math.Max(comicInfo.Day, 1);
|
||||
|
|
@ -993,104 +991,80 @@ public class ScannerService : IScannerService
|
|||
chapter.ReleaseDate = DateTime.Parse($"{month}/{day}/{comicInfo.Year}");
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Colorist))
|
||||
{
|
||||
var people = comicInfo.Colorist.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Colorist);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Colorist,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
var people = GetTagValues(comicInfo.Colorist);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Colorist);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Colorist,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Characters))
|
||||
{
|
||||
var people = comicInfo.Characters.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Character);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Character,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
people = GetTagValues(comicInfo.Characters);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Character);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Character,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Translator))
|
||||
{
|
||||
var people = comicInfo.Translator.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Translator);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Translator,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Tags))
|
||||
{
|
||||
var tags = comicInfo.Tags.Split(",").Select(s => s.Trim()).ToList();
|
||||
// Remove all tags that aren't matching between chapter tags and metadata
|
||||
TagHelper.KeepOnlySameTagBetweenLists(chapter.Tags, tags.Select(t => DbFactory.Tag(t, false)).ToList());
|
||||
TagHelper.UpdateTag(allTags, tags, false,
|
||||
(tag, _) =>
|
||||
{
|
||||
chapter.Tags.Add(tag);
|
||||
});
|
||||
}
|
||||
people = GetTagValues(comicInfo.Translator);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Translator);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Translator,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Writer))
|
||||
{
|
||||
var people = comicInfo.Writer.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Writer);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Writer,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Editor))
|
||||
{
|
||||
var people = comicInfo.Editor.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Editor);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Editor,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
people = GetTagValues(comicInfo.Writer);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Writer);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Writer,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Inker))
|
||||
{
|
||||
var people = comicInfo.Inker.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Inker);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Inker,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
people = GetTagValues(comicInfo.Editor);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Editor);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Editor,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Letterer))
|
||||
{
|
||||
var people = comicInfo.Letterer.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Letterer);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Letterer,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
people = GetTagValues(comicInfo.Inker);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Inker);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Inker,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Penciller))
|
||||
{
|
||||
var people = comicInfo.Penciller.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Penciller);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Penciller,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
people = GetTagValues(comicInfo.Letterer);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Letterer);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Letterer,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.CoverArtist))
|
||||
{
|
||||
var people = comicInfo.CoverArtist.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.CoverArtist);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.CoverArtist,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Publisher))
|
||||
{
|
||||
var people = comicInfo.Publisher.Split(",");
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Publisher);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Publisher,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
}
|
||||
people = GetTagValues(comicInfo.Penciller);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Penciller);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Penciller,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfo.Genre))
|
||||
people = GetTagValues(comicInfo.CoverArtist);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.CoverArtist);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.CoverArtist,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
people = GetTagValues(comicInfo.Publisher);
|
||||
PersonHelper.RemovePeople(chapter.People, people, PersonRole.Publisher);
|
||||
PersonHelper.UpdatePeople(allPeople, people, PersonRole.Publisher,
|
||||
person => PersonHelper.AddPersonIfNotExists(chapter.People, person));
|
||||
|
||||
var genres = GetTagValues(comicInfo.Genre);
|
||||
GenreHelper.KeepOnlySameGenreBetweenLists(chapter.Genres, genres.Select(g => DbFactory.Genre(g, false)).ToList());
|
||||
GenreHelper.UpdateGenre(allGenres, genres, false,
|
||||
genre => chapter.Genres.Add(genre));
|
||||
|
||||
var tags = GetTagValues(comicInfo.Tags);
|
||||
TagHelper.KeepOnlySameTagBetweenLists(chapter.Tags, tags.Select(t => DbFactory.Tag(t, false)).ToList());
|
||||
TagHelper.UpdateTag(allTags, tags, false,
|
||||
(tag, _) =>
|
||||
{
|
||||
chapter.Tags.Add(tag);
|
||||
});
|
||||
}
|
||||
|
||||
private static IList<string> GetTagValues(string comicInfoTagSeparatedByComma)
|
||||
{
|
||||
|
||||
if (!string.IsNullOrEmpty(comicInfoTagSeparatedByComma))
|
||||
{
|
||||
var genres = comicInfo.Genre.Split(",");
|
||||
GenreHelper.KeepOnlySameGenreBetweenLists(chapter.Genres, genres.Select(g => DbFactory.Genre(g, false)).ToList());
|
||||
GenreHelper.UpdateGenre(allGenres, genres, false,
|
||||
genre => chapter.Genres.Add(genre));
|
||||
return comicInfoTagSeparatedByComma.Split(",").Select(s => s.Trim()).ToList();
|
||||
}
|
||||
return ImmutableList<string>.Empty;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,18 +103,15 @@ public class StatsService : IStatsService
|
|||
|
||||
public async Task<ServerInfoDto> GetServerInfo()
|
||||
{
|
||||
var installId = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId);
|
||||
var installVersion = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallVersion);
|
||||
|
||||
var serverSettings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync();
|
||||
|
||||
var serverInfo = new ServerInfoDto
|
||||
{
|
||||
InstallId = installId.Value,
|
||||
InstallId = serverSettings.InstallId,
|
||||
Os = RuntimeInformation.OSDescription,
|
||||
KavitaVersion = installVersion.Value,
|
||||
KavitaVersion = serverSettings.InstallVersion,
|
||||
DotnetVersion = Environment.Version.ToString(),
|
||||
IsDocker = new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker,
|
||||
IsDocker = new OsInfo().IsDocker,
|
||||
NumOfCores = Math.Max(Environment.ProcessorCount, 1),
|
||||
HasBookmarks = (await _unitOfWork.UserRepository.GetAllBookmarksAsync()).Any(),
|
||||
NumberOfLibraries = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()).Count(),
|
||||
|
|
@ -157,22 +154,20 @@ public class StatsService : IStatsService
|
|||
return _context.SeriesRelation.AnyAsync();
|
||||
}
|
||||
|
||||
private Task<int> MaxSeriesInAnyLibrary()
|
||||
private async Task<int> MaxSeriesInAnyLibrary()
|
||||
{
|
||||
return _context.Series
|
||||
.Select(s => new
|
||||
{
|
||||
LibraryId = s.LibraryId,
|
||||
Count = _context.Library.Where(l => l.Id == s.LibraryId).SelectMany(l => l.Series).Count()
|
||||
})
|
||||
.AsNoTracking()
|
||||
.AsSplitQuery()
|
||||
.MaxAsync(d => d.Count);
|
||||
// If first time flow, just return 0
|
||||
if (!await _context.Series.AnyAsync()) return 0;
|
||||
return await _context.Series
|
||||
.Select(s => _context.Library.Where(l => l.Id == s.LibraryId).SelectMany(l => l.Series).Count())
|
||||
.MaxAsync();
|
||||
}
|
||||
|
||||
private Task<int> MaxVolumesInASeries()
|
||||
private async Task<int> MaxVolumesInASeries()
|
||||
{
|
||||
return _context.Volume
|
||||
// If first time flow, just return 0
|
||||
if (!await _context.Volume.AnyAsync()) return 0;
|
||||
return await _context.Volume
|
||||
.Select(v => new
|
||||
{
|
||||
v.SeriesId,
|
||||
|
|
@ -183,9 +178,11 @@ public class StatsService : IStatsService
|
|||
.MaxAsync(d => d.Count);
|
||||
}
|
||||
|
||||
private Task<int> MaxChaptersInASeries()
|
||||
private async Task<int> MaxChaptersInASeries()
|
||||
{
|
||||
return _context.Series
|
||||
// If first time flow, just return 0
|
||||
if (!await _context.Chapter.AnyAsync()) return 0;
|
||||
return await _context.Series
|
||||
.AsNoTracking()
|
||||
.AsSplitQuery()
|
||||
.MaxAsync(s => s.Volumes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue