diff --git a/rss-generator/Class/RSS/ci_en.cs b/rss-generator/Class/RSS/ci_en.cs
index 6dbd5a4..8653a8a 100644
--- a/rss-generator/Class/RSS/ci_en.cs
+++ b/rss-generator/Class/RSS/ci_en.cs
@@ -1,9 +1,13 @@
-using AngleSharp.Dom;
+using AngleSharp.Dom;
using AngleSharp.Html.Dom;
+using AngleSharp.Html.Parser;
using System;
using System.Collections.Generic;
+using System.Linq;
+using System.Net;
using System.ServiceModel.Syndication;
using System.Text;
+using System.Threading.Tasks;
using static rss_generator.Class.LogManager;
namespace rss_generator.Class.RSS;
@@ -19,10 +23,17 @@ internal class ci_en
{
var pageURL = $"https://ci-en.dlsite.com/mypage/recent";
var rssUrl = $"{pageURL}";
+
+ if (client.DefaultRequestHeaders.Contains("Cookie"))
+ {
+ client.DefaultRequestHeaders.Remove("Cookie");
+ }
client.DefaultRequestHeaders.Add("Cookie", cookie);
var document = await CmnUtil.GetDocument(client, rssUrl);
var elemArticles = document.QuerySelectorAll(".c-card-article");
+ var parser = new HtmlParser();
+
foreach (var elemArticle in elemArticles)
{
var item = new SyndicationItem();
@@ -65,20 +76,88 @@ internal class ci_en
}
var body = new StringBuilder();
+ if (!string.IsNullOrEmpty(href))
{
- //if (elemArticle.QuerySelector(".image") is IHtmlImageElement element)
- //{
- // var imageUri = !string.IsNullOrEmpty(element.Source) ? new Uri(element.Source) : null;
- // var title = element.AlternativeText ?? "";
+ var docContents = await CmnUtil.GetDocument(client, href);
+ var divDetail = docContents.QuerySelector("article");
- // body.Append($@"
![]()
");
- //}
+ if (divDetail != null)
{
- var docContents = await CmnUtil.GetDocument(client, href);
- var divDetail = docContents.QuerySelector("article")!;
+ // 1. vue-l-image 等の Vue カスタムコンポーネントを標準の
タグに置換
+ var vueImages = divDetail.QuerySelectorAll("vue-l-image, [vue-is='l_image'], vue-image").ToList();
+ foreach (var vueImg in vueImages)
+ {
+ var src = vueImg.GetAttribute("src");
+ var actualSrc = vueImg.GetAttribute("data-actual");
+ var rawSrc = vueImg.GetAttribute("data-raw");
+ var alt = vueImg.GetAttribute("alt") ?? "";
+
+ var targetImgSrc = !string.IsNullOrEmpty(actualSrc) ? actualSrc : (!string.IsNullOrEmpty(src) ? src : rawSrc);
+ if (!string.IsNullOrEmpty(targetImgSrc))
+ {
+ var linkUrl = !string.IsNullOrEmpty(rawSrc) ? rawSrc : targetImgSrc;
+ var imgTagHtml = $@"
";
+
+ var fragment = parser.ParseDocument(imgTagHtml);
+ var newElement = fragment.Body?.FirstElementChild;
+ if (newElement != null)
+ {
+ vueImg.ReplaceWith(newElement);
+ }
+ }
+ }
+
+ // 2. figure や file-player-image-wrapper の崩れ防止(padding-bottom等の削除)
+ var figureWrappers = divDetail.QuerySelectorAll("figure, div.file-player-image-wrapper").ToList();
+ foreach (var fig in figureWrappers)
+ {
+ fig.RemoveAttribute("style");
+ }
+
+ // 3. 通常の
タグの data-actual / data-src 対応
+ var regularImages = divDetail.QuerySelectorAll("img").ToList();
+ foreach (var img in regularImages)
+ {
+ var dataActual = img.GetAttribute("data-actual");
+ var dataSrc = img.GetAttribute("data-src");
+ var currentSrc = img.GetAttribute("src");
+
+ if (!string.IsNullOrEmpty(dataActual))
+ {
+ img.SetAttribute("src", dataActual);
+ }
+ else if ((string.IsNullOrEmpty(currentSrc) || currentSrc.Contains("no_image")) && !string.IsNullOrEmpty(dataSrc))
+ {
+ img.SetAttribute("src", dataSrc);
+ }
+
+ img.SetAttribute("style", "max-width: 100%; height: auto;");
+ }
+
+ // 4. カバー画像/アイキャッチ画像の配置
+ string? coverImageUrl = null;
+ if (elemArticle.QuerySelector("img.image, img") is IHtmlImageElement coverElem && !string.IsNullOrEmpty(coverElem.Source) && !coverElem.Source.Contains("no_image") && !coverElem.Source.Contains("logo_"))
+ {
+ coverImageUrl = coverElem.Source;
+ }
+ else
+ {
+ var metaOgImage = docContents.QuerySelector("meta[property='og:image']")?.GetAttribute("content");
+ if (!string.IsNullOrEmpty(metaOgImage) && !metaOgImage.Contains("logo_") && !metaOgImage.Contains("no_image"))
+ {
+ coverImageUrl = metaOgImage;
+ }
+ }
+
+ if (!string.IsNullOrEmpty(coverImageUrl))
+ {
+ body.Append($@"![]()
");
+ }
+
body.Append(CmnUtil.GetHtmlWithoutJavaScript(divDetail));
}
}
+
item.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html);
// ID
item.Id = CmnUtil.CreateGuid($"{href}");
@@ -92,6 +171,7 @@ internal class ci_en
catch (Exception ex)
{
AddLog($"[エラー] [ci_en]:{ex.Message}");
+ CmnUtil.PrintCallStackToEvent(ex);
}
}
}
diff --git a/rss-generator/Class/RSS/missav123.cs b/rss-generator/Class/RSS/missav123.cs
index cc6b477..c18c68d 100644
--- a/rss-generator/Class/RSS/missav123.cs
+++ b/rss-generator/Class/RSS/missav123.cs
@@ -142,7 +142,7 @@ internal class missav123
if (!string.IsNullOrEmpty(playerUrl))
{
body.Append($@"");
- body.Append($@"");
+ body.Append($@"");
body.Append($@"
");
body.Append($@"");
}