open-source-mirrors
/
Prowlarr
mirror of https://github.com/Prowlarr/Prowlarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: Return Correct Nab feed depending on Indexer Protocol

Browse Source
pull/6/head
Qstick 4 years ago
parent a7dce5251f
commit c6ec632dd2
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File

34
src/NzbDrone.Core/IndexerSearch/NewznabResults.cs
Unescape View File

@ -5,6 +5,7 @@ using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Xml.Linq; using System.Xml.Linq;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.IndexerSearch namespace NzbDrone.Core.IndexerSearch
@ -13,6 +14,7 @@ namespace NzbDrone.Core.IndexerSearch
{ {
private static readonly XNamespace _AtomNs = "http://www.w3.org/2005/Atom"; private static readonly XNamespace _AtomNs = "http://www.w3.org/2005/Atom";
private static readonly XNamespace _TorznabNs = "http://torznab.com/schemas/2015/feed"; private static readonly XNamespace _TorznabNs = "http://torznab.com/schemas/2015/feed";
private static readonly XNamespace _NewznabNs = "http://www.newznab.com/DTD/2010/feeds/attributes/";
// filters control characters but allows only properly-formed surrogate sequences // filters control characters but allows only properly-formed surrogate sequences
// https://stackoverflow.com/a/961504 // https://stackoverflow.com/a/961504
@ -40,17 +42,19 @@ namespace NzbDrone.Core.IndexerSearch
return $"{dt:ddd, dd MMM yyyy HH:mm:ss} " + $"{dt:zzz}".Replace(":", ""); return $"{dt:ddd, dd MMM yyyy HH:mm:ss} " + $"{dt:zzz}".Replace(":", "");
} }
private static XElement GetTorznabElement(string name, object value) private static XElement GetNabElement(string name, object value, DownloadProtocol protocol)
{ {
if (value == null) if (value == null)
{ {
return null; return null;
} }
return new XElement(_TorznabNs + "attr", new XAttribute("name", name), new XAttribute("value", value)); var feedNamespace = protocol == DownloadProtocol.Torrent ? _TorznabNs : _NewznabNs;
return new XElement(feedNamespace + "attr", new XAttribute("name", name), new XAttribute("value", value));
} }
public string ToXml() public string ToXml(DownloadProtocol protocol)
{ {
// IMPORTANT: We can't use Uri.ToString(), because it generates URLs without URL encode (links with unicode // IMPORTANT: We can't use Uri.ToString(), because it generates URLs without URL encode (links with unicode
// characters are broken). We must use Uri.AbsoluteUri instead that handles encoding correctly // characters are broken). We must use Uri.AbsoluteUri instead that handles encoding correctly
@ -59,7 +63,9 @@ namespace NzbDrone.Core.IndexerSearch
new XElement("rss", new XElement("rss",
new XAttribute("version", "1.0"), new XAttribute("version", "1.0"),
new XAttribute(XNamespace.Xmlns + "atom", _AtomNs.NamespaceName), new XAttribute(XNamespace.Xmlns + "atom", _AtomNs.NamespaceName),
new XAttribute(XNamespace.Xmlns + "torznab", _TorznabNs.NamespaceName), protocol == DownloadProtocol.Torrent ?
new XAttribute(XNamespace.Xmlns + "torznab", _TorznabNs.NamespaceName) :
new XAttribute(XNamespace.Xmlns + "newznab", _NewznabNs.NamespaceName),
new XElement("channel", new XElement("channel",
new XElement(_AtomNs + "link", new XElement(_AtomNs + "link",
new XAttribute("rel", "self"), new XAttribute("rel", "self"),
@ -78,15 +84,17 @@ namespace NzbDrone.Core.IndexerSearch
"enclosure", "enclosure",
new XAttribute("url", r.DownloadUrl ?? t.MagnetUrl ?? string.Empty), new XAttribute("url", r.DownloadUrl ?? t.MagnetUrl ?? string.Empty),
r.Size == null ? null : new XAttribute("length", r.Size), r.Size == null ? null : new XAttribute("length", r.Size),
new XAttribute("type", "application/x-bittorrent")), new XAttribute("type", protocol == DownloadProtocol.Torrent ? "application/x-bittorrent" : "application/x-nzb")),
r.Category == null ? null : from c in r.Category select GetTorznabElement("category", c.Id), r.Category == null ? null : from c in r.Category select GetNabElement("category", c.Id, protocol),
GetTorznabElement("rageid", r.TvRageId), GetNabElement("rageid", r.TvRageId, protocol),
GetTorznabElement("thetvdb", r.TvdbId), GetNabElement("thetvdb", r.TvdbId, protocol),
GetTorznabElement("imdb", r.ImdbId.ToString("D7")), GetNabElement("imdb", r.ImdbId.ToString("D7"), protocol),
GetTorznabElement("tmdb", r.TmdbId), GetNabElement("tmdb", r.TmdbId, protocol),
GetTorznabElement("seeders", t.Seeders), GetNabElement("seeders", t.Seeders, protocol),
GetTorznabElement("peers", t.Peers), GetNabElement("files", r.Files, protocol),
GetTorznabElement("infohash", RemoveInvalidXMLChars(r.Guid)))))); GetNabElement("grabs", r.Grabs, protocol),
GetNabElement("peers", t.Peers, protocol),
GetNabElement("infohash", RemoveInvalidXMLChars(r.Guid), protocol)))));
return xdoc.Declaration + Environment.NewLine + xdoc; return xdoc.Declaration + Environment.NewLine + xdoc;
} }

3
src/Prowlarr.Api.V1/Indexers/IndexerModule.cs
Unescape View File

@ -62,11 +62,12 @@ namespace Prowlarr.Api.V1.Indexers
Response response = indexerInstance.GetCapabilities().ToXml(); Response response = indexerInstance.GetCapabilities().ToXml();
response.ContentType = "application/rss+xml"; response.ContentType = "application/rss+xml";
return response; return response;
case "seach":
case "tvsearch": case "tvsearch":
case "music": case "music":
case "book": case "book":
case "movie": case "movie":
Response movieResponse = _nzbSearchService.Search(request, new List<int> { indexer.Id }, false).ToXml(); Response movieResponse = _nzbSearchService.Search(request, new List<int> { indexer.Id }, false).ToXml(indexerInstance.Protocol);
movieResponse.ContentType = "application/rss+xml"; movieResponse.ContentType = "application/rss+xml";
return movieResponse; return movieResponse;
default: default:

Write Preview
Loading…
Cancel
Save