diff --git a/WebImageViewer/Class/Unified/Renderers/UnifiedHtmlRenderer.cs b/WebImageViewer/Class/Unified/Renderers/UnifiedHtmlRenderer.cs index addb71b..3eceea3 100644 --- a/WebImageViewer/Class/Unified/Renderers/UnifiedHtmlRenderer.cs +++ b/WebImageViewer/Class/Unified/Renderers/UnifiedHtmlRenderer.cs @@ -1490,6 +1490,10 @@ public static class UnifiedHtmlRenderer
+ + + ZIP保存 + サムネイル一覧 @@ -2403,6 +2407,10 @@ public static class UnifiedHtmlRenderer
+ + + ZIP保存 + 📖 ビューアーを開く diff --git a/WebImageViewer/Program.cs b/WebImageViewer/Program.cs index 8fcfd30..2aa4796 100644 --- a/WebImageViewer/Program.cs +++ b/WebImageViewer/Program.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.HttpOverrides; +using System.IO.Compression; +using Microsoft.AspNetCore.HttpOverrides; using WebImageViewer.Class.Legacy; using WebImageViewer.Class.Unified; using WebImageViewer.Class.Unified.Common; @@ -109,6 +110,109 @@ app.MapGet("/thumbnails", async (string? url, UnifiedViewerService viewerService return Results.Content(UnifiedHtmlRenderer.RenderThumbnailGridPage(result.Gallery), "text/html; charset=utf-8"); }); +// ========================================== +// 全ページZIP一括ダウンロードAPI +// ========================================== +app.MapGet("/api/download-zip", async ( + string url, + UnifiedViewerService viewerService, + UnifiedHttpHelper httpHelper, + HttpContext httpContext, + ILoggerFactory loggerFactory, + CancellationToken ct) => +{ + if (string.IsNullOrWhiteSpace(url)) + { + return Results.BadRequest("URL is required"); + } + + var logger = loggerFactory.CreateLogger("ZipDownload"); + var result = await viewerService.ResolveAsync(url, null, null, ct); + if (!result.IsSuccess || result.Gallery == null || result.Gallery.Images.Count == 0) + { + return Results.NotFound(new { error = result.ErrorMessage ?? "ギャラリー画像を取得できませんでした。" }); + } + + var gallery = result.Gallery; + + // ファイル名として使用できない文字を除去 + var invalidChars = Path.GetInvalidFileNameChars(); + var cleanTitle = string.Concat(gallery.Title.Select(c => invalidChars.Contains(c) ? '_' : c)).Trim(); + if (string.IsNullOrWhiteSpace(cleanTitle)) cleanTitle = "gallery"; + var zipFileName = $"{cleanTitle}.zip"; + + httpContext.Response.ContentType = "application/zip"; + httpContext.Response.Headers.ContentDisposition = $"attachment; filename=\"{Uri.EscapeDataString(zipFileName)}\"; filename*=UTF-8''{Uri.EscapeDataString(zipFileName)}"; + + // サーバーメモリを圧迫しないよう一時ファイルを使用して安全にZIPストリーミング生成 + var tempZipPath = Path.GetTempFileName(); + + try + { + using (var fileStream = new FileStream(tempZipPath, FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.DeleteOnClose)) + { + using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true)) + { + // 最大4並列で各ページの画像データを取得 + using var semaphore = new SemaphoreSlim(4); + var downloadTasks = gallery.Images.Select(async img => + { + await semaphore.WaitAsync(ct); + try + { + var (data, contentType) = await FetchImageBytesForZipAsync(img.ImageUrl, gallery.SourceUrl, httpHelper, ct); + return (img.PageNumber, img.ImageUrl, Data: data, ContentType: contentType); + } + finally + { + semaphore.Release(); + } + }).ToList(); + + var downloadResults = await Task.WhenAll(downloadTasks); + + foreach (var item in downloadResults.OrderBy(r => r.PageNumber)) + { + if (item.Data == null || item.Data.Length == 0) + { + logger.LogWarning("ページ {Page} の画像ダウンロードをスキップしました (データなし)", item.PageNumber); + continue; + } + + var ext = DetermineImageExtensionForZip(item.ContentType, item.ImageUrl); + var entryName = $"{item.PageNumber:D3}{ext}"; + var entry = archive.CreateEntry(entryName, CompressionLevel.Fastest); + + using var entryStream = entry.Open(); + await entryStream.WriteAsync(item.Data, ct); + } + } + + fileStream.Position = 0; + await fileStream.CopyToAsync(httpContext.Response.Body, ct); + } + + return Results.Empty; + } + catch (OperationCanceledException) + { + logger.LogInformation("ZIPダウンロードがクライアントによりキャンセルされました: {Url}", url); + return Results.Empty; + } + catch (Exception ex) + { + logger.LogError(ex, "ZIPアーカイブ生成エラー: {Url}", url); + return Results.Problem(detail: ex.Message, statusCode: 500); + } + finally + { + if (File.Exists(tempZipPath)) + { + try { File.Delete(tempZipPath); } catch { } + } + } +}); + // ========================================== // 画像プロキシAPI (Referer制限回避・高速キャッシュ配信) // ========================================== @@ -165,4 +269,67 @@ app.MapMethods("/api/proxy-embed-req", new[] { "GET", "POST", "HEAD" }, async (s // ========================================== app.MapLegacyEndpoints(); +// ========================================== +// ZIPダウンロード用画像バイナリ取得ヘルパー +// ========================================== +static async Task<(byte[]? Data, string? ContentType)> FetchImageBytesForZipAsync( + string imageUrl, + string defaultReferer, + UnifiedHttpHelper httpHelper, + CancellationToken ct) +{ + try + { + string targetUrl = imageUrl; + string? targetReferer = defaultReferer; + + // /api/proxy-image?... 形式の場合は内部パラメータを展開して直接取得 + if (imageUrl.StartsWith("/api/proxy-image", StringComparison.OrdinalIgnoreCase)) + { + var qIndex = imageUrl.IndexOf('?'); + if (qIndex >= 0) + { + var qs = Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(imageUrl.Substring(qIndex)); + if (qs.TryGetValue("url", out var u) && !string.IsNullOrEmpty(u)) + { + targetUrl = u.ToString(); + } + if (qs.TryGetValue("referer", out var r) && !string.IsNullOrEmpty(r)) + { + targetReferer = r.ToString(); + } + } + } + + var (data, contentType) = await httpHelper.GetBinaryAsync(targetUrl, targetReferer, ct); + return (data, contentType); + } + catch + { + return (null, null); + } +} + +static string DetermineImageExtensionForZip(string? contentType, string imageUrl) +{ + if (!string.IsNullOrWhiteSpace(contentType)) + { + var ctLower = contentType.ToLowerInvariant(); + if (ctLower.Contains("png")) return ".png"; + if (ctLower.Contains("webp")) return ".webp"; + if (ctLower.Contains("gif")) return ".gif"; + if (ctLower.Contains("jpeg") || ctLower.Contains("jpg")) return ".jpg"; + if (ctLower.Contains("avif")) return ".avif"; + } + + var cleanUrl = imageUrl.Split('?')[0]; + var ext = Path.GetExtension(cleanUrl); + if (!string.IsNullOrWhiteSpace(ext) && ext.Length <= 5) + { + return ext.ToLowerInvariant(); + } + + return ".jpg"; +} + app.Run();