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

assorted: remove configuration data with RSS (#14270)

Browse Source
This commit is contained in:
Bogdan
2023-04-24 08:24:40 +03:00
committed by GitHub
parent 4a1ac032ce
commit c934fcdf5a
7 changed files with 12 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Jackett.Common/Indexers/DarmoweTorrenty.cs
View File

@@ -39,9 +39,9 @@ namespace Jackett.Common.Indexers
private static readonly Regex _DateRegex = new Regex("Dodano: (\\d{2}\\/\\d{2}\\/\\d{4})", RegexOptions.Compiled);
private static readonly Regex _SeedsRegex = new Regex("Seedów: (\\d+)", RegexOptions.Compiled);
private static readonly Regex _LeechersRegex = new Regex("Leecherów: (\\d+)", RegexOptions.Compiled);
private new ConfigurationDataBasicLoginWithRSSAndDisplay configData
private new ConfigurationDataBasicLogin configData
{
get => (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData;
get => (ConfigurationDataBasicLogin)base.configData;
set => base.configData = value;
}
@@ -52,7 +52,7 @@ namespace Jackett.Common.Indexers
logger: l,
p: ps,
cacheService: cs,
configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
configData: new ConfigurationDataBasicLogin())
{
}

10
src/Jackett.Common/Indexers/PirateTheNet.cs
View File

@@ -34,9 +34,9 @@ namespace Jackett.Common.Indexers
private string LoginUrl => SiteLink + "takelogin.php";
private string CaptchaUrl => SiteLink + "simpleCaptcha.php?numImages=1";
private new ConfigurationDataBasicLoginWithRSSAndDisplay configData
private new ConfigurationDataBasicLogin configData
{
get => (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData;
get => (ConfigurationDataBasicLogin)base.configData;
set => base.configData = value;
}
@@ -47,7 +47,7 @@ namespace Jackett.Common.Indexers
logger: l,
p: ps,
cacheService: cs,
configData: new ConfigurationDataBasicLoginWithRSSAndDisplay("Only the results from the first search result page are shown, adjust your profile settings to show the maximum."))
configData: new ConfigurationDataBasicLogin("Only the results from the first search result page are shown, adjust your profile settings to show the maximum."))
{
}
@@ -98,8 +98,8 @@ namespace Jackett.Common.Indexers
var result2 = await RequestLoginAndFollowRedirect(LoginUrl, pairs, result1.Cookies, true, null, null, true);
await ConfigureIfOK(result2.Cookies, result2.ContentString.Contains("logout.php"), () =>
throw new ExceptionWithConfigData("Login Failed", configData));
await ConfigureIfOK(result2.Cookies, result2.ContentString.Contains("logout.php"), () => throw new ExceptionWithConfigData("Login Failed", configData));
return IndexerConfigurationStatus.RequiresTesting;
}

11
src/Jackett.Common/Indexers/Shazbat.cs
View File

@@ -32,7 +32,6 @@ namespace Jackett.Common.Indexers
private string SearchUrl => SiteLink + "search";
private string TorrentsUrl => SiteLink + "torrents";
private string ShowUrl => SiteLink + "show";
private string RSSProfile => SiteLink + "rss_feeds";
private new ConfigurationDataShazbat configData => (ConfigurationDataShazbat)base.configData;
@@ -87,16 +86,6 @@ namespace Jackett.Common.Indexers
throw new ExceptionWithConfigData("The username and password entered do not match.", configData);
});
var rssProfile = await RequestWithCookiesAndRetryAsync(RSSProfile);
var parser = new HtmlParser();
var rssDom = parser.ParseDocument(rssProfile.ContentString);
configData.RSSKey.Value = rssDom.QuerySelector(".col-sm-9:nth-of-type(1)")?.TextContent.Trim();
if (string.IsNullOrWhiteSpace(configData.RSSKey.Value))
throw new ExceptionWithConfigData("Failed to find RSS key.", configData);
SaveConfig();
return IndexerConfigurationStatus.RequiresTesting;
}

6
src/Jackett.Common/Indexers/TorrentNetwork.cs
View File

@@ -36,9 +36,9 @@ namespace Jackett.Common.Indexers
{"Content-Type", "application/json"}
};
private new ConfigurationDataBasicLoginWithRSSAndDisplay configData
private new ConfigurationDataBasicLogin configData
{
get => (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData;
get => (ConfigurationDataBasicLogin)base.configData;
set => base.configData = value;
}
@@ -48,7 +48,7 @@ namespace Jackett.Common.Indexers
logger: l,
p: ps,
cacheService: cs,
configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
configData: new ConfigurationDataBasicLogin())
{
configData.AddDynamic("token", new HiddenStringConfigurationItem("token"));
configData.AddDynamic("passkey", new HiddenStringConfigurationItem("passkey"));

2
src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataShazbat.cs
View File

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
namespace Jackett.Common.Models.IndexerConfig.Bespoke
{
[ExcludeFromCodeCoverage]
internal class ConfigurationDataShazbat : ConfigurationDataBasicLoginWithRSS
internal class ConfigurationDataShazbat : ConfigurationDataBasicLogin
{
public SingleSelectConfigurationItem ShowPagesFetchLimit { get; private set; }

16
src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs
View File

@@ -1,16 +0,0 @@
namespace Jackett.Common.Models.IndexerConfig
{
public class ConfigurationDataBasicLoginWithRSS : ConfigurationData
{
public StringConfigurationItem Username { get; private set; }
public StringConfigurationItem Password { get; private set; }
public HiddenStringConfigurationItem RSSKey { get; private set; }
public ConfigurationDataBasicLoginWithRSS()
{
Username = new StringConfigurationItem("Username");
Password = new StringConfigurationItem("Password");
RSSKey = new HiddenStringConfigurationItem("RSSKey");
}
}
}

18
src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs
View File

@@ -1,18 +0,0 @@
namespace Jackett.Common.Models.IndexerConfig
{
public class ConfigurationDataBasicLoginWithRSSAndDisplay : ConfigurationData
{
public StringConfigurationItem Username { get; private set; }
public StringConfigurationItem Password { get; private set; }
public HiddenStringConfigurationItem RSSKey { get; private set; }
public DisplayInfoConfigurationItem Instructions { get; private set; }
public ConfigurationDataBasicLoginWithRSSAndDisplay(string instructionMessageOptional = null)
{
Username = new StringConfigurationItem("Username");
Password = new StringConfigurationItem("Password");
RSSKey = new HiddenStringConfigurationItem("RSSKey");
Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
}
}
}