From 922e226b0a503ca2b8e15ea57932d5a9c96dfc63 Mon Sep 17 00:00:00 2001 From: "KOUJIRI-WIN11\\koujiri" Date: Mon, 7 Sep 2026 11:27:53 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8E=A5=E7=B6=9A=E5=85=88?= =?UTF-8?q?=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3=E5=88=A5=E3=81=8A=E3=82=88?= =?UTF-8?q?=E3=81=B3=E5=85=B1=E9=80=9A=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80?= =?UTF-8?q?=E3=81=B8=E3=81=AE=E3=82=AF=E3=83=A9=E3=82=B9=E5=86=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=81=A8=E5=8F=82=E7=85=A7=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 共通クラス(CmnDB, CmnDefine, CmnUtil, LogManager, FlareSolverrFeedManager)を Class/Common フォルダへ移動 - 各フィード生成クラスを接続先ドメインごとのフォルダ(YouTube, Pixiv, X, Danbooru, EHentai, HitomiLa, SpankBang, CiEn, MissAV, MissAV123, Momonga, AuraHentai, Javtwi, KimochiInfo, Mangalear, YahooBaseball)へ移動 - 旧 Class/RSS フォルダを廃止 - フォルダ構成に合わせて各クラスの名前空間(namespace)と using 参照を更新 - Program.cs の using および呼び出し参照を新しい名前空間に更新 - rss-generator.csproj の不要な Folder 要素をクリーンアップ --- .../Class/{RSS => AuraHentai}/aurahentai.cs | 3 ++- rss-generator/Class/{RSS => CiEn}/ci_en.cs | 5 ++-- rss-generator/Class/{ => Common}/CmnDB.cs | 4 +-- rss-generator/Class/{ => Common}/CmnDefine.cs | 4 +-- rss-generator/Class/{ => Common}/CmnUtil.cs | 2 +- .../FlareSolverrFeedManager.cs | 11 +++++--- .../Class/{ => Common}/LogManager.cs | 4 +-- .../Class/{RSS => }/Danbooru/rank.cs | 3 ++- .../{RSS/e_hentai => EHentai}/e_hentai_ai.cs | 5 ++-- .../e_hentai => EHentai}/e_hentai_common.cs | 3 ++- .../e_hentai => EHentai}/e_hentai_non_ai.cs | 5 ++-- .../hitomi_la => HitomiLa}/index_japanese.cs | 3 ++- rss-generator/Class/{RSS => Javtwi}/javtwi.cs | 3 ++- .../Class/{RSS => KimochiInfo}/kimochiinfo.cs | 3 ++- .../Class/{RSS => Mangalear}/mangalear.cs | 5 ++-- rss-generator/Class/{RSS => MissAV}/missav.cs | 3 ++- .../Class/{RSS => MissAV123}/missav123.cs | 3 ++- .../Class/{RSS => Momonga}/momonga_fanzine.cs | 3 ++- .../{RSS => Momonga}/momonga_magazine.cs | 3 ++- .../Class/{RSS => }/Pixiv/pixiv_common.cs | 5 ++-- .../Class/{RSS => }/Pixiv/pixiv_non_r18_ai.cs | 5 ++-- .../{RSS => }/Pixiv/pixiv_non_r18_non_ai.cs | 5 ++-- .../Class/{RSS => }/Pixiv/pixiv_r18_ai.cs | 5 ++-- .../Class/{RSS => }/Pixiv/pixiv_r18_non_ai.cs | 5 ++-- .../Class/{RSS => SpankBang}/spankbang.cs | 3 ++- rss-generator/Class/{RSS => }/X/x_list.cs | 3 ++- .../Class/{RSS => YahooBaseball}/npb_6.cs | 3 ++- .../Class/{RSS => }/YouTube/YouTubeConfig.cs | 2 +- .../{RSS => }/YouTube/YouTubeFeedManager.cs | 3 ++- .../Class/{RSS => }/YouTube/YouTubeModels.cs | 2 +- .../Class/{RSS => }/YouTube/YouTubeParser.cs | 3 ++- .../Class/{RSS => YouTube}/Youtube.cs | 7 +++--- rss-generator/Program.cs | 25 +++++++++++++------ rss-generator/rss-generator.csproj | 4 +-- 34 files changed, 97 insertions(+), 58 deletions(-) rename rss-generator/Class/{RSS => AuraHentai}/aurahentai.cs (99%) rename rss-generator/Class/{RSS => CiEn}/ci_en.cs (99%) rename rss-generator/Class/{ => Common}/CmnDB.cs (98%) rename rss-generator/Class/{ => Common}/CmnDefine.cs (97%) rename rss-generator/Class/{ => Common}/CmnUtil.cs (99%) rename rss-generator/Class/{RSS => Common}/FlareSolverrFeedManager.cs (94%) rename rss-generator/Class/{ => Common}/LogManager.cs (98%) rename rss-generator/Class/{RSS => }/Danbooru/rank.cs (99%) rename rss-generator/Class/{RSS/e_hentai => EHentai}/e_hentai_ai.cs (92%) rename rss-generator/Class/{RSS/e_hentai => EHentai}/e_hentai_common.cs (99%) rename rss-generator/Class/{RSS/e_hentai => EHentai}/e_hentai_non_ai.cs (93%) rename rss-generator/Class/{RSS/hitomi_la => HitomiLa}/index_japanese.cs (99%) rename rss-generator/Class/{RSS => Javtwi}/javtwi.cs (98%) rename rss-generator/Class/{RSS => KimochiInfo}/kimochiinfo.cs (98%) rename rss-generator/Class/{RSS => Mangalear}/mangalear.cs (98%) rename rss-generator/Class/{RSS => MissAV}/missav.cs (99%) rename rss-generator/Class/{RSS => MissAV123}/missav123.cs (99%) rename rss-generator/Class/{RSS => Momonga}/momonga_fanzine.cs (99%) rename rss-generator/Class/{RSS => Momonga}/momonga_magazine.cs (99%) rename rss-generator/Class/{RSS => }/Pixiv/pixiv_common.cs (99%) rename rss-generator/Class/{RSS => }/Pixiv/pixiv_non_r18_ai.cs (94%) rename rss-generator/Class/{RSS => }/Pixiv/pixiv_non_r18_non_ai.cs (94%) rename rss-generator/Class/{RSS => }/Pixiv/pixiv_r18_ai.cs (94%) rename rss-generator/Class/{RSS => }/Pixiv/pixiv_r18_non_ai.cs (94%) rename rss-generator/Class/{RSS => SpankBang}/spankbang.cs (99%) rename rss-generator/Class/{RSS => }/X/x_list.cs (98%) rename rss-generator/Class/{RSS => YahooBaseball}/npb_6.cs (97%) rename rss-generator/Class/{RSS => }/YouTube/YouTubeConfig.cs (99%) rename rss-generator/Class/{RSS => }/YouTube/YouTubeFeedManager.cs (99%) rename rss-generator/Class/{RSS => }/YouTube/YouTubeModels.cs (98%) rename rss-generator/Class/{RSS => }/YouTube/YouTubeParser.cs (99%) rename rss-generator/Class/{RSS => YouTube}/Youtube.cs (95%) diff --git a/rss-generator/Class/RSS/aurahentai.cs b/rss-generator/Class/AuraHentai/aurahentai.cs similarity index 99% rename from rss-generator/Class/RSS/aurahentai.cs rename to rss-generator/Class/AuraHentai/aurahentai.cs index 6e3c0a8..bee3b77 100644 --- a/rss-generator/Class/RSS/aurahentai.cs +++ b/rss-generator/Class/AuraHentai/aurahentai.cs @@ -11,8 +11,9 @@ using System.Text.Json; using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.AuraHentai; internal class aurahentai { diff --git a/rss-generator/Class/RSS/ci_en.cs b/rss-generator/Class/CiEn/ci_en.cs similarity index 99% rename from rss-generator/Class/RSS/ci_en.cs rename to rss-generator/Class/CiEn/ci_en.cs index f1e6953..8bbee0a 100644 --- a/rss-generator/Class/RSS/ci_en.cs +++ b/rss-generator/Class/CiEn/ci_en.cs @@ -8,9 +8,10 @@ using System.Net; using System.ServiceModel.Syndication; using System.Text; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.CiEn; internal class ci_en { diff --git a/rss-generator/Class/CmnDB.cs b/rss-generator/Class/Common/CmnDB.cs similarity index 98% rename from rss-generator/Class/CmnDB.cs rename to rss-generator/Class/Common/CmnDB.cs index 8d63c01..4387a6a 100644 --- a/rss-generator/Class/CmnDB.cs +++ b/rss-generator/Class/Common/CmnDB.cs @@ -1,10 +1,10 @@ -using Dapper; +using Dapper; using Npgsql; #if DEBUG using Renci.SshNet; #endif -namespace rss_generator.Class; +namespace rss_generator.Class.Common; internal class CmnDB : IDisposable { diff --git a/rss-generator/Class/CmnDefine.cs b/rss-generator/Class/Common/CmnDefine.cs similarity index 97% rename from rss-generator/Class/CmnDefine.cs rename to rss-generator/Class/Common/CmnDefine.cs index 1b0b546..008fcc6 100644 --- a/rss-generator/Class/CmnDefine.cs +++ b/rss-generator/Class/Common/CmnDefine.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Text; -namespace rss_generator.Class; +namespace rss_generator.Class.Common; internal class CmnDefine { diff --git a/rss-generator/Class/CmnUtil.cs b/rss-generator/Class/Common/CmnUtil.cs similarity index 99% rename from rss-generator/Class/CmnUtil.cs rename to rss-generator/Class/Common/CmnUtil.cs index 91339da..27f8e96 100644 --- a/rss-generator/Class/CmnUtil.cs +++ b/rss-generator/Class/Common/CmnUtil.cs @@ -19,7 +19,7 @@ using System.Threading; using System.Threading.Tasks; using System.Xml; -namespace rss_generator.Class; +namespace rss_generator.Class.Common; public class CmnUtil { diff --git a/rss-generator/Class/RSS/FlareSolverrFeedManager.cs b/rss-generator/Class/Common/FlareSolverrFeedManager.cs similarity index 94% rename from rss-generator/Class/RSS/FlareSolverrFeedManager.cs rename to rss-generator/Class/Common/FlareSolverrFeedManager.cs index ff52c35..46c1f2c 100644 --- a/rss-generator/Class/RSS/FlareSolverrFeedManager.cs +++ b/rss-generator/Class/Common/FlareSolverrFeedManager.cs @@ -2,10 +2,15 @@ using System; using System.Diagnostics; using System.Net.Http; using System.Threading.Tasks; -using rss_generator.Class.RSS.Danbooru; -using rss_generator.Class.RSS.hitomi_la; +using rss_generator.Class.AuraHentai; +using rss_generator.Class.Danbooru; +using rss_generator.Class.HitomiLa; +using rss_generator.Class.MissAV; +using rss_generator.Class.MissAV123; +using rss_generator.Class.SpankBang; +using rss_generator.Class.YahooBaseball; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.Common; /// /// FlareSolverr を利用するすべての RSS 生成処理を単一のセッションで順次(直列)実行し、 diff --git a/rss-generator/Class/LogManager.cs b/rss-generator/Class/Common/LogManager.cs similarity index 98% rename from rss-generator/Class/LogManager.cs rename to rss-generator/Class/Common/LogManager.cs index 9e3c4e5..4ff6e22 100644 --- a/rss-generator/Class/LogManager.cs +++ b/rss-generator/Class/Common/LogManager.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Threading.Channels; -namespace rss_generator.Class; +namespace rss_generator.Class.Common; internal static class LogManager // 実際のクラス名に合わせてください { diff --git a/rss-generator/Class/RSS/Danbooru/rank.cs b/rss-generator/Class/Danbooru/rank.cs similarity index 99% rename from rss-generator/Class/RSS/Danbooru/rank.cs rename to rss-generator/Class/Danbooru/rank.cs index 57dcb52..3405924 100644 --- a/rss-generator/Class/RSS/Danbooru/rank.cs +++ b/rss-generator/Class/Danbooru/rank.cs @@ -8,8 +8,9 @@ using System.Net; using System.ServiceModel.Syndication; using System.Text; using System.Threading.Tasks; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS.Danbooru; +namespace rss_generator.Class.Danbooru; internal class rank { diff --git a/rss-generator/Class/RSS/e_hentai/e_hentai_ai.cs b/rss-generator/Class/EHentai/e_hentai_ai.cs similarity index 92% rename from rss-generator/Class/RSS/e_hentai/e_hentai_ai.cs rename to rss-generator/Class/EHentai/e_hentai_ai.cs index d6be20b..3f4416c 100644 --- a/rss-generator/Class/RSS/e_hentai/e_hentai_ai.cs +++ b/rss-generator/Class/EHentai/e_hentai_ai.cs @@ -4,9 +4,10 @@ using System.Linq; using System.Net.Http; using System.ServiceModel.Syndication; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS.e_hentai; +namespace rss_generator.Class.EHentai; internal class e_hentai_ai { diff --git a/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs b/rss-generator/Class/EHentai/e_hentai_common.cs similarity index 99% rename from rss-generator/Class/RSS/e_hentai/e_hentai_common.cs rename to rss-generator/Class/EHentai/e_hentai_common.cs index dd25671..d57a425 100644 --- a/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs +++ b/rss-generator/Class/EHentai/e_hentai_common.cs @@ -10,8 +10,9 @@ using System.Net.Http; using System.ServiceModel.Syndication; using System.Text; using System.Threading.Tasks; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS.e_hentai; +namespace rss_generator.Class.EHentai; internal static class e_hentai_common { diff --git a/rss-generator/Class/RSS/e_hentai/e_hentai_non_ai.cs b/rss-generator/Class/EHentai/e_hentai_non_ai.cs similarity index 93% rename from rss-generator/Class/RSS/e_hentai/e_hentai_non_ai.cs rename to rss-generator/Class/EHentai/e_hentai_non_ai.cs index df573c9..3d7d52f 100644 --- a/rss-generator/Class/RSS/e_hentai/e_hentai_non_ai.cs +++ b/rss-generator/Class/EHentai/e_hentai_non_ai.cs @@ -4,9 +4,10 @@ using System.Linq; using System.Net.Http; using System.ServiceModel.Syndication; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS.e_hentai; +namespace rss_generator.Class.EHentai; internal class e_hentai_non_ai { diff --git a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs b/rss-generator/Class/HitomiLa/index_japanese.cs similarity index 99% rename from rss-generator/Class/RSS/hitomi_la/index_japanese.cs rename to rss-generator/Class/HitomiLa/index_japanese.cs index 5be56a2..fafec9b 100644 --- a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs +++ b/rss-generator/Class/HitomiLa/index_japanese.cs @@ -9,8 +9,9 @@ using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS.hitomi_la; +namespace rss_generator.Class.HitomiLa; internal class index_japanese { diff --git a/rss-generator/Class/RSS/javtwi.cs b/rss-generator/Class/Javtwi/javtwi.cs similarity index 98% rename from rss-generator/Class/RSS/javtwi.cs rename to rss-generator/Class/Javtwi/javtwi.cs index a8e17d6..b84ca20 100644 --- a/rss-generator/Class/RSS/javtwi.cs +++ b/rss-generator/Class/Javtwi/javtwi.cs @@ -5,8 +5,9 @@ using System.Collections.Generic; using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.Javtwi; internal class javtwi { diff --git a/rss-generator/Class/RSS/kimochiinfo.cs b/rss-generator/Class/KimochiInfo/kimochiinfo.cs similarity index 98% rename from rss-generator/Class/RSS/kimochiinfo.cs rename to rss-generator/Class/KimochiInfo/kimochiinfo.cs index af7def4..72d2cd9 100644 --- a/rss-generator/Class/RSS/kimochiinfo.cs +++ b/rss-generator/Class/KimochiInfo/kimochiinfo.cs @@ -5,8 +5,9 @@ using System.Collections.Generic; using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.KimochiInfo; internal class kimochiinfo { diff --git a/rss-generator/Class/RSS/mangalear.cs b/rss-generator/Class/Mangalear/mangalear.cs similarity index 98% rename from rss-generator/Class/RSS/mangalear.cs rename to rss-generator/Class/Mangalear/mangalear.cs index 76db1ef..4fc1835 100644 --- a/rss-generator/Class/RSS/mangalear.cs +++ b/rss-generator/Class/Mangalear/mangalear.cs @@ -8,9 +8,10 @@ using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.Mangalear; internal class mangalear { diff --git a/rss-generator/Class/RSS/missav.cs b/rss-generator/Class/MissAV/missav.cs similarity index 99% rename from rss-generator/Class/RSS/missav.cs rename to rss-generator/Class/MissAV/missav.cs index 7ea4118..1d3699b 100644 --- a/rss-generator/Class/RSS/missav.cs +++ b/rss-generator/Class/MissAV/missav.cs @@ -8,8 +8,9 @@ using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.MissAV; /// /// missav.ai の新着動画を取得し、WebImageViewer (https://udukipc-web.armonica-vps.work/) で動画を視聴できるリンクを含むRSSを生成します。 diff --git a/rss-generator/Class/RSS/missav123.cs b/rss-generator/Class/MissAV123/missav123.cs similarity index 99% rename from rss-generator/Class/RSS/missav123.cs rename to rss-generator/Class/MissAV123/missav123.cs index 2627810..892a6ee 100644 --- a/rss-generator/Class/RSS/missav123.cs +++ b/rss-generator/Class/MissAV123/missav123.cs @@ -9,8 +9,9 @@ using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.MissAV123; internal class missav123 { diff --git a/rss-generator/Class/RSS/momonga_fanzine.cs b/rss-generator/Class/Momonga/momonga_fanzine.cs similarity index 99% rename from rss-generator/Class/RSS/momonga_fanzine.cs rename to rss-generator/Class/Momonga/momonga_fanzine.cs index c94184d..ff19ff5 100644 --- a/rss-generator/Class/RSS/momonga_fanzine.cs +++ b/rss-generator/Class/Momonga/momonga_fanzine.cs @@ -2,8 +2,9 @@ using AngleSharp.Html.Parser; using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.Momonga; internal class momonga_fanzine { diff --git a/rss-generator/Class/RSS/momonga_magazine.cs b/rss-generator/Class/Momonga/momonga_magazine.cs similarity index 99% rename from rss-generator/Class/RSS/momonga_magazine.cs rename to rss-generator/Class/Momonga/momonga_magazine.cs index a3c5485..4b2ba38 100644 --- a/rss-generator/Class/RSS/momonga_magazine.cs +++ b/rss-generator/Class/Momonga/momonga_magazine.cs @@ -2,8 +2,9 @@ using AngleSharp.Html.Parser; using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.Momonga; internal class momonga_magazine { diff --git a/rss-generator/Class/RSS/Pixiv/pixiv_common.cs b/rss-generator/Class/Pixiv/pixiv_common.cs similarity index 99% rename from rss-generator/Class/RSS/Pixiv/pixiv_common.cs rename to rss-generator/Class/Pixiv/pixiv_common.cs index aca3dd6..95a3f46 100644 --- a/rss-generator/Class/RSS/Pixiv/pixiv_common.cs +++ b/rss-generator/Class/Pixiv/pixiv_common.cs @@ -9,9 +9,10 @@ using System.Text; using System.Text.Json; using System.Text.Json.Serialization; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS.Pixiv; +namespace rss_generator.Class.Pixiv; /// /// Pixiv RSS 生成における接続情報管理、API通信、データ変換、XML出力を担当する共通クラス diff --git a/rss-generator/Class/RSS/Pixiv/pixiv_non_r18_ai.cs b/rss-generator/Class/Pixiv/pixiv_non_r18_ai.cs similarity index 94% rename from rss-generator/Class/RSS/Pixiv/pixiv_non_r18_ai.cs rename to rss-generator/Class/Pixiv/pixiv_non_r18_ai.cs index e3b8b87..680fc1e 100644 --- a/rss-generator/Class/RSS/Pixiv/pixiv_non_r18_ai.cs +++ b/rss-generator/Class/Pixiv/pixiv_non_r18_ai.cs @@ -2,9 +2,10 @@ using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS.Pixiv; +namespace rss_generator.Class.Pixiv; /// /// Pixiv のフォロー中ユーザーの最新全年齢・AI生成作品フィード (pixiv_non_r18_ai.xml) を生成するクラス diff --git a/rss-generator/Class/RSS/Pixiv/pixiv_non_r18_non_ai.cs b/rss-generator/Class/Pixiv/pixiv_non_r18_non_ai.cs similarity index 94% rename from rss-generator/Class/RSS/Pixiv/pixiv_non_r18_non_ai.cs rename to rss-generator/Class/Pixiv/pixiv_non_r18_non_ai.cs index fca648f..502a7d3 100644 --- a/rss-generator/Class/RSS/Pixiv/pixiv_non_r18_non_ai.cs +++ b/rss-generator/Class/Pixiv/pixiv_non_r18_non_ai.cs @@ -2,9 +2,10 @@ using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS.Pixiv; +namespace rss_generator.Class.Pixiv; /// /// Pixiv のフォロー中ユーザーの最新全年齢・非AI作品フィード (pixiv_non_r18_non_ai.xml) を生成するクラス diff --git a/rss-generator/Class/RSS/Pixiv/pixiv_r18_ai.cs b/rss-generator/Class/Pixiv/pixiv_r18_ai.cs similarity index 94% rename from rss-generator/Class/RSS/Pixiv/pixiv_r18_ai.cs rename to rss-generator/Class/Pixiv/pixiv_r18_ai.cs index 27746d6..ed95d06 100644 --- a/rss-generator/Class/RSS/Pixiv/pixiv_r18_ai.cs +++ b/rss-generator/Class/Pixiv/pixiv_r18_ai.cs @@ -2,9 +2,10 @@ using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS.Pixiv; +namespace rss_generator.Class.Pixiv; /// /// Pixiv のフォロー中ユーザーの最新 R-18・AI生成作品フィード (pixiv_r18_ai.xml) を生成するクラス diff --git a/rss-generator/Class/RSS/Pixiv/pixiv_r18_non_ai.cs b/rss-generator/Class/Pixiv/pixiv_r18_non_ai.cs similarity index 94% rename from rss-generator/Class/RSS/Pixiv/pixiv_r18_non_ai.cs rename to rss-generator/Class/Pixiv/pixiv_r18_non_ai.cs index 168d091..29e1452 100644 --- a/rss-generator/Class/RSS/Pixiv/pixiv_r18_non_ai.cs +++ b/rss-generator/Class/Pixiv/pixiv_r18_non_ai.cs @@ -2,9 +2,10 @@ using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS.Pixiv; +namespace rss_generator.Class.Pixiv; /// /// Pixiv のフォロー中ユーザーの最新 R-18・非AI作品フィード (pixiv_r18_non_ai.xml) を生成するクラス diff --git a/rss-generator/Class/RSS/spankbang.cs b/rss-generator/Class/SpankBang/spankbang.cs similarity index 99% rename from rss-generator/Class/RSS/spankbang.cs rename to rss-generator/Class/SpankBang/spankbang.cs index f8a8f0f..5c138bb 100644 --- a/rss-generator/Class/RSS/spankbang.cs +++ b/rss-generator/Class/SpankBang/spankbang.cs @@ -7,8 +7,9 @@ using System.ServiceModel.Syndication; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.SpankBang; /// /// SpankBang (https://spankbang.com/new_videos/) の最新動画を取得し、 diff --git a/rss-generator/Class/RSS/X/x_list.cs b/rss-generator/Class/X/x_list.cs similarity index 98% rename from rss-generator/Class/RSS/X/x_list.cs rename to rss-generator/Class/X/x_list.cs index a145779..154471b 100644 --- a/rss-generator/Class/RSS/X/x_list.cs +++ b/rss-generator/Class/X/x_list.cs @@ -1,6 +1,7 @@ using System.ServiceModel.Syndication; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS.X; +namespace rss_generator.Class.X; internal class x_list { diff --git a/rss-generator/Class/RSS/npb_6.cs b/rss-generator/Class/YahooBaseball/npb_6.cs similarity index 97% rename from rss-generator/Class/RSS/npb_6.cs rename to rss-generator/Class/YahooBaseball/npb_6.cs index 16277c7..69a4f5b 100644 --- a/rss-generator/Class/RSS/npb_6.cs +++ b/rss-generator/Class/YahooBaseball/npb_6.cs @@ -4,8 +4,9 @@ using System; using System.Collections.Generic; using System.ServiceModel.Syndication; using System.Text; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.YahooBaseball; internal class npb_6 { diff --git a/rss-generator/Class/RSS/YouTube/YouTubeConfig.cs b/rss-generator/Class/YouTube/YouTubeConfig.cs similarity index 99% rename from rss-generator/Class/RSS/YouTube/YouTubeConfig.cs rename to rss-generator/Class/YouTube/YouTubeConfig.cs index 564d66a..22317eb 100644 --- a/rss-generator/Class/RSS/YouTube/YouTubeConfig.cs +++ b/rss-generator/Class/YouTube/YouTubeConfig.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace rss_generator.Class.RSS.YouTube; +namespace rss_generator.Class.YouTube; /// /// YouTubeフィード生成の設定情報 diff --git a/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs b/rss-generator/Class/YouTube/YouTubeFeedManager.cs similarity index 99% rename from rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs rename to rss-generator/Class/YouTube/YouTubeFeedManager.cs index cae15d8..a7bd869 100644 --- a/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs +++ b/rss-generator/Class/YouTube/YouTubeFeedManager.cs @@ -7,8 +7,9 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS.YouTube; +namespace rss_generator.Class.YouTube; /// /// YouTubeのライブ配信・通常動画・ショート動画を分離してRSS(XML)を生成・出力するマネージャークラス diff --git a/rss-generator/Class/RSS/YouTube/YouTubeModels.cs b/rss-generator/Class/YouTube/YouTubeModels.cs similarity index 98% rename from rss-generator/Class/RSS/YouTube/YouTubeModels.cs rename to rss-generator/Class/YouTube/YouTubeModels.cs index 97fb94d..c178133 100644 --- a/rss-generator/Class/RSS/YouTube/YouTubeModels.cs +++ b/rss-generator/Class/YouTube/YouTubeModels.cs @@ -1,6 +1,6 @@ using System; -namespace rss_generator.Class.RSS.YouTube; +namespace rss_generator.Class.YouTube; /// /// YouTubeフィードの種類(ライブ配信・通常動画・ショート動画) diff --git a/rss-generator/Class/RSS/YouTube/YouTubeParser.cs b/rss-generator/Class/YouTube/YouTubeParser.cs similarity index 99% rename from rss-generator/Class/RSS/YouTube/YouTubeParser.cs rename to rss-generator/Class/YouTube/YouTubeParser.cs index 445fadd..7cb4378 100644 --- a/rss-generator/Class/RSS/YouTube/YouTubeParser.cs +++ b/rss-generator/Class/YouTube/YouTubeParser.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Globalization; using System.Text.Json; using System.Text.RegularExpressions; +using rss_generator.Class.Common; -namespace rss_generator.Class.RSS.YouTube; +namespace rss_generator.Class.YouTube; /// /// YouTubeのHTMLからytInitialDataを抽出・解析するパーサークラス diff --git a/rss-generator/Class/RSS/Youtube.cs b/rss-generator/Class/YouTube/Youtube.cs similarity index 95% rename from rss-generator/Class/RSS/Youtube.cs rename to rss-generator/Class/YouTube/Youtube.cs index 27cfd0f..3abb524 100644 --- a/rss-generator/Class/RSS/Youtube.cs +++ b/rss-generator/Class/YouTube/Youtube.cs @@ -6,10 +6,11 @@ using System.Text; using System.Text.RegularExpressions; using System.Web; using System.Xml; -using static rss_generator.Class.CmnDefine; -using static rss_generator.Class.LogManager; +using rss_generator.Class.Common; +using static rss_generator.Class.Common.CmnDefine; +using static rss_generator.Class.Common.LogManager; -namespace rss_generator.Class.RSS; +namespace rss_generator.Class.YouTube; internal class Youtube { diff --git a/rss-generator/Program.cs b/rss-generator/Program.cs index 9bbd27c..360bd58 100644 --- a/rss-generator/Program.cs +++ b/rss-generator/Program.cs @@ -1,10 +1,21 @@ using Microsoft.Extensions.DependencyInjection; -using rss_generator.Class; -using rss_generator.Class.RSS; -using rss_generator.Class.RSS.e_hentai; -using rss_generator.Class.RSS.hitomi_la; -using rss_generator.Class.RSS.Pixiv; -using rss_generator.Class.RSS.YouTube; +using rss_generator.Class.AuraHentai; +using rss_generator.Class.CiEn; +using rss_generator.Class.Common; +using rss_generator.Class.Danbooru; +using rss_generator.Class.EHentai; +using rss_generator.Class.HitomiLa; +using rss_generator.Class.Javtwi; +using rss_generator.Class.KimochiInfo; +using rss_generator.Class.Mangalear; +using rss_generator.Class.MissAV; +using rss_generator.Class.MissAV123; +using rss_generator.Class.Momonga; +using rss_generator.Class.Pixiv; +using rss_generator.Class.SpankBang; +using rss_generator.Class.X; +using rss_generator.Class.YahooBaseball; +using rss_generator.Class.YouTube; using System.Diagnostics; @@ -80,7 +91,7 @@ while (true) feedActions.Add(("spankbang", () => spankbang.CreateRSSAsync(client))); #else feedActions.Add(("YouTube", () => YouTubeFeedManager.CreateRSSAsync(client))); - feedActions.Add(("X (Twitter)", () => rss_generator.Class.RSS.X.x_list.CreateRSSAsync(client))); + feedActions.Add(("X (Twitter)", () => x_list.CreateRSSAsync(client))); feedActions.Add(("kimochiinfo", () => kimochiinfo.CreateRSSAsync(client))); feedActions.Add(("ci_en", () => ci_en.CreateRSSAsync(client))); feedActions.Add(("javtwi", () => javtwi.CreateRSSAsync(client))); diff --git a/rss-generator/rss-generator.csproj b/rss-generator/rss-generator.csproj index 16816b4..dc34f1f 100644 --- a/rss-generator/rss-generator.csproj +++ b/rss-generator/rss-generator.csproj @@ -25,9 +25,7 @@ - - - +