mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
# Added - New: Cards when processing a download shows a spinner for the progress of the download # Changed - Changed: Downloads now always take the backend filename and are streamed in a more optimal manner, reducing the javascript processing that was needed previously. ================================== * Started refactor of downloader to be more UX friendly and much faster. * Completed refactor of Volume download to use a new mechanism. Downloads are streamed over and filename used exclusively from header. Backend has additional DB calls to get the Series Name information to make filenames nice. * download service has been updated so all download functions use new event based observable. Duplicates code for downloading, but much cleaner and faster. * Small code cleanup
208 lines
9.3 KiB
C#
208 lines
9.3 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Comparators;
|
|
using API.DTOs.Downloads;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using API.Extensions;
|
|
using API.Interfaces;
|
|
using API.Interfaces.Services;
|
|
using API.Services;
|
|
using Kavita.Common;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.StaticFiles;
|
|
|
|
namespace API.Controllers
|
|
{
|
|
[Authorize(Policy = "RequireDownloadRole")]
|
|
public class DownloadController : BaseApiController
|
|
{
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IArchiveService _archiveService;
|
|
private readonly IDirectoryService _directoryService;
|
|
private readonly ICacheService _cacheService;
|
|
private readonly NumericComparer _numericComparer;
|
|
private const string DefaultContentType = "application/octet-stream"; // "application/zip"
|
|
|
|
public DownloadController(IUnitOfWork unitOfWork, IArchiveService archiveService, IDirectoryService directoryService, ICacheService cacheService)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
_archiveService = archiveService;
|
|
_directoryService = directoryService;
|
|
_cacheService = cacheService;
|
|
_numericComparer = new NumericComparer();
|
|
}
|
|
|
|
[HttpGet("volume-size")]
|
|
public async Task<ActionResult<long>> GetVolumeSize(int volumeId)
|
|
{
|
|
var files = await _unitOfWork.VolumeRepository.GetFilesForVolume(volumeId);
|
|
return Ok(DirectoryService.GetTotalSize(files.Select(c => c.FilePath)));
|
|
}
|
|
|
|
[HttpGet("chapter-size")]
|
|
public async Task<ActionResult<long>> GetChapterSize(int chapterId)
|
|
{
|
|
var files = await _unitOfWork.VolumeRepository.GetFilesForChapterAsync(chapterId);
|
|
return Ok(DirectoryService.GetTotalSize(files.Select(c => c.FilePath)));
|
|
}
|
|
|
|
[HttpGet("series-size")]
|
|
public async Task<ActionResult<long>> GetSeriesSize(int seriesId)
|
|
{
|
|
var files = await _unitOfWork.SeriesRepository.GetFilesForSeries(seriesId);
|
|
return Ok(DirectoryService.GetTotalSize(files.Select(c => c.FilePath)));
|
|
}
|
|
|
|
[HttpGet("volume")]
|
|
public async Task<ActionResult> DownloadVolume(int volumeId)
|
|
{
|
|
var files = await _unitOfWork.VolumeRepository.GetFilesForVolume(volumeId);
|
|
var volume = await _unitOfWork.SeriesRepository.GetVolumeByIdAsync(volumeId);
|
|
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(volume.SeriesId);
|
|
try
|
|
{
|
|
if (files.Count == 1)
|
|
{
|
|
return await GetFirstFileDownload(files);
|
|
}
|
|
var (fileBytes, zipPath) = await _archiveService.CreateZipForDownload(files.Select(c => c.FilePath),
|
|
$"download_{User.GetUsername()}_v{volumeId}");
|
|
return File(fileBytes, DefaultContentType, $"{series.Name} - Volume {volume.Number}.zip");
|
|
}
|
|
catch (KavitaException ex)
|
|
{
|
|
return BadRequest(ex.Message);
|
|
}
|
|
}
|
|
|
|
private async Task<ActionResult> GetFirstFileDownload(IEnumerable<MangaFile> files)
|
|
{
|
|
var firstFile = files.Select(c => c.FilePath).First();
|
|
var fileProvider = new FileExtensionContentTypeProvider();
|
|
// Figures out what the content type should be based on the file name.
|
|
if (!fileProvider.TryGetContentType(firstFile, out var contentType))
|
|
{
|
|
contentType = Path.GetExtension(firstFile).ToLowerInvariant() switch
|
|
{
|
|
".cbz" => "application/zip",
|
|
".cbr" => "application/vnd.rar",
|
|
".cb7" => "application/x-compressed",
|
|
".epub" => "application/epub+zip",
|
|
".7z" => "application/x-7z-compressed",
|
|
".7zip" => "application/x-7z-compressed",
|
|
".pdf" => "application/pdf",
|
|
_ => contentType
|
|
};
|
|
}
|
|
|
|
return File(await _directoryService.ReadFileAsync(firstFile), contentType, Path.GetFileName(firstFile));
|
|
}
|
|
|
|
[HttpGet("chapter")]
|
|
public async Task<ActionResult> DownloadChapter(int chapterId)
|
|
{
|
|
var files = await _unitOfWork.VolumeRepository.GetFilesForChapterAsync(chapterId);
|
|
var chapter = await _unitOfWork.VolumeRepository.GetChapterAsync(chapterId);
|
|
var volume = await _unitOfWork.SeriesRepository.GetVolumeByIdAsync(chapter.VolumeId);
|
|
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(volume.SeriesId);
|
|
try
|
|
{
|
|
if (files.Count == 1)
|
|
{
|
|
return await GetFirstFileDownload(files);
|
|
}
|
|
var (fileBytes, zipPath) = await _archiveService.CreateZipForDownload(files.Select(c => c.FilePath),
|
|
$"download_{User.GetUsername()}_c{chapterId}");
|
|
return File(fileBytes, DefaultContentType, $"{series.Name} - Chapter {chapter.Number}.zip");
|
|
}
|
|
catch (KavitaException ex)
|
|
{
|
|
return BadRequest(ex.Message);
|
|
}
|
|
}
|
|
|
|
[HttpGet("series")]
|
|
public async Task<ActionResult> DownloadSeries(int seriesId)
|
|
{
|
|
var files = await _unitOfWork.SeriesRepository.GetFilesForSeries(seriesId);
|
|
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId);
|
|
try
|
|
{
|
|
if (files.Count == 1)
|
|
{
|
|
return await GetFirstFileDownload(files);
|
|
}
|
|
var (fileBytes, zipPath) = await _archiveService.CreateZipForDownload(files.Select(c => c.FilePath),
|
|
$"download_{User.GetUsername()}_s{seriesId}");
|
|
return File(fileBytes, DefaultContentType, $"{series.Name}.zip");
|
|
}
|
|
catch (KavitaException ex)
|
|
{
|
|
return BadRequest(ex.Message);
|
|
}
|
|
}
|
|
|
|
[HttpPost("bookmarks")]
|
|
public async Task<ActionResult> DownloadBookmarkPages(DownloadBookmarkDto downloadBookmarkDto)
|
|
{
|
|
// We know that all bookmarks will be for one single seriesId
|
|
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(downloadBookmarkDto.Bookmarks.First().SeriesId);
|
|
var totalFilePaths = new List<string>();
|
|
|
|
var tempFolder = $"download_{series.Id}_bookmarks";
|
|
var fullExtractPath = Path.Join(DirectoryService.TempDirectory, tempFolder);
|
|
if (new DirectoryInfo(fullExtractPath).Exists)
|
|
{
|
|
return BadRequest(
|
|
"Server is currently processing this exact download. Please try again in a few minutes.");
|
|
}
|
|
DirectoryService.ExistOrCreate(fullExtractPath);
|
|
|
|
var uniqueChapterIds = downloadBookmarkDto.Bookmarks.Select(b => b.ChapterId).Distinct().ToList();
|
|
|
|
foreach (var chapterId in uniqueChapterIds)
|
|
{
|
|
var chapterExtractPath = Path.Join(fullExtractPath, $"{series.Id}_bookmark_{chapterId}");
|
|
var chapterPages = downloadBookmarkDto.Bookmarks.Where(b => b.ChapterId == chapterId)
|
|
.Select(b => b.Page).ToList();
|
|
var mangaFiles = await _unitOfWork.VolumeRepository.GetFilesForChapterAsync(chapterId);
|
|
switch (series.Format)
|
|
{
|
|
case MangaFormat.Image:
|
|
DirectoryService.ExistOrCreate(chapterExtractPath);
|
|
_directoryService.CopyFilesToDirectory(mangaFiles.Select(f => f.FilePath), chapterExtractPath, $"{chapterId}_");
|
|
break;
|
|
case MangaFormat.Archive:
|
|
case MangaFormat.Pdf:
|
|
_cacheService.ExtractChapterFiles(chapterExtractPath, mangaFiles.ToList());
|
|
var originalFiles = _directoryService.GetFilesWithExtension(chapterExtractPath,
|
|
Parser.Parser.ImageFileExtensions);
|
|
_directoryService.CopyFilesToDirectory(originalFiles, chapterExtractPath, $"{chapterId}_");
|
|
DirectoryService.DeleteFiles(originalFiles);
|
|
break;
|
|
case MangaFormat.Epub:
|
|
return BadRequest("Series is not in a valid format.");
|
|
default:
|
|
return BadRequest("Series is not in a valid format. Please rescan series and try again.");
|
|
}
|
|
|
|
var files = _directoryService.GetFilesWithExtension(chapterExtractPath, Parser.Parser.ImageFileExtensions);
|
|
// Filter out images that aren't in bookmarks
|
|
Array.Sort(files, _numericComparer);
|
|
totalFilePaths.AddRange(files.Where((t, i) => chapterPages.Contains(i)));
|
|
}
|
|
|
|
|
|
var (fileBytes, zipPath) = await _archiveService.CreateZipForDownload(totalFilePaths,
|
|
tempFolder);
|
|
DirectoryService.ClearAndDeleteDirectory(fullExtractPath);
|
|
return File(fileBytes, DefaultContentType, $"{series.Name} - Bookmarks.zip");
|
|
}
|
|
}
|
|
}
|