From f393a9550193c7d0379f563f8a54bdab02aba984 Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Wed, 15 Feb 2017 18:02:24 -0500
Subject: [PATCH] Small consistancy updates to PTP and AwesomeHD (#758)
---
.../AwesomeHD/AwesomeHDRequestGenerator.cs | 52 +++++++--------
.../PassThePopcornRequestGenerator.cs | 66 ++++++++-----------
2 files changed, 54 insertions(+), 64 deletions(-)
diff --git a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs
index 73b36335b..b1c7db679 100644
--- a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs
@@ -14,37 +14,10 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
public virtual IndexerPageableRequestChain GetRecentRequests()
{
var pageableRequests = new IndexerPageableRequestChain();
-
pageableRequests.Add(GetRequest(null));
-
return pageableRequests;
}
- public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
{
var pageableRequests = new IndexerPageableRequestChain();
@@ -70,5 +43,30 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
}
}
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
}
}
diff --git a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs
index 900bc8289..9127860eb 100644
--- a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs
@@ -17,14 +17,6 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
public IHttpClient HttpClient { get; set; }
public Logger Logger { get; set; }
- //public PassThePopcornRequestGenerator(ICacheManager cacheManager, IHttpClient httpClient, Logger logger)
- //{
- // _httpClient = httpClient;
- // _logger = logger;
-
- // _authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
- //}
-
public virtual IndexerPageableRequestChain GetRecentRequests()
{
var pageableRequests = new IndexerPageableRequestChain();
@@ -41,31 +33,6 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
return pageableRequests;
}
- public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
- {
- return new IndexerPageableRequestChain();
- }
-
private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
{
Authenticate();
@@ -79,9 +46,9 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
}
}
- var request =
+ var request =
new IndexerRequest(
- $"{Settings.BaseUrl.Trim().TrimEnd('/')}/torrents.php??action=advanced&json=noredirect&searchstr={searchParameters}{filter}",
+ $"{Settings.BaseUrl.Trim().TrimEnd('/')}/torrents.php?action=advanced&json=noredirect&searchstr={searchParameters}{filter}",
HttpAccept.Json);
var cookies = AuthCookieCache.Find(Settings.BaseUrl.Trim().TrimEnd('/'));
@@ -120,8 +87,6 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
.Accept(HttpAccept.Json)
.Build();
- // authLoginRequest.Method = HttpMethod.POST;
-
var response = HttpClient.Execute(authLoginRequest);
var result = Json.Deserialize<PassThePopcornAuthResponse>(response.Content);
@@ -142,5 +107,32 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
requestBuilder.SetCookies(cookies);
}
}
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+ public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
+ {
+ return new IndexerPageableRequestChain();
+ }
+
+
}
}