mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-30 19:54:14 -04:00
First pass for supporting lazy loading and not using base64 strings for loading images in UI.
This commit is contained in:
parent
fea1f3d152
commit
33515ad865
79
API/Controllers/ImageController.cs
Normal file
79
API/Controllers/ImageController.cs
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using API.DTOs;
|
||||||
|
using API.Interfaces;
|
||||||
|
using API.Interfaces.Services;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace API.Controllers
|
||||||
|
{
|
||||||
|
public class ImageController : BaseApiController
|
||||||
|
{
|
||||||
|
private readonly IDirectoryService _directoryService;
|
||||||
|
private readonly ICacheService _cacheService;
|
||||||
|
private readonly ILogger<ImageController> _logger;
|
||||||
|
private readonly IUnitOfWork _unitOfWork;
|
||||||
|
|
||||||
|
public ImageController(IDirectoryService directoryService, ICacheService cacheService,
|
||||||
|
ILogger<ImageController> logger, IUnitOfWork unitOfWork)
|
||||||
|
{
|
||||||
|
_directoryService = directoryService;
|
||||||
|
_cacheService = cacheService;
|
||||||
|
_logger = logger;
|
||||||
|
_unitOfWork = unitOfWork;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("chapter-cover")]
|
||||||
|
public async Task<ActionResult> GetChapterCoverImage(int chapterId)
|
||||||
|
{
|
||||||
|
// TODO: Write custom methods to just get the byte[] as fast as possible
|
||||||
|
var chapter = await _unitOfWork.VolumeRepository.GetChapterAsync(chapterId);
|
||||||
|
var content = chapter.CoverImage;
|
||||||
|
var format = "jpeg"; //Path.GetExtension("jpeg").Replace(".", "");
|
||||||
|
|
||||||
|
// Calculates SHA1 Hash for byte[]
|
||||||
|
using var sha1 = new System.Security.Cryptography.SHA1CryptoServiceProvider();
|
||||||
|
Response.Headers.Add("ETag", string.Concat(sha1.ComputeHash(content).Select(x => x.ToString("X2"))));
|
||||||
|
Response.Headers.Add("Cache-Control", "private");
|
||||||
|
|
||||||
|
return File(content, "image/" + format);
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("volume-cover")]
|
||||||
|
public async Task<ActionResult> GetVolumeCoverImage(int volumeId)
|
||||||
|
{
|
||||||
|
var volume = await _unitOfWork.SeriesRepository.GetVolumeAsync(volumeId);
|
||||||
|
var content = volume.CoverImage;
|
||||||
|
var format = "jpeg"; //Path.GetExtension("jpeg").Replace(".", "");
|
||||||
|
|
||||||
|
// Calculates SHA1 Hash for byte[]
|
||||||
|
using var sha1 = new System.Security.Cryptography.SHA1CryptoServiceProvider();
|
||||||
|
Response.Headers.Add("ETag", string.Concat(sha1.ComputeHash(content).Select(x => x.ToString("X2"))));
|
||||||
|
Response.Headers.Add("Cache-Control", "private");
|
||||||
|
|
||||||
|
return File(content, "image/" + format);
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("series-cover")]
|
||||||
|
public async Task<ActionResult> GetSeriesCoverImage(int seriesId)
|
||||||
|
{
|
||||||
|
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId);
|
||||||
|
var content = series.CoverImage;
|
||||||
|
var format = "jpeg"; //Path.GetExtension("jpeg").Replace(".", "");
|
||||||
|
|
||||||
|
if (content.Length == 0)
|
||||||
|
{
|
||||||
|
// How do I handle?
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculates SHA1 Hash for byte[]
|
||||||
|
using var sha1 = new System.Security.Cryptography.SHA1CryptoServiceProvider();
|
||||||
|
Response.Headers.Add("ETag", string.Concat(sha1.ComputeHash(content).Select(x => x.ToString("X2"))));
|
||||||
|
Response.Headers.Add("Cache-Control", "private");
|
||||||
|
|
||||||
|
return File(content, "image/" + format);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -13,7 +13,7 @@ namespace API.DTOs
|
|||||||
/// Smallest number of the Range.
|
/// Smallest number of the Range.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Number { get; set; }
|
public string Number { get; set; }
|
||||||
public byte[] CoverImage { get; set; }
|
//public byte[] CoverImage { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Total number of pages in all MangaFiles
|
/// Total number of pages in all MangaFiles
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -5,7 +5,7 @@ namespace API.DTOs
|
|||||||
public class MangaFileDto
|
public class MangaFileDto
|
||||||
{
|
{
|
||||||
public string FilePath { get; set; }
|
public string FilePath { get; set; }
|
||||||
public int NumberOfPages { get; set; }
|
public int NumberOfPages { get; set; } // TODO: Refactor to Pages
|
||||||
public MangaFormat Format { get; set; }
|
public MangaFormat Format { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ namespace API.DTOs
|
|||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public int Number { get; set; }
|
public int Number { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public byte[] CoverImage { get; set; }
|
//public byte[] CoverImage { get; set; }
|
||||||
public int Pages { get; set; }
|
public int Pages { get; set; }
|
||||||
public int PagesRead { get; set; }
|
public int PagesRead { get; set; }
|
||||||
public DateTime LastModified { get; set; }
|
public DateTime LastModified { get; set; }
|
||||||
|
@ -143,6 +143,16 @@ namespace API.Data
|
|||||||
.SingleOrDefaultAsync(vol => vol.Id == volumeId);
|
.SingleOrDefaultAsync(vol => vol.Id == volumeId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<VolumeDto> GetVolumeDtoAsync(int volumeId)
|
||||||
|
{
|
||||||
|
return await _context.Volume
|
||||||
|
.Where(vol => vol.Id == volumeId)
|
||||||
|
.AsNoTracking()
|
||||||
|
.ProjectTo<VolumeDto>(_mapper.ConfigurationProvider)
|
||||||
|
.SingleAsync();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<VolumeDto> GetVolumeDtoAsync(int volumeId, int userId)
|
public async Task<VolumeDto> GetVolumeDtoAsync(int volumeId, int userId)
|
||||||
{
|
{
|
||||||
var volume = await _context.Volume
|
var volume = await _context.Volume
|
||||||
|
@ -34,6 +34,12 @@ namespace API.Interfaces
|
|||||||
Task<SeriesDto> GetSeriesDtoByIdAsync(int seriesId, int userId);
|
Task<SeriesDto> GetSeriesDtoByIdAsync(int seriesId, int userId);
|
||||||
Task<Volume> GetVolumeAsync(int volumeId);
|
Task<Volume> GetVolumeAsync(int volumeId);
|
||||||
Task<VolumeDto> GetVolumeDtoAsync(int volumeId, int userId);
|
Task<VolumeDto> GetVolumeDtoAsync(int volumeId, int userId);
|
||||||
|
/// <summary>
|
||||||
|
/// A fast lookup of just the volume information with no tracking.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="volumeId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<VolumeDto> GetVolumeDtoAsync(int volumeId);
|
||||||
Task<IEnumerable<Volume>> GetVolumesForSeriesAsync(int[] seriesIds);
|
Task<IEnumerable<Volume>> GetVolumesForSeriesAsync(int[] seriesIds);
|
||||||
Task<bool> DeleteSeriesAsync(int seriesId);
|
Task<bool> DeleteSeriesAsync(int seriesId);
|
||||||
Task<Volume> GetVolumeByIdAsync(int volumeId);
|
Task<Volume> GetVolumeByIdAsync(int volumeId);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user