mirror of
				https://github.com/Kareadita/Kavita.git
				synced 2025-11-04 03:27:05 -05:00 
			
		
		
		
	* Instead of augmenting prefetcher to move across chapter bounds, let's try to instead just load 5 images (which the browser will cache) from next/prev so when it loads, it's much faster. * Trialing loading next/prev chapters 5 pages to have better next page loading experience. * Tweaked GetChapterInfo API to actually apply conditional includeDimensions parameter. * added a basic language file for upcoming work * Moved the bottom menu up a bit for iOS devices with handlebars. * Fixed fit to width on phones still having a horizontal scrollbar * Fixed a bug where there is extra space under the image when fit to width and on a phone due to pagination going to far. * Changed which variable we use for right pagination calculation * Fixing fit to height - Fixing height calc to account for horizontal scroll bar height. * Added a comment for the height scrollbar fix * Adding screenfull package # Added: - Added screenfull package to handle cross-platform browser fullscreen code # Removed: - Removed custom fullscreen code * Fixed a bug where switching from webtoon reader to other layout modes wouldn't render anything. Webtoon continuous scroll down is now broken. * Fixed it back to how it was and all is good. Need to call detectChanges explicitly. * Removed an additional undeeded save progress call on loadPage * Laid out the test case to move the page snapping to the backend with full unit tests. Current code is broken just like UI layer. * Refactored the snap points into the backend and ensure that it works correctly. * Fixed a broken unit test * Filter out spammy hubs/messages calls in the logs * Swallow all noisy messages that are from RequestLoggingMiddleware when the log level is on Information or above. * Added a common loading component to the app. Have yet to refactor all screens to use this. * Bump json5 from 2.2.0 to 2.2.3 in /UI/Web Bumps [json5](https://github.com/json5/json5) from 2.2.0 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.2.0...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Alrigned all the loading messages and styles throughout the app * Webtoon reader will use max width of all images to ensure images align well. * On Original scaling mode, users can use the keyboard to scroll around the images without pagination kicking off. * Removed console logs * Fixed a public vs private issue * Fixed an issue around some cached files getting locked due to NetVips holding them during file size calculations. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
		
			
				
	
	
		
			302 lines
		
	
	
		
			12 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
			
		
		
	
	
			302 lines
		
	
	
		
			12 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
using System;
 | 
						|
using System.Collections.Generic;
 | 
						|
using System.IO;
 | 
						|
using System.Linq;
 | 
						|
using System.Threading.Tasks;
 | 
						|
using API.Constants;
 | 
						|
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();
 | 
						|
    Task ConvertAllCoverToWebP();
 | 
						|
    Task ConvertBookmarkToWebP(int bookmarkId);
 | 
						|
 | 
						|
}
 | 
						|
 | 
						|
public class BookmarkService : IBookmarkService
 | 
						|
{
 | 
						|
    public const string Name = "BookmarkService";
 | 
						|
    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 => Tasks.Scanner.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)
 | 
						|
    {
 | 
						|
        if (userWithBookmarks == null || userWithBookmarks.Bookmarks == null) return false;
 | 
						|
        try
 | 
						|
        {
 | 
						|
            var userBookmark = userWithBookmarks.Bookmarks.SingleOrDefault(b => b.Page == bookmarkDto.Page && b.ChapterId == bookmarkDto.ChapterId);
 | 
						|
            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 true;
 | 
						|
            }
 | 
						|
 | 
						|
            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),
 | 
						|
                AppUserId = userWithBookmarks.Id
 | 
						|
            };
 | 
						|
 | 
						|
            _directoryService.CopyFileToDirectory(imageToBookmark, targetFilepath);
 | 
						|
 | 
						|
            _unitOfWork.UserRepository.Add(bookmark);
 | 
						|
            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;
 | 
						|
        var bookmarkToDelete = userWithBookmarks.Bookmarks.SingleOrDefault(x =>
 | 
						|
            x.ChapterId == bookmarkDto.ChapterId && x.Page == bookmarkDto.Page);
 | 
						|
        try
 | 
						|
        {
 | 
						|
            if (bookmarkToDelete != null)
 | 
						|
            {
 | 
						|
                _unitOfWork.UserRepository.Delete(bookmarkToDelete);
 | 
						|
            }
 | 
						|
 | 
						|
            await _unitOfWork.CommitAsync();
 | 
						|
        }
 | 
						|
        catch (Exception)
 | 
						|
        {
 | 
						|
            return false;
 | 
						|
        }
 | 
						|
 | 
						|
        await DeleteBookmarkFiles(new[] {bookmarkToDelete});
 | 
						|
        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 => Tasks.Scanner.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)
 | 
						|
        {
 | 
						|
            bookmark.FileName = await SaveAsWebP(bookmarkDirectory, bookmark.FileName,
 | 
						|
                BookmarkStem(bookmark.AppUserId, bookmark.SeriesId, bookmark.ChapterId));
 | 
						|
            _unitOfWork.UserRepository.Update(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 long-running job that will convert all covers into WebP. Do not invoke anyway except via Hangfire.
 | 
						|
    /// </summary>
 | 
						|
    [DisableConcurrentExecution(timeoutInSeconds: 2 * 60 * 60), AutomaticRetry(Attempts = 0)]
 | 
						|
    public async Task ConvertAllCoverToWebP()
 | 
						|
    {
 | 
						|
        var coverDirectory = _directoryService.CoverImageDirectory;
 | 
						|
 | 
						|
        await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
 | 
						|
            MessageFactory.ConvertCoverProgressEvent(0F, ProgressEventType.Started));
 | 
						|
        var chapters = await _unitOfWork.ChapterRepository.GetAllChaptersWithNonWebPCovers();
 | 
						|
 | 
						|
        var count = 1F;
 | 
						|
        foreach (var chapter in chapters)
 | 
						|
        {
 | 
						|
            var newFile = await SaveAsWebP(coverDirectory, chapter.CoverImage, coverDirectory);
 | 
						|
            chapter.CoverImage = newFile;
 | 
						|
            _unitOfWork.ChapterRepository.Update(chapter);
 | 
						|
            await _unitOfWork.CommitAsync();
 | 
						|
            await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
 | 
						|
                MessageFactory.ConvertCoverProgressEvent(count / chapters.Count, ProgressEventType.Started));
 | 
						|
            count++;
 | 
						|
        }
 | 
						|
 | 
						|
        await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
 | 
						|
            MessageFactory.ConvertCoverProgressEvent(1F, ProgressEventType.Ended));
 | 
						|
 | 
						|
        _logger.LogInformation("[BookmarkService] Converted covers 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;
 | 
						|
 | 
						|
        bookmark.FileName = await SaveAsWebP(bookmarkDirectory, bookmark.FileName,
 | 
						|
            BookmarkStem(bookmark.AppUserId, bookmark.SeriesId, bookmark.ChapterId));
 | 
						|
        _unitOfWork.UserRepository.Update(bookmark);
 | 
						|
 | 
						|
        await _unitOfWork.CommitAsync();
 | 
						|
    }
 | 
						|
 | 
						|
    /// <summary>
 | 
						|
    /// Converts an image file, deletes original and returns the new path back
 | 
						|
    /// </summary>
 | 
						|
    /// <param name="imageDirectory">Full Path to where files are stored</param>
 | 
						|
    /// <param name="filename">The file to convert</param>
 | 
						|
    /// <param name="targetFolder">Full path to where files should be stored or any stem</param>
 | 
						|
    /// <returns></returns>
 | 
						|
    private async Task<string> SaveAsWebP(string imageDirectory, string filename, string targetFolder)
 | 
						|
    {
 | 
						|
        var fullSourcePath = _directoryService.FileSystem.Path.Join(imageDirectory, filename);
 | 
						|
        var fullTargetDirectory = fullSourcePath.Replace(new FileInfo(filename).Name, string.Empty);
 | 
						|
 | 
						|
        var newFilename = string.Empty;
 | 
						|
        _logger.LogDebug("Converting {Source} image into WebP at {Target}", fullSourcePath, fullTargetDirectory);
 | 
						|
 | 
						|
        try
 | 
						|
        {
 | 
						|
            // Convert target file to webp then delete original target file and update bookmark
 | 
						|
 | 
						|
            var originalFile = filename;
 | 
						|
            try
 | 
						|
            {
 | 
						|
                var targetFile = await _imageService.ConvertToWebP(fullSourcePath, fullTargetDirectory);
 | 
						|
                var targetName = new FileInfo(targetFile).Name;
 | 
						|
                newFilename = Path.Join(targetFolder, targetName);
 | 
						|
                _directoryService.DeleteFiles(new[] {fullSourcePath});
 | 
						|
            }
 | 
						|
            catch (Exception ex)
 | 
						|
            {
 | 
						|
                _logger.LogError(ex, "Could not convert image {FilePath}", filename);
 | 
						|
                newFilename = originalFile;
 | 
						|
            }
 | 
						|
        }
 | 
						|
        catch (Exception ex)
 | 
						|
        {
 | 
						|
            _logger.LogError(ex, "Could not convert image to WebP");
 | 
						|
        }
 | 
						|
 | 
						|
        return newFilename;
 | 
						|
    }
 | 
						|
 | 
						|
    private static string BookmarkStem(int userId, int seriesId, int chapterId)
 | 
						|
    {
 | 
						|
        return Path.Join($"{userId}", $"{seriesId}", $"{chapterId}");
 | 
						|
    }
 | 
						|
}
 |