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

Parse images from the scanner

Browse Source
This commit is contained in:
Zoe Roux 2023-08-06 13:17:35 +09:00
parent ca99421624
commit a6c8105d8c
No known key found for this signature in database
11 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/src/Directory.Build.props
View File

@ -46,7 +46,7 @@
<PropertyGroup Condition="$(CheckCodingStyle) == true">
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)../Kyoo.ruleset</CodeAnalysisRuleSet>
<NoWarn>1591</NoWarn>
<NoWarn>1591;1305</NoWarn>
<!-- <AnalysisMode>All</AnalysisMode> -->
</PropertyGroup>
</Project>

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

@ -16,7 +16,10 @@
// 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.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Globalization;
namespace Kyoo.Abstractions.Models
{
@ -42,6 +45,7 @@ namespace Kyoo.Abstractions.Models
public Image? Logo { get; set; }
}
[TypeConverter(typeof(ImageConvertor))]
public class Image
{
/// <summary>
@ -54,6 +58,31 @@ namespace Kyoo.Abstractions.Models
/// </summary>
[MaxLength(32)]
public string Blurhash { get; set; }
public Image(string source, string? blurhash = null)
{
Source = source;
Blurhash = blurhash ?? "00000000000000";
}
public class ImageConvertor : TypeConverter
{
/// <inheritdoc />
public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
{
if (sourceType == typeof(string))
return true;
return base.CanConvertFrom(context, sourceType);
}
/// <inheritdoc />
public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
{
if (value is not string source)
return base.ConvertFrom(context, culture, value)!;
return new Image(source);
}
}
}
/// <summary>
@ -64,7 +93,7 @@ namespace Kyoo.Abstractions.Models
/// <summary>
/// Small
/// </summary>
Small,
Low,
/// <summary>
/// Medium
@ -74,6 +103,6 @@ namespace Kyoo.Abstractions.Models
/// <summary>
/// Large
/// </summary>
Large,
High,
}
}

11
back/src/Kyoo.Abstractions/Models/Utils/Identifier.cs
View File

@ -23,7 +23,6 @@ using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using JetBrains.Annotations;
namespace Kyoo.Abstractions.Models.Utils
{
@ -43,7 +42,7 @@ namespace Kyoo.Abstractions.Models.Utils
/// <summary>
/// The slug of the resource or null if the id is specified.
/// </summary>
private readonly string _slug;
private readonly string? _slug;
/// <summary>
/// Create a new <see cref="Identifier"/> for the given id.
@ -183,7 +182,7 @@ namespace Kyoo.Abstractions.Models.Utils
{
return _id.HasValue
? _id.Value.ToString()
: _slug;
: _slug!;
}
/// <summary>
@ -192,7 +191,7 @@ namespace Kyoo.Abstractions.Models.Utils
public class IdentifierConvertor : TypeConverter
{
/// <inheritdoc />
public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
{
if (sourceType == typeof(int) || sourceType == typeof(string))
return true;
@ -200,12 +199,12 @@ namespace Kyoo.Abstractions.Models.Utils
}
/// <inheritdoc />
public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
{
if (value is int id)
return new Identifier(id);
if (value is not string slug)
return base.ConvertFrom(context, culture, value);
return base.ConvertFrom(context, culture, value)!;
return int.TryParse(slug, out id)
? new Identifier(id)
: new Identifier(slug);

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

@ -20,6 +20,7 @@ using System;
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
using BlurHashSharp.SkiaSharp;
using Kyoo.Abstractions.Controllers;
using Kyoo.Abstractions.Models;
using Microsoft.Extensions.Logging;
@ -76,13 +77,13 @@ namespace Kyoo.Core.Controllers
SKBitmap bitmap = SKBitmap.Decode(reader);
bitmap.Resize(new SKSizeI(bitmap.Width, bitmap.Height), SKFilterQuality.High);
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.Large.ToString().ToLowerInvariant()}.jpg");
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.High.ToString().ToLowerInvariant()}.jpg");
bitmap.Resize(new SKSizeI(bitmap.Width, bitmap.Height), SKFilterQuality.Medium);
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.Medium.ToString().ToLowerInvariant()}.jpg");
bitmap.Resize(new SKSizeI(bitmap.Width, bitmap.Height), SKFilterQuality.Low);
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.Small.ToString().ToLowerInvariant()}.jpg");
await _WriteTo(bitmap, $"{localPath}.{ImageQuality.Low.ToString().ToLowerInvariant()}.jpg");
}
catch (Exception ex)
{

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

@ -11,6 +11,7 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SkiaSharp" Version="2.88.3" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
</ItemGroup>
<ItemGroup>

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

@ -65,7 +65,7 @@ namespace Kyoo.Core.Api
);
if (resource == null)
return NotFound();
string path = _thumbs.GetImagePath(resource, image, quality ?? ImageQuality.Large);
string path = _thumbs.GetImagePath(resource, image, quality ?? ImageQuality.High);
if (path == null || !System.IO.File.Exists(path))
return NotFound();
return PhysicalFile(Path.GetFullPath(path), "image/jpeg", true);

4
scanner/providers/types/episode.py
View File

@ -40,9 +40,5 @@ class Episode:
return {
**asdict(self),
**asdict(self.translations[default_language]),
# "poster": next(iter(self.translations[default_language].posters), None),
# "thumbnail": next(iter(self.translations[default_language].thumbnails), None),
# "logo": next(iter(self.translations[default_language].logos), None),
"thumbnail": None,
"show": None,
}

6
scanner/providers/types/movie.py
View File

@ -50,9 +50,9 @@ class Movie:
return {
**asdict(self),
**asdict(self.translations[default_language]),
# "poster": next(iter(self.translations[default_language].posters), None),
# "thumbnail": next(iter(self.translations[default_language].thumbnails), None),
# "logo": next(iter(self.translations[default_language].logos), None),
"poster": next(iter(self.translations[default_language].posters), None),
"thumbnail": next(iter(self.translations[default_language].thumbnails), None),
"logo": next(iter(self.translations[default_language].logos), None),
"trailer": next(iter(self.translations[default_language].trailers), None),
"studio": next((x.to_kyoo() for x in self.studios), None),
"genres": [x.to_kyoo() for x in self.genres],

5
scanner/providers/types/season.py
View File

@ -30,7 +30,6 @@ class Season:
return {
**asdict(self),
**asdict(self.translations[default_language]),
# "poster": next(iter(self.translations[default_language].posters), None),
# "thumbnail": next(iter(self.translations[default_language].thumbnails), None),
# "logo": next(iter(self.translations[default_language].logos), None),
"poster": next(iter(self.translations[default_language].posters), None),
"thumbnail": next(iter(self.translations[default_language].thumbnails), None),
}

6
scanner/providers/types/show.py
View File

@ -54,9 +54,9 @@ class Show:
**asdict(self.translations[default_language]),
"studio": next((x.to_kyoo() for x in self.studios), None),
"seasons": None,
# "poster": next(iter(self.translations[default_language].posters), None),
# "thumbnail": next(iter(self.translations[default_language].thumbnails), None),
# "logo": next(iter(self.translations[default_language].logos), None),
"poster": next(iter(self.translations[default_language].posters), None),
"thumbnail": next(iter(self.translations[default_language].thumbnails), None),
"logo": next(iter(self.translations[default_language].logos), None),
"trailer": next(iter(self.translations[default_language].trailers), None),
"genres": [x.to_kyoo() for x in self.genres],
}

2
scanner/providers/types/studio.py
View File

@ -12,5 +12,5 @@ class Studio:
def to_kyoo(self):
return {
**asdict(self),
# "logo": next(iter(self.logos), None),
"logo": next(iter(self.logos), None),
}