From 27e60dca365ec6adf629fd1a0eb43d0f8b2c9e62 Mon Sep 17 00:00:00 2001 From: "KOUJIRI-WIN11\\koujiri" Date: Thu, 3 Sep 2026 14:44:43 +0900 Subject: [PATCH] =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E5=85=B1=E9=80=9A?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rss-generator/Class/CmnUtil.cs | 4 ++++ rss-generator/Class/RSS/Pixiv/pixiv_common.cs | 1 - rss-generator/Class/RSS/aurahentai.cs | 1 - .../Class/RSS/e_hentai/e_hentai_ai.cs | 1 - .../Class/RSS/e_hentai/e_hentai_non_ai.cs | 1 - .../Class/RSS/hitomi_la/index_japanese.cs | 1 - rss-generator/Class/RSS/mangalear.cs | 1 - rss-generator/Program.cs | 19 ++++++++++++++----- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/rss-generator/Class/CmnUtil.cs b/rss-generator/Class/CmnUtil.cs index 426ab00..207d134 100644 --- a/rss-generator/Class/CmnUtil.cs +++ b/rss-generator/Class/CmnUtil.cs @@ -139,6 +139,10 @@ public class CmnUtil // RSS 2.0 形式でファイルに直接出力 var formatter = new Rss20FeedFormatter(feed); formatter.WriteTo(xmlWriter); + + int count = feed.Items?.Count() ?? 0; + string displayFileName = System.IO.Path.GetFileName(filePath); + LogManager.AddLog($"[情報] {displayFileName} を正常に出力しました (記事数: {count})"); } /// diff --git a/rss-generator/Class/RSS/Pixiv/pixiv_common.cs b/rss-generator/Class/RSS/Pixiv/pixiv_common.cs index c226a31..1617e88 100644 --- a/rss-generator/Class/RSS/Pixiv/pixiv_common.cs +++ b/rss-generator/Class/RSS/Pixiv/pixiv_common.cs @@ -454,7 +454,6 @@ internal static class pixiv_common ); CmnUtil.ExportXMLFile(fileName, feed); - AddLog($"[情報] {fileName} を正常に出力しました (作品数: {items.Count})"); } #region Pixiv API レスポンス用データモデル diff --git a/rss-generator/Class/RSS/aurahentai.cs b/rss-generator/Class/RSS/aurahentai.cs index b765e37..19df3c3 100644 --- a/rss-generator/Class/RSS/aurahentai.cs +++ b/rss-generator/Class/RSS/aurahentai.cs @@ -65,7 +65,6 @@ internal class aurahentai feed.Items = uniqueItems; CmnUtil.ExportXMLFile("aurahentai.xml", feed); - LogManager.AddLog($"[情報] aurahentai.xml を正常に出力しました (記事数: {uniqueItems.Count})"); } catch (Exception ex) { diff --git a/rss-generator/Class/RSS/e_hentai/e_hentai_ai.cs b/rss-generator/Class/RSS/e_hentai/e_hentai_ai.cs index fe6e78f..833b95d 100644 --- a/rss-generator/Class/RSS/e_hentai/e_hentai_ai.cs +++ b/rss-generator/Class/RSS/e_hentai/e_hentai_ai.cs @@ -35,7 +35,6 @@ internal class e_hentai_ai // XML ファイルとして出力 CmnUtil.ExportXMLFile("e_hentai_ai.xml", feed); - AddLog($"[情報] e_hentai_ai.xml を正常に出力しました (作品数: {items.Count})"); } catch (Exception ex) { diff --git a/rss-generator/Class/RSS/e_hentai/e_hentai_non_ai.cs b/rss-generator/Class/RSS/e_hentai/e_hentai_non_ai.cs index 7b7960e..109e40a 100644 --- a/rss-generator/Class/RSS/e_hentai/e_hentai_non_ai.cs +++ b/rss-generator/Class/RSS/e_hentai/e_hentai_non_ai.cs @@ -35,7 +35,6 @@ internal class e_hentai_non_ai // XML ファイルとして出力 CmnUtil.ExportXMLFile("e_hentai_non_ai.xml", feed); - AddLog($"[情報] e_hentai_non_ai.xml を正常に出力しました (作品数: {items.Count})"); } catch (Exception ex) { diff --git a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs index 69e77f0..9a05045 100644 --- a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs +++ b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs @@ -61,7 +61,6 @@ internal class index_japanese feed.Items = uniqueItems; CmnUtil.ExportXMLFile("hitomi-japanese.xml", feed); - LogManager.AddLog($"[情報] hitomi-japanese.xml を正常に出力しました (記事数: {uniqueItems.Count})"); } catch (Exception ex) { diff --git a/rss-generator/Class/RSS/mangalear.cs b/rss-generator/Class/RSS/mangalear.cs index 45fb219..784988e 100644 --- a/rss-generator/Class/RSS/mangalear.cs +++ b/rss-generator/Class/RSS/mangalear.cs @@ -190,7 +190,6 @@ internal class mangalear // 5. XML ファイルとして出力 CmnUtil.ExportXMLFile("mangalear.xml", mergedFeed); - AddLog($"[情報] mangalear.xml を正常に出力しました (記事数: {simplifiedItems.Length})"); } catch (Exception ex) { diff --git a/rss-generator/Program.cs b/rss-generator/Program.cs index 0302a48..4c36ef8 100644 --- a/rss-generator/Program.cs +++ b/rss-generator/Program.cs @@ -59,8 +59,9 @@ while (true) #endif // 指定時刻になったら処理を実行 - Stopwatch sw = new Stopwatch(); - sw.Restart(); + Stopwatch totalSw = Stopwatch.StartNew(); + Stopwatch sw = Stopwatch.StartNew(); + LogManager.AddLog("[情報] 全フィードの取得処理を開始します"); try { using var client = httpClientFactory.CreateClient("webClient"); @@ -81,7 +82,10 @@ while (true) } #if DEBUG tasks.Add(FlareSolverrFeedManager.CreateAllRSSAsync(client)); - //tasks.Add(aurahentai.CreateRSSAsync(client)); + tasks.Add(pixiv_non_r18_non_ai.CreateRSSAsync(client)); + tasks.Add(pixiv_non_r18_ai.CreateRSSAsync(client)); + tasks.Add(pixiv_r18_non_ai.CreateRSSAsync(client)); + tasks.Add(pixiv_r18_ai.CreateRSSAsync(client)); #else tasks.Add(YouTubeFeedManager.CreateRSSAsync(client)); @@ -105,12 +109,14 @@ while (true) await Task.WhenAll(tasks); sw.Stop(); - LogManager.AddLog($"[情報] RSS生成完了 実行時間:{sw.Elapsed.TotalSeconds:0.################}秒"); + LogManager.AddLog($"[情報] RSS生成完了 実行時間:{sw.Elapsed.TotalSeconds:0.##}秒"); sw.Restart(); // /bin/bash /usr/local/bin/update_rss.sh #if DEBUG sw.Stop(); + totalSw.Stop(); + LogManager.AddLog($"[情報] 全処理完了 トータル実行時間:{totalSw.Elapsed.TotalSeconds:0.##}秒"); LogManager.AddLog($"[情報] デバッグ完了"); await LogManager.FlushAndCloseAsync(); @@ -120,7 +126,10 @@ while (true) await CmnUtil.RunCommandAsync("/bin/bash", "/usr/local/bin/update_rss.sh", ""); sw.Stop(); - LogManager.AddLog($"[情報] FreshRSS 更新完了 実行時間:{sw.Elapsed.TotalSeconds:0.################}秒"); + LogManager.AddLog($"[情報] FreshRSS 更新完了 実行時間:{sw.Elapsed.TotalSeconds:0.##}秒"); + + totalSw.Stop(); + LogManager.AddLog($"[情報] 全処理完了 トータル実行時間:{totalSw.Elapsed.TotalSeconds:0.##}秒"); #endif }