refactor: 接続先ドメイン別および共通フォルダへのクラス再配置と参照更新

- 共通クラス(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 要素をクリーンアップ
This commit is contained in:
armonica committed 2026-09-07 11:27:53 +09:00
1 parent aeef4b37c8
commit 922e226b0a
34 files changed
+97 -58

No files matched your search

@@ -11,8 +11,9 @@ using System.Text.Json;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.AuraHentai;
internal class aurahentai internal class aurahentai
{ {
@@ -8,9 +8,10 @@ using System.Net;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Threading.Tasks; 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 internal class ci_en
{ {
@@ -1,10 +1,10 @@
using Dapper; using Dapper;
using Npgsql; using Npgsql;
#if DEBUG #if DEBUG
using Renci.SshNet; using Renci.SshNet;
#endif #endif
namespace rss_generator.Class; namespace rss_generator.Class.Common;
internal class CmnDB : IDisposable internal class CmnDB : IDisposable
{ {
@@ -1,8 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace rss_generator.Class; namespace rss_generator.Class.Common;
internal class CmnDefine internal class CmnDefine
{ {
@@ -19,7 +19,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
namespace rss_generator.Class; namespace rss_generator.Class.Common;
public class CmnUtil public class CmnUtil
{ {
@@ -2,10 +2,15 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using rss_generator.Class.RSS.Danbooru; using rss_generator.Class.AuraHentai;
using rss_generator.Class.RSS.hitomi_la; 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;
/// <summary> /// <summary>
/// FlareSolverr を利用するすべての RSS 生成処理を単一のセッションで順次(直列)実行し、 /// FlareSolverr を利用するすべての RSS 生成処理を単一のセッションで順次(直列)実行し、
@@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading.Channels; using System.Threading.Channels;
namespace rss_generator.Class; namespace rss_generator.Class.Common;
internal static class LogManager // 実際のクラス名に合わせてください internal static class LogManager // 実際のクラス名に合わせてください
{ {
@@ -8,8 +8,9 @@ using System.Net;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS.Danbooru; namespace rss_generator.Class.Danbooru;
internal class rank internal class rank
{ {
@@ -4,9 +4,10 @@ using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Threading.Tasks; 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 internal class e_hentai_ai
{ {
@@ -10,8 +10,9 @@ using System.Net.Http;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Threading.Tasks; 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 internal static class e_hentai_common
{ {
@@ -4,9 +4,10 @@ using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Threading.Tasks; 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 internal class e_hentai_non_ai
{ {
@@ -9,8 +9,9 @@ using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; 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 internal class index_japanese
{ {
@@ -5,8 +5,9 @@ using System.Collections.Generic;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.Javtwi;
internal class javtwi internal class javtwi
{ {
@@ -5,8 +5,9 @@ using System.Collections.Generic;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.KimochiInfo;
internal class kimochiinfo internal class kimochiinfo
{ {
@@ -8,9 +8,10 @@ using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; 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 internal class mangalear
{ {
@@ -8,8 +8,9 @@ using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.MissAV;
/// <summary> /// <summary>
/// missav.ai の新着動画を取得し、WebImageViewer (https://udukipc-web.armonica-vps.work/) で動画を視聴できるリンクを含むRSSを生成します。 /// missav.ai の新着動画を取得し、WebImageViewer (https://udukipc-web.armonica-vps.work/) で動画を視聴できるリンクを含むRSSを生成します。
@@ -9,8 +9,9 @@ using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.MissAV123;
internal class missav123 internal class missav123
{ {
@@ -2,8 +2,9 @@ using AngleSharp.Html.Parser;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.Momonga;
internal class momonga_fanzine internal class momonga_fanzine
{ {
@@ -2,8 +2,9 @@ using AngleSharp.Html.Parser;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.Momonga;
internal class momonga_magazine internal class momonga_magazine
{ {
@@ -9,9 +9,10 @@ using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Threading.Tasks; 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;
/// <summary> /// <summary>
/// Pixiv RSS 生成における接続情報管理、API通信、データ変換、XML出力を担当する共通クラス /// Pixiv RSS 生成における接続情報管理、API通信、データ変換、XML出力を担当する共通クラス
@@ -2,9 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; 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;
/// <summary> /// <summary>
/// Pixiv のフォロー中ユーザーの最新全年齢・AI生成作品フィード (pixiv_non_r18_ai.xml) を生成するクラス /// Pixiv のフォロー中ユーザーの最新全年齢・AI生成作品フィード (pixiv_non_r18_ai.xml) を生成するクラス
@@ -2,9 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; 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;
/// <summary> /// <summary>
/// Pixiv のフォロー中ユーザーの最新全年齢・非AI作品フィード (pixiv_non_r18_non_ai.xml) を生成するクラス /// Pixiv のフォロー中ユーザーの最新全年齢・非AI作品フィード (pixiv_non_r18_non_ai.xml) を生成するクラス
@@ -2,9 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; 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;
/// <summary> /// <summary>
/// Pixiv のフォロー中ユーザーの最新 R-18・AI生成作品フィード (pixiv_r18_ai.xml) を生成するクラス /// Pixiv のフォロー中ユーザーの最新 R-18・AI生成作品フィード (pixiv_r18_ai.xml) を生成するクラス
@@ -2,9 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; 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;
/// <summary> /// <summary>
/// Pixiv のフォロー中ユーザーの最新 R-18・非AI作品フィード (pixiv_r18_non_ai.xml) を生成するクラス /// Pixiv のフォロー中ユーザーの最新 R-18・非AI作品フィード (pixiv_r18_non_ai.xml) を生成するクラス
@@ -7,8 +7,9 @@ using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.SpankBang;
/// <summary> /// <summary>
/// SpankBang (https://spankbang.com/new_videos/) の最新動画を取得し、 /// SpankBang (https://spankbang.com/new_videos/) の最新動画を取得し、
@@ -1,6 +1,7 @@
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS.X; namespace rss_generator.Class.X;
internal class x_list internal class x_list
{ {
@@ -4,8 +4,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text; using System.Text;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS; namespace rss_generator.Class.YahooBaseball;
internal class npb_6 internal class npb_6
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace rss_generator.Class.RSS.YouTube; namespace rss_generator.Class.YouTube;
/// <summary> /// <summary>
/// YouTubeフィード生成の設定情報 /// YouTubeフィード生成の設定情報
@@ -7,8 +7,9 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq; using System.Xml.Linq;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS.YouTube; namespace rss_generator.Class.YouTube;
/// <summary> /// <summary>
/// YouTubeのライブ配信・通常動画・ショート動画を分離してRSS(XML)を生成・出力するマネージャークラス /// YouTubeのライブ配信・通常動画・ショート動画を分離してRSS(XML)を生成・出力するマネージャークラス
@@ -1,6 +1,6 @@
using System; using System;
namespace rss_generator.Class.RSS.YouTube; namespace rss_generator.Class.YouTube;
/// <summary> /// <summary>
/// YouTubeフィードの種類(ライブ配信・通常動画・ショート動画) /// YouTubeフィードの種類(ライブ配信・通常動画・ショート動画)
@@ -3,8 +3,9 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Text.Json; using System.Text.Json;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using rss_generator.Class.Common;
namespace rss_generator.Class.RSS.YouTube; namespace rss_generator.Class.YouTube;
/// <summary> /// <summary>
/// YouTubeのHTMLからytInitialDataを抽出・解析するパーサークラス /// YouTubeのHTMLからytInitialDataを抽出・解析するパーサークラス
@@ -6,10 +6,11 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Web; using System.Web;
using System.Xml; using System.Xml;
using static rss_generator.Class.CmnDefine; using rss_generator.Class.Common;
using static rss_generator.Class.LogManager; 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 internal class Youtube
{ {
+18 -7
View File
@@ -1,10 +1,21 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using rss_generator.Class; using rss_generator.Class.AuraHentai;
using rss_generator.Class.RSS; using rss_generator.Class.CiEn;
using rss_generator.Class.RSS.e_hentai; using rss_generator.Class.Common;
using rss_generator.Class.RSS.hitomi_la; using rss_generator.Class.Danbooru;
using rss_generator.Class.RSS.Pixiv; using rss_generator.Class.EHentai;
using rss_generator.Class.RSS.YouTube; 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; using System.Diagnostics;
@@ -80,7 +91,7 @@ while (true)
feedActions.Add(("spankbang", () => spankbang.CreateRSSAsync(client))); feedActions.Add(("spankbang", () => spankbang.CreateRSSAsync(client)));
#else #else
feedActions.Add(("YouTube", () => YouTubeFeedManager.CreateRSSAsync(client))); 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(("kimochiinfo", () => kimochiinfo.CreateRSSAsync(client)));
feedActions.Add(("ci_en", () => ci_en.CreateRSSAsync(client))); feedActions.Add(("ci_en", () => ci_en.CreateRSSAsync(client)));
feedActions.Add(("javtwi", () => javtwi.CreateRSSAsync(client))); feedActions.Add(("javtwi", () => javtwi.CreateRSSAsync(client)));
+1 -3
View File
@@ -25,9 +25,7 @@
<PackageReference Include="System.ServiceModel.Syndication" Version="10.0.11" /> <PackageReference Include="System.ServiceModel.Syndication" Version="10.0.11" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Class\RSS\Pixiv\" />
</ItemGroup>
<!-- 発行後にローカルPCのDocker Desktopへ自動デプロイ --> <!-- 発行後にローカルPCのDocker Desktopへ自動デプロイ -->
<Target Name="PostPublishDeploy" AfterTargets="Publish"> <Target Name="PostPublishDeploy" AfterTargets="Publish">