glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-10-11 05:09:49 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix #468 failed downloads (Task cancelled) results in empty chapter archive
Some checks are pending
Docker Image CI / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
glax
2025-10-10 18:23:27 +02:00
parent f72fdf54f1
commit 3ff44339b5
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
API/Workers/MangaDownloadWorkers/DownloadChapterFromMangaconnectorWorker.cs
View File

@@ -102,18 +102,19 @@ public class DownloadChapterFromMangaconnectorWorker(MangaConnectorId<Chapter> c
{
try
{
if (DownloadImage(imageUrl) is not { } stream)
if (await mangaConnector.DownloadImage(imageUrl, CancellationToken) is not { } stream)
{
Log.Error($"Failed to download image: {imageUrl}");
return [];
}
else
images.Add(stream);
images.Add(await ProcessImage(stream, CancellationToken));
}
catch (Exception ex)
{
Log.Error(ex);
images.ForEach(i => i.Dispose());
return [];
}
}
@@ -186,7 +187,7 @@ public class DownloadChapterFromMangaconnectorWorker(MangaConnectorId<Chapter> c
};
private async Task<bool> AllDownloadsFinished() => (await StartNewChapterDownloadsWorker.GetMissingChapters(DbContext, CancellationToken)).Count == 0;
private Stream ProcessImage(Stream imageStream)
private async Task<Stream> ProcessImage(Stream imageStream, CancellationToken? cancellationToken = null)
{
Log.Debug("Processing image");
imageStream.Position = 0;
@@ -199,11 +200,11 @@ public class DownloadChapterFromMangaconnectorWorker(MangaConnectorId<Chapter> c
MemoryStream processedImage = new ();
try
{
using Image image = Image.Load(imageStream);
using Image image = await Image.LoadAsync(imageStream, cancellationToken ?? CancellationToken.None);
Log.Debug("Image loaded");
if (Tranga.Settings.BlackWhiteImages)
image.Mutate(i => i.ApplyProcessor(new AdaptiveThresholdProcessor()));
image.SaveAsJpeg(processedImage, new JpegEncoder()
await image.SaveAsJpegAsync(processedImage, new JpegEncoder()
{
Quality = Tranga.Settings.ImageCompression
});
@@ -225,7 +226,7 @@ public class DownloadChapterFromMangaconnectorWorker(MangaConnectorId<Chapter> c
{
Log.Error(e);
}
imageStream.CopyTo(processedImage);
await imageStream.CopyToAsync(processedImage);
processedImage.Position = 0;
return processedImage;
}
@@ -286,16 +287,5 @@ public class DownloadChapterFromMangaconnectorWorker(MangaConnectorId<Chapter> c
Log.Debug($"Copied cover from {fullCoverPath} to {newFilePath}");
}
private Stream? DownloadImage(string imageUrl)
{
HttpDownloadClient downloadClient = new();
HttpResponseMessage requestResult = downloadClient.MakeRequest(imageUrl, RequestType.MangaImage).Result;
if ((int)requestResult.StatusCode < 200 || (int)requestResult.StatusCode >= 300)
return null;
return ProcessImage(requestResult.Content.ReadAsStream());
}
public override string ToString() => $"{base.ToString()} {_mangaConnectorIdId}";
}