mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Refactored the design of reading list page to follow more in line with list view. Added release date on the reading list items, if it's set in underlying chapter. Fixed a bug where reordering the list items could sometimes not update correctly with drag and drop. * Removed a bug marker that I just fixed * When generating library covers, make them much smaller as they are only ever icons. * Fixed library settings not showing the correct image. * Fixed a bug where duplicate collection tags could be created. Fixed a bug where collection tag normalized title was being set to uppercase. Redesigned the edit collection tag modal to align with new library settings and provide inline name checks. * Updated edit reading list modal to align with new library settings modal pattern. Refactored the backend to ensure it flows correctly without allowing duplicate names. Don't show Continue point on series detail if the whole series is read. * Added some more unit tests around continue point * Fixed a bug on series detail when bulk selecting between volume and chapters, the code which determines which chapters are selected didn't take into account mixed layout for Storyline tab. * Refactored to generate an OpenAPI spec at root of Kavita. This will be loaded by a new API site for easy hosting. Deprecated EnableSwaggerUi preference as after validation new system works, this will be removed and instances can use our hosting to hit their server (or run a debug build). * Test GA * Reverted GA and instead do it in the build step. This will just force developers to commit it in. * GA please work * Removed redundant steps from test since build already does it. * Try another GA * Moved all test actions into initial build step, which should drastically cut down on time. Only run sonar if the secret is present (so not for forks). Updated build requirements for develop and stable docker pushes. * Fixed env variable * Okay not possible to do secrets in if statement * Fixed the build step to output the openapi.json where it's expected.
367 lines
14 KiB
C#
367 lines
14 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 API.SignalR;
|
|
using Flurl.Http;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.Extensions.Logging;
|
|
using NetVips;
|
|
|
|
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;
|
|
private readonly IEventHub _eventHub;
|
|
|
|
/// <inheritdoc />
|
|
public UploadController(IUnitOfWork unitOfWork, IImageService imageService, ILogger<UploadController> logger,
|
|
ITaskScheduler taskScheduler, IDirectoryService directoryService, IEventHub eventHub)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
_imageService = imageService;
|
|
_logger = logger;
|
|
_taskScheduler = taskScheduler;
|
|
_directoryService = directoryService;
|
|
_eventHub = eventHub;
|
|
}
|
|
|
|
/// <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(".", string.Empty);
|
|
try
|
|
{
|
|
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");
|
|
|
|
if (!await _imageService.IsImage(path)) return BadRequest("Url does not return a valid image");
|
|
|
|
return $"coverupload_{dateString}.{format}";
|
|
}
|
|
catch (FlurlHttpException ex)
|
|
{
|
|
// Unauthorized
|
|
if (ex.StatusCode == 401)
|
|
return BadRequest("The server requires authentication to load the url externally");
|
|
}
|
|
|
|
return BadRequest("Unable to download image, please use another url or upload by file");
|
|
}
|
|
|
|
/// <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 _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(series.Id, MessageFactoryEntityTypes.Series), false);
|
|
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();
|
|
await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(tag.Id, MessageFactoryEntityTypes.CollectionTag), false);
|
|
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 reading list 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("reading-list")]
|
|
public async Task<ActionResult> UploadReadingListCoverImageFromUrl(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.GetReadingListFormat(uploadFileDto.Id)}");
|
|
var readingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(uploadFileDto.Id);
|
|
|
|
if (!string.IsNullOrEmpty(filePath))
|
|
{
|
|
readingList.CoverImage = filePath;
|
|
readingList.CoverImageLocked = true;
|
|
_unitOfWork.ReadingListRepository.Update(readingList);
|
|
}
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(readingList.Id, MessageFactoryEntityTypes.ReadingList), false);
|
|
return Ok();
|
|
}
|
|
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "There was an issue uploading cover image for Reading List {Id}", uploadFileDto.Id);
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
return BadRequest("Unable to save cover image to Reading List");
|
|
}
|
|
|
|
/// <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();
|
|
await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(chapter.VolumeId, MessageFactoryEntityTypes.Volume), false);
|
|
await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(chapter.Id, MessageFactoryEntityTypes.Chapter), false);
|
|
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 library cover image with a base64 encoded image. If empty string passed, will reset to null.
|
|
/// </summary>
|
|
/// <param name="uploadFileDto"></param>
|
|
/// <returns></returns>
|
|
[Authorize(Policy = "RequireAdminRole")]
|
|
[RequestSizeLimit(8_000_000)]
|
|
[HttpPost("library")]
|
|
public async Task<ActionResult> UploadLibraryCoverImageFromUrl(UploadFileDto uploadFileDto)
|
|
{
|
|
var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(uploadFileDto.Id);
|
|
if (library == null) return BadRequest("This library does not exist");
|
|
|
|
// 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))
|
|
{
|
|
library.CoverImage = null;
|
|
_unitOfWork.LibraryRepository.Update(library);
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(library.Id, MessageFactoryEntityTypes.Library), false);
|
|
}
|
|
|
|
return Ok();
|
|
}
|
|
|
|
try
|
|
{
|
|
var filePath = _imageService.CreateThumbnailFromBase64(uploadFileDto.Url,
|
|
$"{ImageService.GetLibraryFormat(uploadFileDto.Id)}", ImageService.LibraryThumbnailWidth);
|
|
|
|
if (!string.IsNullOrEmpty(filePath))
|
|
{
|
|
library.CoverImage = filePath;
|
|
_unitOfWork.LibraryRepository.Update(library);
|
|
}
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate,
|
|
MessageFactory.CoverUpdateEvent(library.Id, MessageFactoryEntityTypes.Library), false);
|
|
return Ok();
|
|
}
|
|
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "There was an issue uploading cover image for Library {Id}", uploadFileDto.Id);
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
return BadRequest("Unable to save cover image to Library");
|
|
}
|
|
|
|
/// <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");
|
|
}
|
|
|
|
}
|