shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-30 23:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

PassThePopcorn: fix downloading torrents (#9532) resolves #8927

Browse Source
This commit is contained in:
seeyabye
2020-10-01 09:34:40 +09:00
committed by GitHub
parent d4eed17168
commit 218c4dfe3f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Jackett.Common/Indexers/PassThePopcorn.cs
View File

@@ -22,6 +22,7 @@ namespace Jackett.Common.Indexers
{
private static string SearchUrl => "https://passthepopcorn.me/torrents.php";
private string AuthKey { get; set; }
private string PassKey { get; set; }
// TODO: merge ConfigurationDataAPILoginWithUserAndPasskeyAndFilter class with with ConfigurationDataUserPasskey
private new ConfigurationDataAPILoginWithUserAndPasskeyAndFilter configData
@@ -123,6 +124,10 @@ namespace Jackett.Common.Indexers
{
//Iterate over the releases for each movie
var jsResults = JObject.Parse(results.ContentString);
AuthKey = (string)jsResults["AuthKey"];
PassKey = (string)jsResults["PassKey"];
foreach (var movie in jsResults["Movies"])
{
var movieTitle = (string)movie["Title"];
@@ -142,7 +147,7 @@ namespace Jackett.Common.Indexers
{"action", "download"},
{"id", torrentId},
{"authkey", AuthKey},
{"torrent_pass", configData.Passkey.Value},
{"torrent_pass", PassKey},
};
var free = !(torrent["FreeleechType"] is null);

3
src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPILoginWithUserAndPasskeyAndFilter.cs
View File

@@ -2,7 +2,6 @@ namespace Jackett.Common.Models.IndexerConfig
{
public class ConfigurationDataAPILoginWithUserAndPasskeyAndFilter : ConfigurationData
{
public StringItem Passkey { get; private set; }
public DisplayItem KeyHint { get; private set; }
public StringItem User { get; private set; }
public StringItem Key { get; private set; }
@@ -11,8 +10,6 @@ namespace Jackett.Common.Models.IndexerConfig
public ConfigurationDataAPILoginWithUserAndPasskeyAndFilter(string FilterInstructions)
{
Passkey = new StringItem { Name = "Passkey", Value = string.Empty };
KeyHint = new DisplayItem("<ul><li>Visit the security tab on your user settings page to access your ApiUser and ApiKey <li>If you haven't yet generated a key, you may have to first generate one using the checkbox below your keys</ul>")
{
Name = "API Authentication"