Fixed: Escape Characters as needed for *znab queries

Co-Authored-By: bakerboy448 <55419169+bakerboy448@users.noreply.github.com>
This commit is contained in:
Qstick 2022-09-26 17:57:54 -05:00
parent dc7b5b52dc
commit c63b08265c

View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
@ -94,7 +95,7 @@ namespace NzbDrone.Core.Indexers.Newznab
AddAudioPageableRequests(pageableRequests, AddAudioPageableRequests(pageableRequests,
searchCriteria, searchCriteria,
NewsnabifyTitle($"&artist={artistQuery}&album={albumQuery}")); $"&artist={NewsnabifyTitle(artistQuery)}&album={NewsnabifyTitle(albumQuery)}");
} }
if (SupportsSearch) if (SupportsSearch)
@ -107,7 +108,7 @@ namespace NzbDrone.Core.Indexers.Newznab
pageableRequests.Add(GetPagedRequests(MaxPages, pageableRequests.Add(GetPagedRequests(MaxPages,
Settings.Categories, Settings.Categories,
"search", "search",
NewsnabifyTitle($"&q={artistQuery}+{albumQuery}"))); $"&q={NewsnabifyTitle($"{artistQuery}+{albumQuery}")}"));
} }
return pageableRequests; return pageableRequests;
@ -123,7 +124,7 @@ namespace NzbDrone.Core.Indexers.Newznab
AddAudioPageableRequests(pageableRequests, AddAudioPageableRequests(pageableRequests,
searchCriteria, searchCriteria,
NewsnabifyTitle($"&artist={queryTitle}")); $"&artist={NewsnabifyTitle(queryTitle)}");
} }
if (SupportsSearch) if (SupportsSearch)
@ -134,7 +135,7 @@ namespace NzbDrone.Core.Indexers.Newznab
pageableRequests.Add(GetPagedRequests(MaxPages, pageableRequests.Add(GetPagedRequests(MaxPages,
Settings.Categories, Settings.Categories,
"search", "search",
NewsnabifyTitle($"&q={queryTitle}"))); $"&q={NewsnabifyTitle(queryTitle)}"));
} }
return pageableRequests; return pageableRequests;
@ -180,7 +181,8 @@ namespace NzbDrone.Core.Indexers.Newznab
private static string NewsnabifyTitle(string title) private static string NewsnabifyTitle(string title)
{ {
return title.Replace("+", "%20"); title = title.Replace("+", " ");
return Uri.EscapeDataString(title);
} }
} }
} }