diff --git a/Kyoo.Common/Kyoo.Common.csproj b/Kyoo.Common/Kyoo.Common.csproj index c0e22521..21d71761 100644 --- a/Kyoo.Common/Kyoo.Common.csproj +++ b/Kyoo.Common/Kyoo.Common.csproj @@ -12,7 +12,7 @@ SDG GPL-3.0-or-later true - 1.0.24 + 1.0.25 true snupkg default diff --git a/Kyoo.Common/Models/Resources/ProviderID.cs b/Kyoo.Common/Models/Resources/ProviderID.cs index 6500f9f7..2d1ec3d1 100644 --- a/Kyoo.Common/Models/Resources/ProviderID.cs +++ b/Kyoo.Common/Models/Resources/ProviderID.cs @@ -9,7 +9,7 @@ namespace Kyoo.Models public string Slug { get; set; } public string Name { get; set; } [SerializeAs("{HOST}/api/providers/{Slug}/logo")] public string Logo { get; set; } - + [SerializeIgnore] public string LogoExtension { get; set; } [LoadableRelation] public virtual ICollection Libraries { get; set; } #if ENABLE_INTERNAL_LINKS diff --git a/Kyoo/Controllers/ThumbnailsManager.cs b/Kyoo/Controllers/ThumbnailsManager.cs index a9ca9d8b..1e64f613 100644 --- a/Kyoo/Controllers/ThumbnailsManager.cs +++ b/Kyoo/Controllers/ThumbnailsManager.cs @@ -142,16 +142,16 @@ namespace Kyoo.Controllers if (people == null) throw new ArgumentNullException(nameof(people)); string thumbPath = Path.GetFullPath(Path.Combine(_peoplePath, $"{people.Slug}.jpg")); - if (!thumbPath.StartsWith(_peoplePath)) - return Task.FromResult(null); - return Task.FromResult(thumbPath); + return Task.FromResult(thumbPath.StartsWith(_peoplePath) ? thumbPath : null); } public Task GetProviderLogo(ProviderID provider) { if (provider == null) throw new ArgumentNullException(nameof(provider)); - string thumbPath = Path.GetFullPath(Path.Combine(_providerPath, $"{provider.Slug}.png")); + // TODO add a image's type on the provider to allow svg here. + // TODO fix trailer display. + string thumbPath = Path.GetFullPath(Path.Combine(_providerPath, $"{provider.Slug}.{provider.LogoExtension}")); return Task.FromResult(thumbPath.StartsWith(_providerPath) ? thumbPath : null); } }