Skip to content

Commit

Permalink
排除转载文章时自动关联的无关项,修改音频默认缩略图
Browse files Browse the repository at this point in the history
  • Loading branch information
LittleFish-233 committed Oct 18, 2022
1 parent 1d80519 commit 826c6a2
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 28 deletions.
53 changes: 27 additions & 26 deletions CnGalWebSite/CnGalWebSite.PublicToolbox/PostTools/ArticleService.cs
Expand Up @@ -152,26 +152,26 @@ private async Task ProcZhiHuArticleFromHtmlAsync(RepostArticleModel model, strin
}

//主图
try
{
var tempNode = mainNode.ChildNodes.FirstOrDefault(s => s.Name == "img");
if (tempNode == null)
{
tempNode = mainNode.ChildNodes.FirstOrDefault(s => s.OuterHtml.Contains("background-image"));
if (tempNode != null)
{
image = ToolHelper.MidStrEx(tempNode.OuterHtml, "url(", "?source");
}
}
else
{
image = ToolHelper.MidStrEx(tempNode.OuterHtml, "src=\"", "\"");
}
}
catch
{

}
//try
//{
// var tempNode = mainNode.ChildNodes.FirstOrDefault(s => s.Name == "img");
// if (tempNode == null)
// {
// tempNode = mainNode.ChildNodes.FirstOrDefault(s => s.OuterHtml.Contains("background-image"));
// if (tempNode != null)
// {
// image = ToolHelper.MidStrEx(tempNode.OuterHtml, "url(", "?source");
// }
// }
// else
// {
// image = ToolHelper.MidStrEx(tempNode.OuterHtml, "src=\"", "\"");
// }
//}
//catch
//{

//}
//标题
try
{
Expand All @@ -184,7 +184,8 @@ private async Task ProcZhiHuArticleFromHtmlAsync(RepostArticleModel model, strin
//作者
try
{
author = mainNode.ChildNodes.MaxBy(s => s.InnerText.Length).ChildNodes[0].ChildNodes[1].FirstChild.FirstChild.LastChild.FirstChild.InnerText;
author = mainNode.ChildNodes.FirstOrDefault(s=>s.Name=="article").ChildNodes.FirstOrDefault(s => s.HasClass("Post-Author")).ChildNodes.FirstOrDefault(s => s.HasClass("AuthorInfo")).ChildNodes.FirstOrDefault(s => s.HasClass("AuthorInfo")).ChildNodes.FirstOrDefault(s => s.HasClass("AuthorInfo-content")).ChildNodes.FirstOrDefault(s => s.HasClass("AuthorInfo-head")).InnerText;

}
catch
{
Expand Down Expand Up @@ -221,8 +222,7 @@ private async Task ProcZhiHuArticleFromHtmlAsync(RepostArticleModel model, strin
throw new Exception("无法获取知乎文章内容,请联系管理员");
}

model.MainPage = converter.Convert(htmlStr);
model.MainPage = await ProgressImage(model, model.MainPage, RepostArticleType.ZhiHu);
model.MainPage = await ProgressImage(model, converter.Convert(htmlStr), RepostArticleType.ZhiHu);
model.Title = name;
model.OriginalAuthor = ToolHelper.MidStrEx(model.MainPage, "原作者:", "\r").Replace("*", "").Split("").FirstOrDefault()?.Trim();
if (string.IsNullOrWhiteSpace(model.OriginalAuthor) && author != null)
Expand Down Expand Up @@ -423,10 +423,11 @@ private CreateArticleViewModel GenerateArticle(RepostArticleModel model,IEnumera
}
};


var entries = games.ToList();
entries.RemoveAll(s => s == "幻觉" || s == "画师" || s == "");

//查找关联词条
foreach (var item in games.Where(s => s != "幻觉" && s != "画师"))
foreach (var item in entries)
{
if (model.MainPage.Contains(item))
{
Expand All @@ -437,7 +438,7 @@ private CreateArticleViewModel GenerateArticle(RepostArticleModel model,IEnumera
}

}
foreach (var item in games)
foreach (var item in entries)
{

if (model.Title.Contains(item))
Expand Down
4 changes: 2 additions & 2 deletions CnGalWebSite/CnGalWebSite.Server/Pages/_Layout.cshtml
Expand Up @@ -25,7 +25,7 @@

<base href="~/" />

@*<meta http-equiv="Content-Security-Policy"
<meta http-equiv="Content-Security-Policy"
content="base-uri 'self';
block-all-mixed-content;
default-src 'self';
Expand Down Expand Up @@ -64,7 +64,7 @@
'self';
media-src https://*.cngal.org/
'self';
upgrade-insecure-requests;">*@
upgrade-insecure-requests;">


<!--masa blazor css style-->
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 826c6a2

Please sign in to comment.