mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-01 04:34:49 -04:00
* 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
265 lines
11 KiB
C#
265 lines
11 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.DTOs.Reader;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using API.SignalR;
|
|
using Hangfire;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services;
|
|
|
|
public interface IBookmarkService
|
|
{
|
|
Task DeleteBookmarkFiles(IEnumerable<AppUserBookmark> bookmarks);
|
|
Task<bool> BookmarkPage(AppUser userWithBookmarks, BookmarkDto bookmarkDto, string imageToBookmark);
|
|
Task<bool> RemoveBookmarkPage(AppUser userWithBookmarks, BookmarkDto bookmarkDto);
|
|
Task<IEnumerable<string>> GetBookmarkFilesById(IEnumerable<int> bookmarkIds);
|
|
[DisableConcurrentExecution(timeoutInSeconds: 2 * 60 * 60), AutomaticRetry(Attempts = 0)]
|
|
Task ConvertAllBookmarkToWebP();
|
|
|
|
}
|
|
|
|
public class BookmarkService : IBookmarkService
|
|
{
|
|
private readonly ILogger<BookmarkService> _logger;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IDirectoryService _directoryService;
|
|
private readonly IImageService _imageService;
|
|
private readonly IEventHub _eventHub;
|
|
|
|
public BookmarkService(ILogger<BookmarkService> logger, IUnitOfWork unitOfWork,
|
|
IDirectoryService directoryService, IImageService imageService, IEventHub eventHub)
|
|
{
|
|
_logger = logger;
|
|
_unitOfWork = unitOfWork;
|
|
_directoryService = directoryService;
|
|
_imageService = imageService;
|
|
_eventHub = eventHub;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Deletes the files associated with the list of Bookmarks passed. Will clean up empty folders.
|
|
/// </summary>
|
|
/// <param name="bookmarks"></param>
|
|
public async Task DeleteBookmarkFiles(IEnumerable<AppUserBookmark> bookmarks)
|
|
{
|
|
var bookmarkDirectory =
|
|
(await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.BookmarkDirectory)).Value;
|
|
|
|
var bookmarkFilesToDelete = bookmarks.Select(b => Parser.Parser.NormalizePath(
|
|
_directoryService.FileSystem.Path.Join(bookmarkDirectory,
|
|
b.FileName))).ToList();
|
|
|
|
if (bookmarkFilesToDelete.Count == 0) return;
|
|
|
|
_directoryService.DeleteFiles(bookmarkFilesToDelete);
|
|
|
|
// Delete any leftover folders
|
|
foreach (var directory in _directoryService.FileSystem.Directory.GetDirectories(bookmarkDirectory, "", SearchOption.AllDirectories))
|
|
{
|
|
if (_directoryService.FileSystem.Directory.GetFiles(directory, "", SearchOption.AllDirectories).Length == 0 &&
|
|
_directoryService.FileSystem.Directory.GetDirectories(directory).Length == 0)
|
|
{
|
|
_directoryService.FileSystem.Directory.Delete(directory, false);
|
|
}
|
|
}
|
|
}
|
|
/// <summary>
|
|
/// Creates a new entry in the AppUserBookmarks and copies an image to BookmarkDirectory.
|
|
/// </summary>
|
|
/// <param name="userWithBookmarks">An AppUser object with Bookmarks populated</param>
|
|
/// <param name="bookmarkDto"></param>
|
|
/// <param name="imageToBookmark">Full path to the cached image that is going to be copied</param>
|
|
/// <returns>If the save to DB and copy was successful</returns>
|
|
public async Task<bool> BookmarkPage(AppUser userWithBookmarks, BookmarkDto bookmarkDto, string imageToBookmark)
|
|
{
|
|
try
|
|
{
|
|
var userBookmark =
|
|
await _unitOfWork.UserRepository.GetBookmarkForPage(bookmarkDto.Page, bookmarkDto.ChapterId, userWithBookmarks.Id);
|
|
|
|
if (userBookmark != null)
|
|
{
|
|
_logger.LogError("Bookmark already exists for Series {SeriesId}, Volume {VolumeId}, Chapter {ChapterId}, Page {PageNum}", bookmarkDto.SeriesId, bookmarkDto.VolumeId, bookmarkDto.ChapterId, bookmarkDto.Page);
|
|
return false;
|
|
}
|
|
|
|
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(settings.BookmarksDirectory, targetFolderStem);
|
|
|
|
var bookmark = new AppUserBookmark()
|
|
{
|
|
Page = bookmarkDto.Page,
|
|
VolumeId = bookmarkDto.VolumeId,
|
|
SeriesId = bookmarkDto.SeriesId,
|
|
ChapterId = bookmarkDto.ChapterId,
|
|
FileName = Path.Join(targetFolderStem, fileInfo.Name)
|
|
};
|
|
|
|
_directoryService.CopyFileToDirectory(imageToBookmark, targetFilepath);
|
|
userWithBookmarks.Bookmarks ??= new List<AppUserBookmark>();
|
|
userWithBookmarks.Bookmarks.Add(bookmark);
|
|
|
|
_unitOfWork.UserRepository.Update(userWithBookmarks);
|
|
await _unitOfWork.CommitAsync();
|
|
|
|
if (settings.ConvertBookmarkToWebP)
|
|
{
|
|
// Enqueue a task to convert the bookmark to webP
|
|
BackgroundJob.Enqueue(() => ConvertBookmarkToWebP(bookmark.Id));
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.LogError(ex, "There was an exception when saving bookmark");
|
|
await _unitOfWork.RollbackAsync();
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes the Bookmark entity and the file from BookmarkDirectory
|
|
/// </summary>
|
|
/// <param name="userWithBookmarks"></param>
|
|
/// <param name="bookmarkDto"></param>
|
|
/// <returns></returns>
|
|
public async Task<bool> RemoveBookmarkPage(AppUser userWithBookmarks, BookmarkDto bookmarkDto)
|
|
{
|
|
if (userWithBookmarks.Bookmarks == null) return true;
|
|
try
|
|
{
|
|
var bookmarkToDelete = userWithBookmarks.Bookmarks.SingleOrDefault(x =>
|
|
x.ChapterId == bookmarkDto.ChapterId && x.AppUserId == userWithBookmarks.Id && x.Page == bookmarkDto.Page &&
|
|
x.SeriesId == bookmarkDto.SeriesId);
|
|
|
|
if (bookmarkToDelete != null)
|
|
{
|
|
await DeleteBookmarkFiles(new[] {bookmarkToDelete});
|
|
_unitOfWork.UserRepository.Delete(bookmarkToDelete);
|
|
}
|
|
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
catch (Exception)
|
|
{
|
|
await _unitOfWork.RollbackAsync();
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
public async Task<IEnumerable<string>> GetBookmarkFilesById(IEnumerable<int> bookmarkIds)
|
|
{
|
|
var bookmarkDirectory =
|
|
(await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.BookmarkDirectory)).Value;
|
|
|
|
var bookmarks = await _unitOfWork.UserRepository.GetAllBookmarksByIds(bookmarkIds.ToList());
|
|
return bookmarks
|
|
.Select(b => Parser.Parser.NormalizePath(_directoryService.FileSystem.Path.Join(bookmarkDirectory,
|
|
b.FileName)));
|
|
}
|
|
|
|
/// <summary>
|
|
/// This is a long-running job that will convert all bookmarks into WebP. Do not invoke anyway except via Hangfire.
|
|
/// </summary>
|
|
[DisableConcurrentExecution(timeoutInSeconds: 2 * 60 * 60), AutomaticRetry(Attempts = 0)]
|
|
public async Task ConvertAllBookmarkToWebP()
|
|
{
|
|
var bookmarkDirectory =
|
|
(await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.BookmarkDirectory)).Value;
|
|
|
|
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
|
|
MessageFactory.ConvertBookmarksProgressEvent(0F, ProgressEventType.Started));
|
|
var bookmarks = (await _unitOfWork.UserRepository.GetAllBookmarksAsync())
|
|
.Where(b => !b.FileName.EndsWith(".webp")).ToList();
|
|
|
|
var count = 1F;
|
|
foreach (var bookmark in bookmarks)
|
|
{
|
|
await SaveBookmarkAsWebP(bookmarkDirectory, bookmark);
|
|
await _unitOfWork.CommitAsync();
|
|
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
|
|
MessageFactory.ConvertBookmarksProgressEvent(count / bookmarks.Count, ProgressEventType.Started));
|
|
count++;
|
|
}
|
|
|
|
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
|
|
MessageFactory.ConvertBookmarksProgressEvent(1F, ProgressEventType.Ended));
|
|
|
|
_logger.LogInformation("[BookmarkService] Converted bookmarks to WebP");
|
|
}
|
|
|
|
/// <summary>
|
|
/// This is a job that runs after a bookmark is saved
|
|
/// </summary>
|
|
public async Task ConvertBookmarkToWebP(int bookmarkId)
|
|
{
|
|
var bookmarkDirectory =
|
|
(await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.BookmarkDirectory)).Value;
|
|
var convertBookmarkToWebP =
|
|
(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).ConvertBookmarkToWebP;
|
|
|
|
if (!convertBookmarkToWebP) return;
|
|
|
|
// Validate the bookmark still exists
|
|
var bookmark = await _unitOfWork.UserRepository.GetBookmarkAsync(bookmarkId);
|
|
if (bookmark == null) return;
|
|
|
|
await SaveBookmarkAsWebP(bookmarkDirectory, bookmark);
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Converts bookmark file, deletes original, marks bookmark as dirty. Does not commit.
|
|
/// </summary>
|
|
/// <param name="bookmarkDirectory"></param>
|
|
/// <param name="bookmark"></param>
|
|
private async Task SaveBookmarkAsWebP(string bookmarkDirectory, AppUserBookmark bookmark)
|
|
{
|
|
var fullSourcePath = _directoryService.FileSystem.Path.Join(bookmarkDirectory, bookmark.FileName);
|
|
var fullTargetDirectory = fullSourcePath.Replace(new FileInfo(bookmark.FileName).Name, string.Empty);
|
|
var targetFolderStem = BookmarkStem(bookmark.AppUserId, bookmark.SeriesId, bookmark.ChapterId);
|
|
|
|
_logger.LogDebug("Converting {Source} bookmark into WebP at {Target}", fullSourcePath, fullTargetDirectory);
|
|
|
|
try
|
|
{
|
|
// Convert target file to webp then delete original target file and update bookmark
|
|
|
|
var originalFile = bookmark.FileName;
|
|
try
|
|
{
|
|
var targetFile = await _imageService.ConvertToWebP(fullSourcePath, fullTargetDirectory);
|
|
var targetName = new FileInfo(targetFile).Name;
|
|
bookmark.FileName = Path.Join(targetFolderStem, targetName);
|
|
_directoryService.DeleteFiles(new[] {fullSourcePath});
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.LogError(ex, "Could not convert file {FilePath}", bookmark.FileName);
|
|
bookmark.FileName = originalFile;
|
|
}
|
|
_unitOfWork.UserRepository.Update(bookmark);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.LogError(ex, "Could not convert bookmark to WebP");
|
|
}
|
|
}
|
|
|
|
private static string BookmarkStem(int userId, int seriesId, int chapterId)
|
|
{
|
|
return Path.Join($"{userId}", $"{seriesId}", $"{chapterId}");
|
|
}
|
|
}
|