mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 20:24:27 -04:00
* Updated to net7.0 * Updated GA to .net 7 * Updated System.IO.Abstractions to use New factory. * Converted Regex into SourceGenerator in Parser. * Updated more regex to source generators. * Enabled Nullability and more regex changes throughout codebase. * Parser is 100% GeneratedRegexified * Lots of nullability code * Enabled nullability for all repositories. * Fixed another unit test * Refactored some code around and took care of some todos. * Updating code for nullability and cleaning up methods that aren't used anymore. Refctored all uses of Parser.Normalize() to use new extension * More nullability exercises. 500 warnings to go. * Fixed a bug where custom file uploads for entities wouldn't save in webP. * Nullability is done for all DTOs * Fixed all unit tests and nullability for the project. Only OPDS is left which will be done with an upcoming OPDS enhancement. * Use localization in book service after validating * Code smells * Switched to preview build of swashbuckle for .net7 support * Fixed up merge issues * Disable emulate comic book when on single page reader * Fixed a regression where double page renderer wouldn't layout the images correctly * Updated to swashbuckle which support .net 7 * Fixed a bad GA action * Some code cleanup * More code smells * Took care of most of nullable issues * Fixed a broken test due to having more than one test run in parallel * I'm really not sure why the unit tests are failing or are so extremely slow on .net 7 * Updated all dependencies * Fixed up build and removed hardcoded framework from build scripts. (this merge removes Regex Source generators). Unit tests are completely busted. * Unit tests and code cleanup. Needs shakeout now. * Adjusted Series model since a few fields are not-nullable. Removed dead imports on the project. * Refactored to use Builder pattern for all unit tests. * Switched nullability down to warnings. It wasn't possible to switch due to constraint issues in DB Migration.
67 lines
2.5 KiB
C#
67 lines
2.5 KiB
C#
using System.IO;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.ReadingLists.CBL;
|
|
using API.Extensions;
|
|
using API.Services;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
namespace API.Controllers;
|
|
|
|
/// <summary>
|
|
/// Responsible for the CBL import flow
|
|
/// </summary>
|
|
public class CblController : BaseApiController
|
|
{
|
|
private readonly IReadingListService _readingListService;
|
|
private readonly IDirectoryService _directoryService;
|
|
|
|
public CblController(IReadingListService readingListService, IDirectoryService directoryService)
|
|
{
|
|
_readingListService = readingListService;
|
|
_directoryService = directoryService;
|
|
}
|
|
|
|
/// <summary>
|
|
/// The first step in a cbl import. This validates the cbl file that if an import occured, would it be successful.
|
|
/// If this returns errors, the cbl will always be rejected by Kavita.
|
|
/// </summary>
|
|
/// <param name="file">FormBody with parameter name of cbl</param>
|
|
/// <returns></returns>
|
|
[HttpPost("validate")]
|
|
public async Task<ActionResult<CblImportSummaryDto>> ValidateCbl([FromForm(Name = "cbl")] IFormFile file)
|
|
{
|
|
var userId = User.GetUserId();
|
|
var cbl = await SaveAndLoadCblFile(userId, file);
|
|
|
|
var importSummary = await _readingListService.ValidateCblFile(userId, cbl);
|
|
return Ok(importSummary);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Performs the actual import (assuming dryRun = false)
|
|
/// </summary>
|
|
/// <param name="file">FormBody with parameter name of cbl</param>
|
|
/// <param name="dryRun">If true, will only emulate the import but not perform. This should be done to preview what will happen</param>
|
|
/// <returns></returns>
|
|
[HttpPost("import")]
|
|
public async Task<ActionResult<CblImportSummaryDto>> ImportCbl([FromForm(Name = "cbl")] IFormFile file, [FromForm(Name = "dryRun")] bool dryRun = false)
|
|
{
|
|
var userId = User.GetUserId();
|
|
var cbl = await SaveAndLoadCblFile(userId, file);
|
|
|
|
return Ok(await _readingListService.CreateReadingListFromCbl(userId, cbl, dryRun));
|
|
}
|
|
|
|
private async Task<CblReadingList> SaveAndLoadCblFile(int userId, IFormFile file)
|
|
{
|
|
var filename = Path.GetRandomFileName();
|
|
var outputFile = Path.Join(_directoryService.TempDirectory, filename);
|
|
await using var stream = System.IO.File.Create(outputFile);
|
|
await file.CopyToAsync(stream);
|
|
stream.Close();
|
|
return ReadingListService.LoadCblFromPath(outputFile);
|
|
}
|
|
}
|