mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Moved libraryType into chapter info * Fixed a bug where you could not reset cover on a series * Patched in relevant changes from another polish branch * Refactored invite user setup to shift the checking for accessibility to the backend and always show the link. This will help with users who have some unique setups in docker. * Refactored invite user to always print the url to setup a new account. * Single page renderer uses canvasImage rather than re-requesting and relying on cache * Fixed a rendering issue where fit to split on single on a cover wouldn't force width scaling just for that image * Fixed a rendering bug with split image functionality * Added title to copy button * Fixed a bug in GetContinuePoint when a chapter is added to an already read volume and a new chapter is added loose leaf. The loose leaf would be prioritized over the volume chapter. Refactored 2 methods from controller into service and unit tested. * Fixed a bug on opening a volume in series detail that had a chapter added to it after the volume (0 chapter) was read would cause a loose leaf chapter to be opened. * Added mark as read/actionables on Files in volume detail modal. Fixed a bug where we were showing the wrong page count in a volume detail modal. * Removed OnDeck page and replaced it with a pre-filtered All-Series. Hooked up the ability to pass read state to the filter via query params. Fixed some spacing on filter post bootstrap update. * Fixed up some poor documentation on FilterDto. * Some string equals enhancements to reduce extra allocations * Fixed an issue when trying to download via a url, to remove query parameters to get the format * Made an optimization to Normalize method to reduce memory pressure by 100MB over the course of a scan (16k files) * Adjusted the styles on dashboard for first time setup and used a routerlink rather than href to avoid a fresh load. * Use framgment on router link * Hooked in the ability to search by release year (along with series optionally) and series will be returned back. * Fixed a bug in the filter format code where it was sending the wrong type * Only show clear all on typeahead when there are at least one selected item * Cleaned up the styles of the styles of the typeahead * Removed some dead code * Implemented the ability to filter against a series name. * Fixed filter top offset * Ensure that when we add or remove libraries, the side nav of users gets updated. * Tweaked the width on the mobile side nav * Close side nav on clicking overlay on mobile viewport * Don't show a pointer if the carousel section title is not actually selectable * Removed the User profile on the side nav so home is always first. Tweaked styles to match * Fixed up some poor documentation on FilterDto. * Fixed a bug where Latest read date wasn't being set due to an early short circuit. * When sending the chapter file, format the title of the FeedEntry more like Series Detail. * Removed dead code
237 lines
9.6 KiB
C#
237 lines
9.6 KiB
C#
using System;
|
|
using System.IO;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.DTOs.Uploads;
|
|
using API.Extensions;
|
|
using API.Services;
|
|
using Flurl.Http;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Controllers
|
|
{
|
|
/// <summary>
|
|
///
|
|
/// </summary>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
public class UploadController : BaseApiController
|
|
{
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IImageService _imageService;
|
|
private readonly ILogger<UploadController> _logger;
|
|
private readonly ITaskScheduler _taskScheduler;
|
|
private readonly IDirectoryService _directoryService;
|
|
|
|
/// <inheritdoc />
|
|
public UploadController(IUnitOfWork unitOfWork, IImageService imageService, ILogger<UploadController> logger,
|
|
ITaskScheduler taskScheduler, IDirectoryService directoryService)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
_imageService = imageService;
|
|
_logger = logger;
|
|
_taskScheduler = taskScheduler;
|
|
_directoryService = directoryService;
|
|
}
|
|
|
|
/// <summary>
|
|
/// This stores a file (image) in temp directory for use in a cover image replacement flow.
|
|
/// This is automatically cleaned up.
|
|
/// </summary>
|
|
/// <param name="dto">Escaped url to download from</param>
|
|
/// <returns>filename</returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[HttpPost("upload-by-url")]
|
|
public async Task<ActionResult<string>> GetImageFromFile(UploadUrlDto dto)
|
|
{
|
|
var dateString = $"{DateTime.Now.ToShortDateString()}_{DateTime.Now.ToLongTimeString()}".Replace("/", "_").Replace(":", "_");
|
|
var format = _directoryService.FileSystem.Path.GetExtension(dto.Url.Split('?')[0]).Replace(".", "");
|
|
var path = await dto.Url
|
|
.DownloadFileAsync(_directoryService.TempDirectory, $"coverupload_{dateString}.{format}");
|
|
|
|
if (string.IsNullOrEmpty(path) || !_directoryService.FileSystem.File.Exists(path)) return BadRequest($"Could not download file");
|
|
|
|
return $"coverupload_{dateString}.{format}";
|
|
}
|
|
|
|
/// <summary>
|
|
/// Replaces series cover image and locks it with a base64 encoded image
|
|
/// </summary>
|
|
/// <param name="uploadFileDto"></param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[RequestSizeLimit(8_000_000)]
|
|
[HttpPost("series")]
|
|
public async Task<ActionResult> UploadSeriesCoverImageFromUrl(UploadFileDto uploadFileDto)
|
|
{
|
|
// Check if Url is non empty, request the image and place in temp, then ask image service to handle it.
|
|
// See if we can do this all in memory without touching underlying system
|
|
if (string.IsNullOrEmpty(uploadFileDto.Url))
|
|
{
|
|
return BadRequest("You must pass a url to use");
|
|
}
|
|
|
|
try
|
|
{
|
|
var filePath = _imageService.CreateThumbnailFromBase64(uploadFileDto.Url, ImageService.GetSeriesFormat(uploadFileDto.Id));
|
|
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(uploadFileDto.Id);
|
|
|
|
if (!string.IsNullOrEmpty(filePath))
|
|
{
|
|
series.CoverImage = filePath;
|
|
series.CoverImageLocked = true;
|
|
_unitOfWork.SeriesRepository.Update(series);
|
|
}
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
return Ok();
|
|
}
|
|
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "There was an issue uploading cover image for Series {Id}", uploadFileDto.Id);
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
return BadRequest("Unable to save cover image to Series");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Replaces collection tag cover image and locks it with a base64 encoded image
|
|
/// </summary>
|
|
/// <param name="uploadFileDto"></param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[RequestSizeLimit(8_000_000)]
|
|
[HttpPost("collection")]
|
|
public async Task<ActionResult> UploadCollectionCoverImageFromUrl(UploadFileDto uploadFileDto)
|
|
{
|
|
// Check if Url is non empty, request the image and place in temp, then ask image service to handle it.
|
|
// See if we can do this all in memory without touching underlying system
|
|
if (string.IsNullOrEmpty(uploadFileDto.Url))
|
|
{
|
|
return BadRequest("You must pass a url to use");
|
|
}
|
|
|
|
try
|
|
{
|
|
var filePath = _imageService.CreateThumbnailFromBase64(uploadFileDto.Url, $"{ImageService.GetCollectionTagFormat(uploadFileDto.Id)}");
|
|
var tag = await _unitOfWork.CollectionTagRepository.GetTagAsync(uploadFileDto.Id);
|
|
|
|
if (!string.IsNullOrEmpty(filePath))
|
|
{
|
|
tag.CoverImage = filePath;
|
|
tag.CoverImageLocked = true;
|
|
_unitOfWork.CollectionTagRepository.Update(tag);
|
|
}
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
return Ok();
|
|
}
|
|
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "There was an issue uploading cover image for Collection Tag {Id}", uploadFileDto.Id);
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
return BadRequest("Unable to save cover image to Collection Tag");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Replaces chapter cover image and locks it with a base64 encoded image. This will update the parent volume's cover image.
|
|
/// </summary>
|
|
/// <param name="uploadFileDto"></param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[RequestSizeLimit(8_000_000)]
|
|
[HttpPost("chapter")]
|
|
public async Task<ActionResult> UploadChapterCoverImageFromUrl(UploadFileDto uploadFileDto)
|
|
{
|
|
// Check if Url is non empty, request the image and place in temp, then ask image service to handle it.
|
|
// See if we can do this all in memory without touching underlying system
|
|
if (string.IsNullOrEmpty(uploadFileDto.Url))
|
|
{
|
|
return BadRequest("You must pass a url to use");
|
|
}
|
|
|
|
try
|
|
{
|
|
var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(uploadFileDto.Id);
|
|
var filePath = _imageService.CreateThumbnailFromBase64(uploadFileDto.Url, $"{ImageService.GetChapterFormat(uploadFileDto.Id, chapter.VolumeId)}");
|
|
|
|
if (!string.IsNullOrEmpty(filePath))
|
|
{
|
|
chapter.CoverImage = filePath;
|
|
chapter.CoverImageLocked = true;
|
|
_unitOfWork.ChapterRepository.Update(chapter);
|
|
var volume = await _unitOfWork.VolumeRepository.GetVolumeAsync(chapter.VolumeId);
|
|
volume.CoverImage = chapter.CoverImage;
|
|
_unitOfWork.VolumeRepository.Update(volume);
|
|
}
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
return Ok();
|
|
}
|
|
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "There was an issue uploading cover image for Chapter {Id}", uploadFileDto.Id);
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
return BadRequest("Unable to save cover image to Chapter");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Replaces chapter cover image and locks it with a base64 encoded image. This will update the parent volume's cover image.
|
|
/// </summary>
|
|
/// <param name="uploadFileDto">Does not use Url property</param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[HttpPost("reset-chapter-lock")]
|
|
public async Task<ActionResult> ResetChapterLock(UploadFileDto uploadFileDto)
|
|
{
|
|
try
|
|
{
|
|
var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(uploadFileDto.Id);
|
|
var originalFile = chapter.CoverImage;
|
|
chapter.CoverImage = string.Empty;
|
|
chapter.CoverImageLocked = false;
|
|
_unitOfWork.ChapterRepository.Update(chapter);
|
|
var volume = await _unitOfWork.VolumeRepository.GetVolumeAsync(chapter.VolumeId);
|
|
volume.CoverImage = chapter.CoverImage;
|
|
_unitOfWork.VolumeRepository.Update(volume);
|
|
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(volume.SeriesId);
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
System.IO.File.Delete(originalFile);
|
|
_taskScheduler.RefreshSeriesMetadata(series.LibraryId, series.Id, true);
|
|
return Ok();
|
|
}
|
|
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "There was an issue resetting cover lock for Chapter {Id}", uploadFileDto.Id);
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
return BadRequest("Unable to resetting cover lock for Chapter");
|
|
}
|
|
|
|
}
|
|
}
|