shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-10-03 09:09:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove FetchRecent, Pass Cats back on Newznab Search

Browse Source
This commit is contained in:
Qstick
2020-11-18 16:46:24 -05:00
parent 6100adc515
commit 710b4f5ec6
22 changed files with 70 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/NzbDrone.Core/Datastore/Migration/001_initial_setup.cs
View File

@@ -87,7 +87,8 @@ namespace NzbDrone.Core.Datastore.Migration
.WithColumn("EscalationLevel").AsInt32().NotNullable()
.WithColumn("DisabledTill").AsDateTime().Nullable()
.WithColumn("LastRssSyncReleaseInfo").AsString().Nullable()
.WithColumn("Cookies").AsString().WithDefaultValue("{}");
.WithColumn("Cookies").AsString().Nullable()
.WithColumn("CookiesExpirationDate").AsDateTime().Nullable();
Create.TableForModel("CustomFilters")
.WithColumn("Type").AsString().NotNullable()

1
src/NzbDrone.Core/IndexerSearch/NewznabResults.cs
View File

@@ -72,6 +72,7 @@ namespace NzbDrone.Core.IndexerSearch
new XElement("guid", r.Guid), // GUID and (Link or Magnet) are mandatory
new XElement("prowlarrindexer", new XAttribute("id", r.IndexerId), r.Indexer),
r.PublishDate == DateTime.MinValue ? new XElement("pubDate", XmlDateFormat(DateTime.Now)) : new XElement("pubDate", XmlDateFormat(r.PublishDate)),
r.Category == null ? null : from c in r.Category select new XElement("category", c),
new XElement("size", r.Size),
new XElement(
"enclosure",

12
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
View File

@@ -186,13 +186,14 @@ namespace NzbDrone.Core.Indexers.Cardigann
return variables;
}
/*
protected ICollection<int> MapTrackerCatToNewznab(string input)
{
if (input == null)
{
return new List<int>();
}
var cats = categoryMapping.Where(m => m.TrackerCategory != null && m.TrackerCategory.ToLowerInvariant() == input.ToLowerInvariant()).Select(c => c.NewzNabCategory).ToList();
var cats = _definition.Caps.Categorymappings.Where(m => m.id != null && m.id.ToLowerInvariant() == input.ToLowerInvariant()).Select(c => TorznabCatType.GetCatByName(c.cat).Id).ToList();
// 1:1 category mapping
try
@@ -206,12 +207,17 @@ namespace NzbDrone.Core.Indexers.Cardigann
}
return cats;
}*/
}
public List<string> MapTorznabCapsToTrackers(int[] searchCategories, bool mapChildrenCatsToParent = false)
{
var queryCats = new List<string>();
if (searchCategories == null)
{
return queryCats;
}
foreach (var searchCat in searchCategories)
{
var match = TorznabCatType.AllCats.FirstOrDefault(c => c.Id == searchCat);

6
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
View File

@@ -199,8 +199,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
value = release.Description;
break;
case "category":
// var cats = MapTrackerCatToNewznab(value);
var cats = new List<int> { 2000 };
var cats = MapTrackerCatToNewznab(value);
if (cats.Any())
{
if (release.Category == null || fieldModifiers.Contains("noappend"))
@@ -482,7 +481,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
MagnetUrl = x.MagnetUri?.ToString(),
InfoHash = x.InfoHash,
Seeders = (int?)x.Seeders,
Peers = (int?)x.Peers
Peers = (int?)x.Peers,
Category = x.Category
}));
_logger.Debug($"Got {result.Count} releases");

7
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
View File

@@ -30,6 +30,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
var variables = GetBaseTemplateVariables();
variables[".Query.Type"] = null;
variables[".Query.Q"] = null;
variables[".Query.Categories"] = null;
variables[".Query.IMDBID"] = null;
variables[".Query.IMDBIDShort"] = null;
variables[".Query.TMDBID"] = null;
pageableRequests.Add(GetRequest(variables));
return pageableRequests;

13
src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs
View File

@@ -13,13 +13,6 @@ namespace NzbDrone.Core.Indexers.FileList
public Func<IDictionary<string, string>> GetCookies { get; set; }
public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
public virtual IndexerPageableRequestChain GetRecentRequests()
{
var pageableRequests = new IndexerPageableRequestChain();
pageableRequests.Add(GetRequest("latest-torrents", ""));
return pageableRequests;
}
public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
{
var pageableRequests = new IndexerPageableRequestChain();
@@ -28,11 +21,15 @@ namespace NzbDrone.Core.Indexers.FileList
{
pageableRequests.Add(GetRequest("search-torrents", string.Format("&type=imdb&query={0}", searchCriteria.ImdbId)));
}
else
else if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
{
var titleYearSearchQuery = string.Format("{0}", searchCriteria.SearchTerm);
pageableRequests.Add(GetRequest("search-torrents", string.Format("&type=name&query={0}", titleYearSearchQuery.Trim())));
}
else
{
pageableRequests.Add(GetRequest("latest-torrents", ""));
}
return pageableRequests;
}

77
src/NzbDrone.Core/Indexers/FetchAndParseRssService.cs
View File

@@ -1,77 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using NLog;
using NzbDrone.Common.TPL;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Indexers
{
public interface IFetchAndParseRss
{
List<ReleaseInfo> Fetch();
}
public class FetchAndParseRssService : IFetchAndParseRss
{
private readonly IIndexerFactory _indexerFactory;
private readonly Logger _logger;
public FetchAndParseRssService(IIndexerFactory indexerFactory, Logger logger)
{
_indexerFactory = indexerFactory;
_logger = logger;
}
public List<ReleaseInfo> Fetch()
{
var result = new List<ReleaseInfo>();
var indexers = _indexerFactory.RssEnabled();
if (!indexers.Any())
{
_logger.Warn("No available indexers. check your configuration.");
return result;
}
_logger.Debug("Available indexers {0}", indexers.Count);
var taskList = new List<Task>();
var taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.None);
foreach (var indexer in indexers)
{
var indexerLocal = indexer;
var task = taskFactory.StartNew(() =>
{
try
{
var indexerReports = indexerLocal.FetchRecent();
lock (result)
{
_logger.Debug("Found {0} from {1}", indexerReports.Count, indexer.Name);
result.AddRange(indexerReports);
}
}
catch (Exception e)
{
_logger.Error(e, "Error during RSS Sync");
}
}).LogExceptions();
taskList.Add(task);
}
Task.WaitAll(taskList.ToArray());
_logger.Debug("Found {0} reports", result.Count);
return result;
}
}
}

14
src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
View File

@@ -39,16 +39,6 @@ namespace NzbDrone.Core.Indexers
_httpClient = httpClient;
}
public override IList<ReleaseInfo> FetchRecent()
{
if (!SupportsRss)
{
return new List<ReleaseInfo>();
}
return FetchReleases(g => g.GetRecentRequests(), true);
}
public override IList<ReleaseInfo> Fetch(MovieSearchCriteria searchCriteria)
{
if (!SupportsSearch)
@@ -76,7 +66,7 @@ namespace NzbDrone.Core.Indexers
return cookies;
};
var requests = searchCriteria == null ? generator.GetRecentRequests() : generator.GetSearchRequests(searchCriteria as MovieSearchCriteria);
var requests = generator.GetSearchRequests(searchCriteria as MovieSearchCriteria);
generator.CookiesUpdater = (cookies, expiration) =>
{
@@ -322,7 +312,7 @@ namespace NzbDrone.Core.Indexers
_indexerStatusService.UpdateCookies(Definition.Id, cookies, expiration);
};
var generator = GetRequestGenerator();
var releases = FetchPage(generator.GetRecentRequests().GetAllTiers().First().First(), parser);
var releases = FetchPage(generator.GetSearchRequests(new MovieSearchCriteria()).GetAllTiers().First().First(), parser);
if (releases.Empty())
{

1
src/NzbDrone.Core/Indexers/IIndexer.cs
View File

@@ -14,7 +14,6 @@ namespace NzbDrone.Core.Indexers
DownloadProtocol Protocol { get; }
IndexerPrivacy Privacy { get; }
IList<ReleaseInfo> FetchRecent();
IList<ReleaseInfo> Fetch(MovieSearchCriteria searchCriteria);
}
}

1
src/NzbDrone.Core/Indexers/IIndexerRequestGenerator.cs
View File

@@ -6,7 +6,6 @@ namespace NzbDrone.Core.Indexers
{
public interface IIndexerRequestGenerator
{
IndexerPageableRequestChain GetRecentRequests();
IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria);
Func<IDictionary<string, string>> GetCookies { get; set; }
Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }

1
src/NzbDrone.Core/Indexers/IndexerBase.cs
View File

@@ -65,7 +65,6 @@ namespace NzbDrone.Core.Indexers
protected TSettings Settings => (TSettings)Definition.Settings;
public abstract IList<ReleaseInfo> FetchRecent();
public abstract IList<ReleaseInfo> Fetch(MovieSearchCriteria searchCriteria);
protected virtual IList<ReleaseInfo> CleanupReleases(IEnumerable<ReleaseInfo> releases)

2
src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Text;
using NzbDrone.Core.Indexers;
@@ -27,6 +28,7 @@ namespace NzbDrone.Core.Parser.Model
public string Container { get; set; }
public string Codec { get; set; }
public string Resolution { get; set; }
public ICollection<int> Category { get; set; }
public IndexerFlags IndexerFlags { get; set; }