mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

core: remove rss feed image (legacy code) #324 (#10837)

This commit is contained in:
Diego Heras 2021-01-17 13:42:52 +01:00 committed by GitHub
parent ee279dffac
commit 456338399b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Jackett.Common/Models/ChannelInfo.cs
View File

@ -9,10 +9,6 @@ namespace Jackett.Common.Models
public Uri Link { get; set; } public Uri Link { get; set; }
public string Language { get; set; } public string Language { get; set; }
public string Category { get; set; } public string Category { get; set; }
public Uri ImageUrl { get; set; }
public string ImageTitle { get; set; }
public Uri ImageLink { get; set; }
public string ImageDescription { get; set; }
public ChannelInfo() public ChannelInfo()
{ {

6
src/Jackett.Common/Models/ResultPage.cs
View File

@ -73,12 +73,6 @@ namespace Jackett.Common.Models
new XElement("link", ChannelInfo.Link.AbsoluteUri), new XElement("link", ChannelInfo.Link.AbsoluteUri),
new XElement("language", ChannelInfo.Language), new XElement("language", ChannelInfo.Language),
new XElement("category", ChannelInfo.Category), new XElement("category", ChannelInfo.Category),
new XElement("image",
new XElement("url", ChannelInfo.ImageUrl.AbsoluteUri),
new XElement("title", ChannelInfo.ImageTitle),
new XElement("link", ChannelInfo.ImageLink.AbsoluteUri),
new XElement("description", ChannelInfo.ImageDescription)
),
from r in Releases from r in Releases
select new XElement("item", select new XElement("item",
new XElement("title", RemoveInvalidXMLChars(r.Title)), new XElement("title", RemoveInvalidXMLChars(r.Title)),

6
src/Jackett.Server/Controllers/ResultsController.cs
View File

@ -403,11 +403,7 @@ namespace Jackett.Server.Controllers
{ {
Title = CurrentIndexer.DisplayName, Title = CurrentIndexer.DisplayName,
Description = CurrentIndexer.DisplayDescription, Description = CurrentIndexer.DisplayDescription,
Link = new Uri(CurrentIndexer.SiteLink), Link = new Uri(CurrentIndexer.SiteLink)
ImageUrl = new Uri(serverUrl + "logos/" + CurrentIndexer.Id + ".png"),
ImageTitle = CurrentIndexer.DisplayName,
ImageLink = new Uri(CurrentIndexer.SiteLink),
ImageDescription = CurrentIndexer.DisplayName
}); });
var proxiedReleases = result.Releases.Select(r => AutoMapper.Mapper.Map<ReleaseInfo>(r)).Select(r => var proxiedReleases = result.Releases.Select(r => AutoMapper.Mapper.Map<ReleaseInfo>(r)).Select(r =>

6
src/Jackett.Test/Common/Models/ResultPageTests.cs
View File

@ -48,9 +48,7 @@ namespace Jackett.Test.Common.Models
var resultPage = new ResultPage( var resultPage = new ResultPage(
new ChannelInfo // characters in channel info are safe because are provided by us new ChannelInfo // characters in channel info are safe because are provided by us
{ {
Link = link, Link = link
ImageUrl = link,
ImageLink = link
}) })
{ {
Releases = new List<ReleaseInfo> Releases = new List<ReleaseInfo>
@ -75,7 +73,7 @@ namespace Jackett.Test.Common.Models
var xml = resultPage.ToXml(link); var xml = resultPage.ToXml(link);
Assert.AreEqual(5, Regex.Matches(xml, validText).Count); Assert.AreEqual(5, Regex.Matches(xml, validText).Count);
Assert.AreEqual(10, Regex.Matches(xml, validLink).Count); Assert.AreEqual(8, Regex.Matches(xml, validLink).Count);
// this should be in another test but it's here to avoid creating the whole object again // this should be in another test but it's here to avoid creating the whole object again
Assert.True(xml.Contains("Tue, 22 Sep 2020 00:00:00 ")); Assert.True(xml.Contains("Tue, 22 Sep 2020 00:00:00 "));