tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-26 22:46:37 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Can now specify a cookie for BitMeTv.

Browse Source
This commit is contained in:
Taloth Saldono
2015-03-14 16:06:46 +01:00
parent d1ce1bf218
commit 96469be7f0
5 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Indexers/BitMeTv/BitMeTvRequestGenerator.cs
+7 -3
View File
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Indexers.BitMeTv
{
var pageableRequests = new List<IEnumerable<IndexerRequest>>();
pageableRequests.AddIfNotNull(GetRssRequests(null));
pageableRequests.AddIfNotNull(GetRssRequests());
return pageableRequests;
}
@@ -44,9 +44,13 @@ namespace NzbDrone.Core.Indexers.BitMeTv
return new List<IEnumerable<IndexerRequest>>();
}
private IEnumerable<IndexerRequest> GetRssRequests(String searchParameters)
private IEnumerable<IndexerRequest> GetRssRequests()
{
yield return new IndexerRequest(String.Format("{0}/rss.php?uid={1}&passkey={2}{3}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.UserId, Settings.RssPasskey, searchParameters), HttpAccept.Html);
var request = new IndexerRequest(String.Format("{0}/rss.php?uid={1}&passkey={2}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.UserId, Settings.RssPasskey), HttpAccept.Html);
request.HttpRequest.AddCookie(Settings.Cookie);
yield return request;
}
}
}
src/NzbDrone.Core/Indexers/BitMeTv/BitMeTvSettings.cs
+12 -1
View File
@@ -1,4 +1,5 @@
using System;
using System.Text.RegularExpressions;
using FluentValidation;
using FluentValidation.Results;
using NzbDrone.Core.Annotations;
@@ -14,6 +15,13 @@ namespace NzbDrone.Core.Indexers.BitMeTv
RuleFor(c => c.BaseUrl).ValidRootUrl();
RuleFor(c => c.UserId).NotEmpty();
RuleFor(c => c.RssPasskey).NotEmpty();
RuleFor(c => c.Cookie).NotEmpty();
RuleFor(c => c.Cookie)
.Matches(@"pass=[0-9a-f]{32}", RegexOptions.IgnoreCase)
.WithMessage("Wrong pattern")
.AsWarning();
}
}
@@ -23,7 +31,7 @@ namespace NzbDrone.Core.Indexers.BitMeTv
public BitMeTvSettings()
{
BaseUrl = "http://www.bitmetv.org";
BaseUrl = "https://www.bitmetv.org";
}
[FieldDefinition(0, Label = "Website URL")]
@@ -35,6 +43,9 @@ namespace NzbDrone.Core.Indexers.BitMeTv
[FieldDefinition(2, Label = "RSS Passkey")]
public String RssPasskey { get; set; }
[FieldDefinition(3, Label = "Cookie", HelpText = "BitMeTv uses a login cookie needed to access the rss, you'll have to retrieve it via a browser.")]
public String Cookie { get; set; }
public ValidationResult Validate()
{
return validator.Validate(this);