mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Fixed an issue from perf tuning where I forgot to send Pages to frontend, breaking reader. * Built out continuous reading for webtoon reader. Still has some issues with triggering. * Refactored GetUserByUsernameAsync to have a new flavor and allow the caller to pass in bitwise flags for what to include. This has a get by username or id variant. Code is much cleaner and snappier as we avoid many extra joins when not needed. * Cleanup old code from UserRepository.cs * Refactored OPDS to use faster API lookups for User * Refactored more code to be cleaner and faster. * Refactored GetNext/Prev ChapterIds to ReaderService. * Refactored Repository methods to their correct entity repos. * Refactored DTOs and overall cleanup of the code. * Added ability to press 'b' to bookmark a page * On hitting last page, save progress forcing last page to be read. Adjusted logic for the top and bottom spacers for triggering next/prev chapter load * When at top or moving between chapters, scrolling down then up will now trigger page load. Show a toastr to inform the user of a change in chapter (it can be really fast to switch) * Cleaned up scroll code * Fixed an issue where loading a chapter with last page bookmarked, we'd load lastpage - 1 * Fixed last page of webtoon reader not being resumed on loading said chapter due to a difference in how max page is handled between infinite scroller and manga reader. * Removed some comments * Book reader shouldn't look at left/right tap to paginate elems for position bookmarking. Missed a few areas for saving while in incognito mode * Added a benchmark to test out a sort code * Updated the read status on reading list to use same style as other places * Refactored GetNextChapterId to bring the average response time from 1.2 seconds to 400ms. * Added a filter to add to list when there are more than 5 reading lists * Added download reading list (will be removed, just saving for later). Fixes around styling on reading lists * Removed ability to download reading lists * Tweaked the logic for infinite scroller to be much smoother loading next/prev chapter. Added a bug marker for a concurrency bug. * Updated the top spacer so that when you hit the top, you stay at the page height and can now just scroll up. * Got the logic for scrolling up. Now just need the CSS then cont infinite scroller will be working * More polishing on infinite scroller * Removed IsSpecial on volumeDto, which is not used anywhere. * Cont Reading inf scroller edition is done. * Code smells and fixed package.json explore script
192 lines
8.6 KiB
C#
192 lines
8.6 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;
|
|
|
|
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 IDownloadService _downloadService;
|
|
private readonly NumericComparer _numericComparer;
|
|
private const string DefaultContentType = "application/octet-stream";
|
|
|
|
public DownloadController(IUnitOfWork unitOfWork, IArchiveService archiveService, IDirectoryService directoryService, ICacheService cacheService, IDownloadService downloadService)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
_archiveService = archiveService;
|
|
_directoryService = directoryService;
|
|
_cacheService = cacheService;
|
|
_downloadService = downloadService;
|
|
_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.ChapterRepository.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, _) = 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 (bytes, contentType, fileDownloadName) = await _downloadService.GetFirstFileDownload(files);
|
|
return File(bytes, contentType, fileDownloadName);
|
|
}
|
|
|
|
[HttpGet("chapter")]
|
|
public async Task<ActionResult> DownloadChapter(int chapterId)
|
|
{
|
|
var files = await _unitOfWork.ChapterRepository.GetFilesForChapterAsync(chapterId);
|
|
var chapter = await _unitOfWork.ChapterRepository.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, _) = 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, _) = 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.ChapterRepository.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((_, i) => chapterPages.Contains(i)));
|
|
}
|
|
|
|
|
|
var (fileBytes, _) = await _archiveService.CreateZipForDownload(totalFilePaths,
|
|
tempFolder);
|
|
DirectoryService.ClearAndDeleteDirectory(fullExtractPath);
|
|
return File(fileBytes, DefaultContentType, $"{series.Name} - Bookmarks.zip");
|
|
}
|
|
}
|
|
}
|