mirror of https://github.com/Sonarr/Sonarr
Remove OMG indexer
This commit is contained in:
parent
fbe412d847
commit
ebe9215057
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +1,10 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using FizzWare.NBuilder;
|
using FizzWare.NBuilder;
|
||||||
using FluentAssertions;
|
using FluentAssertions;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using NzbDrone.Core.Indexers;
|
using NzbDrone.Core.Indexers;
|
||||||
|
using NzbDrone.Core.Indexers.FileList;
|
||||||
using NzbDrone.Core.Indexers.Newznab;
|
using NzbDrone.Core.Indexers.Newznab;
|
||||||
using NzbDrone.Core.Indexers.Omgwtfnzbs;
|
|
||||||
using NzbDrone.Core.Lifecycle;
|
using NzbDrone.Core.Lifecycle;
|
||||||
using NzbDrone.Core.Test.Framework;
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ namespace NzbDrone.Core.Test.IndexerTests
|
||||||
_indexers = new List<IIndexer>();
|
_indexers = new List<IIndexer>();
|
||||||
|
|
||||||
_indexers.Add(Mocker.Resolve<Newznab>());
|
_indexers.Add(Mocker.Resolve<Newznab>());
|
||||||
_indexers.Add(Mocker.Resolve<Omgwtfnzbs>());
|
_indexers.Add(Mocker.Resolve<FileList>());
|
||||||
|
|
||||||
Mocker.SetConstant<IEnumerable<IIndexer>>(_indexers);
|
Mocker.SetConstant<IEnumerable<IIndexer>>(_indexers);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,56 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net.Http;
|
|
||||||
using FluentAssertions;
|
|
||||||
using Moq;
|
|
||||||
using NUnit.Framework;
|
|
||||||
using NzbDrone.Common.Http;
|
|
||||||
using NzbDrone.Core.Indexers;
|
|
||||||
using NzbDrone.Core.Indexers.Omgwtfnzbs;
|
|
||||||
using NzbDrone.Core.Test.Framework;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Test.IndexerTests.OmgwtfnzbsTests
|
|
||||||
{
|
|
||||||
[TestFixture]
|
|
||||||
public class OmgwtfnzbsFixture : CoreTest<Omgwtfnzbs>
|
|
||||||
{
|
|
||||||
[SetUp]
|
|
||||||
public void Setup()
|
|
||||||
{
|
|
||||||
Subject.Definition = new IndexerDefinition()
|
|
||||||
{
|
|
||||||
Name = "Omgwtfnzbs",
|
|
||||||
Settings = new OmgwtfnzbsSettings()
|
|
||||||
{
|
|
||||||
ApiKey = "xxx",
|
|
||||||
Username = "me@my.domain"
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void should_parse_recent_feed_from_omgwtfnzbs()
|
|
||||||
{
|
|
||||||
var recentFeed = ReadAllText(@"Files/Indexers/Omgwtfnzbs/Omgwtfnzbs.xml");
|
|
||||||
|
|
||||||
Mocker.GetMock<IHttpClient>()
|
|
||||||
.Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
|
|
||||||
.Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
|
|
||||||
|
|
||||||
var releases = Subject.FetchRecent();
|
|
||||||
|
|
||||||
releases.Should().HaveCount(100);
|
|
||||||
|
|
||||||
var releaseInfo = releases.First();
|
|
||||||
|
|
||||||
releaseInfo.Title.Should().Be("Stephen.Fry.Gadget.Man.S01E05.HDTV.x264-C4TV");
|
|
||||||
releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
|
|
||||||
releaseInfo.DownloadUrl.Should().Be("http://api.omgwtfnzbs.org/sn.php?id=OAl4g&user=nzbdrone&api=nzbdrone");
|
|
||||||
releaseInfo.InfoUrl.Should().Be("http://omgwtfnzbs.org/details.php?id=OAl4g");
|
|
||||||
releaseInfo.CommentUrl.Should().BeNullOrEmpty();
|
|
||||||
releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
|
|
||||||
releaseInfo.PublishDate.Should().Be(DateTime.Parse("2012/12/17 23:30:13"));
|
|
||||||
releaseInfo.Size.Should().Be(236822906);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
using FluentMigrator;
|
||||||
|
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore.Migration
|
||||||
|
{
|
||||||
|
[Migration(173)]
|
||||||
|
public class remove_omg : NzbDroneMigrationBase
|
||||||
|
{
|
||||||
|
protected override void MainDbUpgrade()
|
||||||
|
{
|
||||||
|
Execute.Sql("DELETE FROM Indexers WHERE Implementation = 'Omgwtfnzbs'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -48,7 +48,6 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||||
yield return GetDefinition("NZBFinder.ws", GetSettings("https://nzbfinder.ws", categories: new[] { 5010, 5030, 5040, 5045, 5090 }));
|
yield return GetDefinition("NZBFinder.ws", GetSettings("https://nzbfinder.ws", categories: new[] { 5010, 5030, 5040, 5045, 5090 }));
|
||||||
yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"));
|
yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"));
|
||||||
yield return GetDefinition("nzbplanet.net", GetSettings("https://api.nzbplanet.net"));
|
yield return GetDefinition("nzbplanet.net", GetSettings("https://api.nzbplanet.net"));
|
||||||
yield return GetDefinition("omgwtfnzbs", GetSettings("https://api.omgwtfnzbs.me"));
|
|
||||||
yield return GetDefinition("OZnzb.com", GetSettings("https://api.oznzb.com"));
|
yield return GetDefinition("OZnzb.com", GetSettings("https://api.oznzb.com"));
|
||||||
yield return GetDefinition("SimplyNZBs", GetSettings("https://simplynzbs.com"));
|
yield return GetDefinition("SimplyNZBs", GetSettings("https://simplynzbs.com"));
|
||||||
yield return GetDefinition("Tabula Rasa", GetSettings("https://www.tabula-rasa.pw", apiPath: @"/api/v1/api"));
|
yield return GetDefinition("Tabula Rasa", GetSettings("https://www.tabula-rasa.pw", apiPath: @"/api/v1/api"));
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
using NLog;
|
|
||||||
using NzbDrone.Common.Http;
|
|
||||||
using NzbDrone.Core.Configuration;
|
|
||||||
using NzbDrone.Core.Parser;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Indexers.Omgwtfnzbs
|
|
||||||
{
|
|
||||||
public class Omgwtfnzbs : HttpIndexerBase<OmgwtfnzbsSettings>
|
|
||||||
{
|
|
||||||
public override string Name => "omgwtfnzbs";
|
|
||||||
|
|
||||||
public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
|
|
||||||
|
|
||||||
public Omgwtfnzbs(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
|
|
||||||
: base(httpClient, indexerStatusService, configService, parsingService, logger)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override IIndexerRequestGenerator GetRequestGenerator()
|
|
||||||
{
|
|
||||||
return new OmgwtfnzbsRequestGenerator() { Settings = Settings };
|
|
||||||
}
|
|
||||||
|
|
||||||
public override IParseIndexerResponse GetParser()
|
|
||||||
{
|
|
||||||
return new OmgwtfnzbsRssParser();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,119 +0,0 @@
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
using NzbDrone.Common.Extensions;
|
|
||||||
using NzbDrone.Common.Http;
|
|
||||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Indexers.Omgwtfnzbs
|
|
||||||
{
|
|
||||||
public class OmgwtfnzbsRequestGenerator : IIndexerRequestGenerator
|
|
||||||
{
|
|
||||||
public string BaseUrl { get; set; }
|
|
||||||
public OmgwtfnzbsSettings Settings { get; set; }
|
|
||||||
|
|
||||||
public OmgwtfnzbsRequestGenerator()
|
|
||||||
{
|
|
||||||
BaseUrl = "https://rss.omgwtfnzbs.me/rss-download.php";
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IndexerPageableRequestChain GetRecentRequests()
|
|
||||||
{
|
|
||||||
var pageableRequests = new IndexerPageableRequestChain();
|
|
||||||
|
|
||||||
pageableRequests.Add(GetPagedRequests(null));
|
|
||||||
|
|
||||||
return pageableRequests;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
|
|
||||||
{
|
|
||||||
var pageableRequests = new IndexerPageableRequestChain();
|
|
||||||
|
|
||||||
foreach (var queryTitle in searchCriteria.CleanSceneTitles)
|
|
||||||
{
|
|
||||||
pageableRequests.Add(GetPagedRequests(string.Format("{0}+S{1:00}E{2:00}",
|
|
||||||
queryTitle,
|
|
||||||
searchCriteria.SeasonNumber,
|
|
||||||
searchCriteria.EpisodeNumber)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return pageableRequests;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
|
|
||||||
{
|
|
||||||
var pageableRequests = new IndexerPageableRequestChain();
|
|
||||||
|
|
||||||
foreach (var queryTitle in searchCriteria.CleanSceneTitles)
|
|
||||||
{
|
|
||||||
pageableRequests.Add(GetPagedRequests(string.Format("{0}+S{1:00}",
|
|
||||||
queryTitle,
|
|
||||||
searchCriteria.SeasonNumber)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return pageableRequests;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
|
|
||||||
{
|
|
||||||
var pageableRequests = new IndexerPageableRequestChain();
|
|
||||||
|
|
||||||
foreach (var queryTitle in searchCriteria.CleanSceneTitles)
|
|
||||||
{
|
|
||||||
pageableRequests.Add(GetPagedRequests(string.Format("{0}+{1:yyyy MM dd}",
|
|
||||||
queryTitle,
|
|
||||||
searchCriteria.AirDate)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return pageableRequests;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IndexerPageableRequestChain GetSearchRequests(DailySeasonSearchCriteria searchCriteria)
|
|
||||||
{
|
|
||||||
var pageableRequests = new IndexerPageableRequestChain();
|
|
||||||
|
|
||||||
foreach (var queryTitle in searchCriteria.CleanSceneTitles)
|
|
||||||
{
|
|
||||||
pageableRequests.Add(GetPagedRequests(string.Format("{0}+{1}",
|
|
||||||
queryTitle,
|
|
||||||
searchCriteria.Year)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return pageableRequests;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IndexerPageableRequestChain GetSearchRequests(AnimeEpisodeSearchCriteria searchCriteria)
|
|
||||||
{
|
|
||||||
return new IndexerPageableRequestChain();
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IndexerPageableRequestChain GetSearchRequests(SpecialEpisodeSearchCriteria searchCriteria)
|
|
||||||
{
|
|
||||||
var pageableRequests = new IndexerPageableRequestChain();
|
|
||||||
|
|
||||||
foreach (var queryTitle in searchCriteria.EpisodeQueryTitles)
|
|
||||||
{
|
|
||||||
var query = queryTitle.Replace('+', ' ');
|
|
||||||
query = System.Web.HttpUtility.UrlEncode(query);
|
|
||||||
|
|
||||||
pageableRequests.Add(GetPagedRequests(query));
|
|
||||||
}
|
|
||||||
|
|
||||||
return pageableRequests;
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<IndexerRequest> GetPagedRequests(string query)
|
|
||||||
{
|
|
||||||
var url = new StringBuilder();
|
|
||||||
url.AppendFormat("{0}?catid=19,20,30&user={1}&api={2}&eng=1&delay={3}", BaseUrl, Settings.Username, Settings.ApiKey, Settings.Delay);
|
|
||||||
|
|
||||||
if (query.IsNotNullOrWhiteSpace())
|
|
||||||
{
|
|
||||||
url = url.Replace("rss-download.php", "rss-search.php");
|
|
||||||
url.AppendFormat("&search={0}", query);
|
|
||||||
}
|
|
||||||
|
|
||||||
yield return new IndexerRequest(url.ToString(), HttpAccept.Rss);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,50 +0,0 @@
|
||||||
using System.Linq;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using System.Xml.Linq;
|
|
||||||
using NzbDrone.Common.Extensions;
|
|
||||||
using NzbDrone.Core.Indexers.Exceptions;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Indexers.Omgwtfnzbs
|
|
||||||
{
|
|
||||||
public class OmgwtfnzbsRssParser : RssParser
|
|
||||||
{
|
|
||||||
public OmgwtfnzbsRssParser()
|
|
||||||
{
|
|
||||||
UseEnclosureUrl = true;
|
|
||||||
UseEnclosureLength = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override bool PreProcess(IndexerResponse indexerResponse)
|
|
||||||
{
|
|
||||||
var xdoc = LoadXmlDocument(indexerResponse);
|
|
||||||
var notice = xdoc.Descendants("notice").FirstOrDefault();
|
|
||||||
|
|
||||||
if (notice == null)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!notice.Value.ContainsIgnoreCase("api"))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new ApiKeyException(notice.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override string GetInfoUrl(XElement item)
|
|
||||||
{
|
|
||||||
//Todo: Me thinks I need to parse details to get this...
|
|
||||||
var match = Regex.Match(item.Description(),
|
|
||||||
@"(?:\<b\>View NZB\:\<\/b\>\s\<a\shref\=\"")(?<URL>.+)(?:\""\starget)",
|
|
||||||
RegexOptions.IgnoreCase | RegexOptions.Compiled);
|
|
||||||
|
|
||||||
if (match.Success)
|
|
||||||
{
|
|
||||||
return match.Groups["URL"].Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Empty;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,44 +0,0 @@
|
||||||
using FluentValidation;
|
|
||||||
using NzbDrone.Core.Annotations;
|
|
||||||
using NzbDrone.Core.ThingiProvider;
|
|
||||||
using NzbDrone.Core.Validation;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Indexers.Omgwtfnzbs
|
|
||||||
{
|
|
||||||
public class OmgwtfnzbsSettingsValidator : AbstractValidator<OmgwtfnzbsSettings>
|
|
||||||
{
|
|
||||||
public OmgwtfnzbsSettingsValidator()
|
|
||||||
{
|
|
||||||
RuleFor(c => c.Username).NotEmpty();
|
|
||||||
RuleFor(c => c.ApiKey).NotEmpty();
|
|
||||||
RuleFor(c => c.Delay).GreaterThanOrEqualTo(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class OmgwtfnzbsSettings : IIndexerSettings
|
|
||||||
{
|
|
||||||
private static readonly OmgwtfnzbsSettingsValidator Validator = new OmgwtfnzbsSettingsValidator();
|
|
||||||
|
|
||||||
public OmgwtfnzbsSettings()
|
|
||||||
{
|
|
||||||
Delay = 30;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unused since Omg has a hardcoded url.
|
|
||||||
public string BaseUrl { get; set; }
|
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "Username", Privacy = PrivacyLevel.UserName)]
|
|
||||||
public string Username { get; set; }
|
|
||||||
|
|
||||||
[FieldDefinition(1, Label = "API Key", Privacy = PrivacyLevel.ApiKey)]
|
|
||||||
public string ApiKey { get; set; }
|
|
||||||
|
|
||||||
[FieldDefinition(2, Label = "Delay", HelpText = "Time in minutes to delay new nzbs before they appear on the RSS feed", Advanced = true)]
|
|
||||||
public int Delay { get; set; }
|
|
||||||
|
|
||||||
public NzbDroneValidationResult Validate()
|
|
||||||
{
|
|
||||||
return new NzbDroneValidationResult(Validator.Validate(this));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue