alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-16 04:30:24 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix build errors

Browse Source
This commit is contained in:
Bond_009
2026-06-15 18:52:20 +02:00
parent 9375f31bd3
commit f6bb086415
2 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MediaBrowser.Providers/Books/ComicBookInfo/ComicBookInfoProvider.cs
View File

@@ -49,24 +49,26 @@ public class ComicBookInfoProvider : IComicProvider
try
{
Stream stream = AsyncFile.OpenRead(path);
await using (stream.ConfigureAwait(false))
await using (var archive = await ZipArchive.CreateAsync(stream, ZipArchiveMode.Read, false, null, cancellationToken).ConfigureAwait(false))
{
if (archive.Comment is null)
var archive = await ZipArchive.CreateAsync(stream, ZipArchiveMode.Read, false, null, cancellationToken).ConfigureAwait(false);
await using (archive.ConfigureAwait(false))
{
_logger.LogInformation("missing ComicBookInfo in archive comment: {Path}", info.Path);
return new MetadataResult<Book> { HasMetadata = false };
}
if (archive.Comment is null)
{
_logger.LogInformation("missing ComicBookInfo in archive comment: {Path}", info.Path);
return new MetadataResult<Book> { HasMetadata = false };
}
var comicBookMetadata = JsonSerializer.Deserialize<ComicBookInfoFormat>(archive.Comment, JsonDefaults.Options);
if (comicBookMetadata is null)
{
_logger.LogError("ComicBookInfo deserialization failure: {Path}", info.Path);
return new MetadataResult<Book> { HasMetadata = false };
}
var comicBookMetadata = JsonSerializer.Deserialize<ComicBookInfoFormat>(archive.Comment, JsonDefaults.Options);
if (comicBookMetadata is null)
{
_logger.LogError("ComicBookInfo deserialization failure: {Path}", info.Path);
return new MetadataResult<Book> { HasMetadata = false };
}
return SaveMetadata(comicBookMetadata);
return SaveMetadata(comicBookMetadata);
}
}
}
catch (Exception ex)

34
MediaBrowser.Providers/Books/ComicImageProvider.cs
View File

@@ -9,6 +9,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
using SharpCompress.Archives;
@@ -44,7 +45,7 @@ public class ComicImageProvider : IDynamicImageProvider
if (_comicBookExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
{
return LoadCover(item);
return LoadCoverAsync(item, cancellationToken);
}
return Task.FromResult(new DynamicImageResponse { HasImage = false });
@@ -67,7 +68,8 @@ public class ComicImageProvider : IDynamicImageProvider
/// with no image if nothing is found.
/// </summary>
/// <param name="item">Item to check for covers.</param>
private async Task<DynamicImageResponse> LoadCover(BaseItem item)
/// <param name="cancellationToken">The cancellation token.</param>
private async Task<DynamicImageResponse> LoadCoverAsync(BaseItem item, CancellationToken cancellationToken)
{
var memoryStream = new MemoryStream();
@@ -75,14 +77,22 @@ public class ComicImageProvider : IDynamicImageProvider
{
ImageFormat imageFormat;
using (Stream stream = File.OpenRead(item.Path))
using (var archive = ArchiveFactory.Open(stream))
using (Stream stream = AsyncFile.OpenRead(item.Path))
{
// throw exception to log results if no cover is found
(var cover, imageFormat) = FindCoverEntryInArchive(archive) ?? throw new InvalidOperationException("no supported cover found");
var archive = await ArchiveFactory.OpenAsyncArchive(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
await using (archive.ConfigureAwait(false))
{
// throw exception to log results if no cover is found
(var cover, imageFormat) = await FindCoverEntryInArchiveAsync(archive).ConfigureAwait(false)
?? throw new InvalidOperationException("no supported cover found");
// copy the cover to memory stream
await cover.OpenEntryStream().CopyToAsync(memoryStream).ConfigureAwait(false);
// copy the cover to memory stream
var coverStream = await cover.OpenEntryStreamAsync(cancellationToken).ConfigureAwait(false);
await using (coverStream.ConfigureAwait(false))
{
await coverStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
}
}
}
// reset stream position after copying
@@ -102,7 +112,7 @@ public class ComicImageProvider : IDynamicImageProvider
/// </summary>
/// <param name="archive">The archive to search.</param>
/// <returns>The search result.</returns>
private (IArchiveEntry CoverEntry, ImageFormat ImageFormat)? FindCoverEntryInArchive(IArchive archive)
private async ValueTask<(IArchiveEntry CoverEntry, ImageFormat ImageFormat)?> FindCoverEntryInArchiveAsync(IAsyncArchive archive)
{
IArchiveEntry? cover;
@@ -110,7 +120,7 @@ public class ComicImageProvider : IDynamicImageProvider
// in many cases the cover will simply be the first image in the archive
foreach (var extension in _coverExtensions)
{
cover = archive.Entries.FirstOrDefault(e => e.Key == "cover" + extension);
cover = await archive.EntriesAsync.FirstOrDefaultAsync(e => e.Key == "cover" + extension).ConfigureAwait(false);
if (cover is not null)
{
@@ -120,7 +130,9 @@ public class ComicImageProvider : IDynamicImageProvider
}
}
cover = archive.Entries.OrderBy(x => x.Key).FirstOrDefault(x => _coverExtensions.Contains(Path.GetExtension(x.Key), StringComparison.OrdinalIgnoreCase));
cover = await archive.EntriesAsync.OrderBy(x => x.Key)
.FirstOrDefaultAsync(x => _coverExtensions.Contains(Path.GetExtension(x.Key), StringComparison.OrdinalIgnoreCase))
.ConfigureAwait(false);
if (cover is not null)
{