Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-24 02:02:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement blurhash

Browse Source
This commit is contained in:
Zoe Roux 2023-08-07 01:01:16 +09:00
parent a6c8105d8c
commit 3cdfc91c93
No known key found for this signature in database
8 changed files with 62 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back/src/Kyoo.Abstractions/Models/Resources/Interfaces/IThumbnails.cs
View File

@ -29,7 +29,7 @@ namespace Kyoo.Abstractions.Models
public interface IThumbnails
{
/// <summary>
/// A poster is a 9/16 format image with the cover of the resource.
/// A poster is a 2/3 format image with the cover of the resource.
/// </summary>
public Image? Poster { get; set; }
@ -82,6 +82,12 @@ namespace Kyoo.Abstractions.Models
return base.ConvertFrom(context, culture, value)!;
return new Image(source);
}
/// <inheritdoc />
public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType)
{
return false;
}
}
}

18
back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs
View File

@ -341,8 +341,15 @@ namespace Kyoo.Core.Controllers
if (obj == null)
throw new ArgumentNullException(nameof(obj));
await Validate(obj);
// if (obj is IThumbnails thumbs)
// await _thumbnailsManager.DownloadImages(thumbs);
if (obj is IThumbnails thumbs)
{
if (thumbs.Poster != null)
Database.Entry(thumbs).Reference(x => x.Poster).TargetEntry.State = EntityState.Added;
if (thumbs.Thumbnail != null)
Database.Entry(thumbs).Reference(x => x.Thumbnail).TargetEntry.State = EntityState.Added;
if (thumbs.Logo != null)
Database.Entry(thumbs).Reference(x => x.Logo).TargetEntry.State = EntityState.Added;
}
return obj;
}
@ -427,6 +434,13 @@ namespace Kyoo.Core.Controllers
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
protected virtual Task EditRelations(T resource, T changed, bool resetOld)
{
if (resource is IThumbnails thumbs)
{
// FIXME: I think this throws if poster is set to null.
Database.Entry(thumbs).Reference(x => x.Poster).TargetEntry.State = EntityState.Modified;
Database.Entry(thumbs).Reference(x => x.Thumbnail).TargetEntry.State = EntityState.Modified;
Database.Entry(thumbs).Reference(x => x.Logo).TargetEntry.State = EntityState.Modified;
}
return Validate(resource);
}

2
back/src/Kyoo.Core/Controllers/Repositories/UserRepository.cs
View File

@ -66,6 +66,8 @@ namespace Kyoo.Core.Controllers
{
await base.Create(obj);
_database.Entry(obj).State = EntityState.Added;
if (obj.Logo != null)
_database.Entry(obj).Reference(x => x.Logo).TargetEntry.State = EntityState.Added;
await _database.SaveChangesAsync(() => Get(obj.Slug));
OnResourceCreated(obj);
return obj;

25
back/src/Kyoo.Core/Controllers/ThumbnailsManager.cs
View File

@ -20,7 +20,7 @@ using System;
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
using BlurHashSharp.SkiaSharp;
using Blurhash.SkiaSharp;
using Kyoo.Abstractions.Controllers;
using Kyoo.Abstractions.Models;
using Microsoft.Extensions.Logging;
@ -62,28 +62,33 @@ namespace Kyoo.Core.Controllers
await reader.CopyToAsync(file);
}
private async Task _DownloadImage(string? url, string localPath, string what)
private async Task _DownloadImage(Image? image, string localPath, string what)
{
if (url == null)
if (image == null)
return;
try
{
_logger.LogInformation("Downloading image {What}", what);
HttpClient client = _clientFactory.CreateClient();
HttpResponseMessage response = await client.GetAsync(url);
HttpResponseMessage response = await client.GetAsync(image.Source);
response.EnsureSuccessStatusCode();
await using Stream reader = await response.Content.ReadAsStreamAsync();
SKBitmap bitmap = SKBitmap.Decode(reader);
using SKCodec codec = SKCodec.Create(reader);
SKImageInfo info = codec.Info;
info.ColorType = SKColorType.Rgba8888;
SKBitmap bitmap = SKBitmap.Decode(codec, info);
bitmap.Resize(new SKSizeI(bitmap.Width, bitmap.Height), SKFilterQuality.High);
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.High.ToString().ToLowerInvariant()}.jpg");
bitmap.Resize(new SKSizeI(bitmap.Width, bitmap.Height), SKFilterQuality.Medium);
bitmap.Resize(new SKSizeI((int)(bitmap.Width / 1.5), (int)(bitmap.Height / 1.5)), SKFilterQuality.Medium);
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.Medium.ToString().ToLowerInvariant()}.jpg");
bitmap.Resize(new SKSizeI(bitmap.Width, bitmap.Height), SKFilterQuality.Low);
bitmap.Resize(new SKSizeI(bitmap.Width / 2, bitmap.Height / 2), SKFilterQuality.Low);
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.Low.ToString().ToLowerInvariant()}.jpg");
image.Blurhash = Blurhasher.Encode(bitmap, 4, 3);
}
catch (Exception ex)
{
@ -99,9 +104,9 @@ namespace Kyoo.Core.Controllers
throw new ArgumentNullException(nameof(item));
string name = item is IResource res ? res.Slug : "???";
await _DownloadImage(item.Poster?.Source, _GetBaseImagePath(item, "poster"), $"The poster of {name}");
await _DownloadImage(item.Thumbnail?.Source, _GetBaseImagePath(item, "thumbnail"), $"The poster of {name}");
await _DownloadImage(item.Logo?.Source, _GetBaseImagePath(item, "logo"), $"The poster of {name}");
await _DownloadImage(item.Poster, _GetBaseImagePath(item, "poster"), $"The poster of {name}");
await _DownloadImage(item.Thumbnail, _GetBaseImagePath(item, "thumbnail"), $"The poster of {name}");
await _DownloadImage(item.Logo, _GetBaseImagePath(item, "logo"), $"The poster of {name}");
}
private static string _GetBaseImagePath<T>(T item, string image)

2
back/src/Kyoo.Core/Kyoo.Core.csproj
View File

@ -6,7 +6,7 @@
<ItemGroup>
<PackageReference Include="AspNetCore.Proxy" Version="4.4.0" />
<PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.3.0" />
<PackageReference Include="Blurhash.SkiaSharp" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

6
back/src/Kyoo.Core/Views/Helper/CrudThumbsApi.cs
View File

@ -135,10 +135,8 @@ namespace Kyoo.Core.Api
/// <inheritdoc/>
public override async Task<ActionResult<T>> Create([FromBody] T resource)
{
// TODO: Remove this method and use a websocket API to do that.
ActionResult<T> ret = await base.Create(resource);
await _thumbs.DownloadImages(ret.Value);
return ret;
await _thumbs.DownloadImages(resource);
return await base.Create(resource);
}
}
}

46
back/src/Kyoo.Core/Views/Helper/Serializers/ImageConvertor.cs
View File

@ -1,46 +0,0 @@
// Kyoo - A portable and vast media library solution.
// Copyright (c) Kyoo.
//
// See AUTHORS.md and LICENSE file in the project root for full license information.
//
// Kyoo is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// any later version.
//
// Kyoo is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using Kyoo.Abstractions.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Kyoo.Core.Api
{
public class ImageConverter : JsonConverter<Image>
{
/// <inheritdoc />
public override void WriteJson(JsonWriter writer, Image value, JsonSerializer serializer)
{
JObject obj = JObject.FromObject(value, serializer);
obj.WriteTo(writer);
}
/// <inheritdoc />
public override Image ReadJson(JsonReader reader,
Type objectType,
Image existingValue,
bool hasExistingValue,
JsonSerializer serializer)
{
throw new NotImplementedException();
}
}
}

39
back/src/Kyoo.Core/Views/Helper/Serializers/JsonSerializerContract.cs
View File

@ -78,29 +78,28 @@ namespace Kyoo.Core.Api
protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
{
IList<JsonProperty> properties = base.CreateProperties(type, memberSerialization);
if (!type.IsAssignableTo(typeof(Image)))
return properties;
// if (!type.IsAssignableTo(typeof(Image)))
// return properties;
// foreach ((int id, string image) in Images.ImageName)
// {
// properties.Add(new JsonProperty
// {
// DeclaringType = type,
// PropertyName = image.ToLower(),
// UnderlyingName = image,
// PropertyType = typeof(string),
// Readable = true,
// Writable = false,
// ItemIsReference = false,
// TypeNameHandling = TypeNameHandling.None,
// ShouldSerialize = x =>
// {
// IThumbnails thumb = (IThumbnails)x;
// return thumb?.Images?.ContainsKey(id) == true;
// },
// ValueProvider = new ThumbnailProvider(id)
// });
// properties.Add(new JsonProperty
// {
// DeclaringType = type,
// PropertyName = image.ToLower(),
// UnderlyingName = image,
// PropertyType = typeof(string),
// Readable = true,
// Writable = false,
// ItemIsReference = false,
// TypeNameHandling = TypeNameHandling.None,
// ShouldSerialize = x =>
// {
// IThumbnails thumb = (IThumbnails)x;
// return thumb?.Images?.ContainsKey(id) == true;
// },
// ValueProvider = new ThumbnailProvider(id)
// });
// }
return properties;
}