diff --git a/src/NzbDrone.Core.Test/Files/Indexers/BitMeTv/BitMeTv.xml b/src/NzbDrone.Core.Test/Files/Indexers/BitMeTv/BitMeTv.xml
deleted file mode 100644
index 345c51c87..000000000
--- a/src/NzbDrone.Core.Test/Files/Indexers/BitMeTv/BitMeTv.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
- 10
- BitMeTV.ORG
- http://www.bitmetv.org
- This is a private - by registration only - website. You can help keep it alive by donating: http://www.bitmetv.org/donate.php
- en-usde
- Copyright © 2004 - 2007 BitMeTV.ORG
- noreply@bitmetv.org
-
- BitMeTV.ORG
- http://www.bitmetv.org/favicon.ico
- http://www.bitmetv.org
- 16
- 16
- This is a private - by registration only - website. You can help keep it alive by donating: http://www.bitmetv.org/donate.php
-
- -
- Total.Divas.S02E08.HDTV.x264-CRiMSON
- http://www.bitmetv.org/download.php/12/Total.Divas.S02E08.HDTV.x264-CRiMSON.torrent
- Tue, 13 May 2014 17:04:29 -0000
-
- Category: (Reality TV - Un-scripted)
- Size: 376.71 MB
-
-
- -
- Aqua.Teen.Hunger.Force.S10.INTERNAL.HDTV.x264-BitMeTV
- http://www.bitmetv.org/download.php/34/Aqua.Teen.Hunger.Force.S10.INTERNAL.HDTV.x264-BitMeTV.torrent
- Tue, 13 May 2014 17:03:12 -0000
-
- Category: (Adult Swim)
- Size: 725.46 MB
-
-
- -
- Antiques.Roadshow.US.S18E16.720p.HDTV.x264-BAJSKORV
- http://www.bitmetv.org/download.php/56/Antiques.Roadshow.US.S18E16.720p.HDTV.x264-BAJSKORV.torrent
- Tue, 13 May 2014 16:47:05 -0000
-
- Category: (Reality TV - Un-scripted)
- Size: 960.15 MB
-
-
- -
- Seth.Meyers.2014.05.12.Chris.O.Dowd-Emma.Roberts.HDTV.x264-CROOKS
- http://www.bitmetv.org/download.php/78/Seth.Meyers.2014.05.12.Chris.O.Dowd-Emma.Roberts.HDTV.x264-CROOKS.torrent
- Tue, 13 May 2014 16:01:21 -0000
-
- Category: Seth Meyers
- Size: 301.31 MB
-
-
- -
- The.Mole.Australia.Season.4
- http://www.bitmetv.org/download.php/910/The%20Mole%20Australia%20-%20Season%204.torrent
- Tue, 13 May 2014 15:52:54 -0000
-
- Category: (Reality TV - Competitive)
- Size: 2.13 GB
-
-
-
-
diff --git a/src/NzbDrone.Core.Test/Files/Indexers/BroadcastheNet/RecentFeed.json b/src/NzbDrone.Core.Test/Files/Indexers/BroadcastheNet/RecentFeed.json
deleted file mode 100644
index 9ac55ee7c..000000000
--- a/src/NzbDrone.Core.Test/Files/Indexers/BroadcastheNet/RecentFeed.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-"id":"9787693d",
-"result":{
-"torrents":{
-"123":{
-"GroupName":"2014.09.15",
-"GroupID":"237457",
-"TorrentID":"123",
-"SeriesID":"1034",
-"Series":"Jimmy Kimmel Live",
-"SeriesBanner":"https:\/\/cdn2.broadcasthe.net\/tvdb\/banners\/graphical\/71998-g.jpg",
-"SeriesPoster":"https:\/\/cdn2.broadcasthe.net\/tvdb\/banners\/posters\/71998-3.jpg",
-"YoutubeTrailer":"http:\/\/www.youtube.com\/v\/w3NwB9PLxss",
-"Category":"Episode",
-"Snatched":"40",
-"Seeders":"40",
-"Leechers":"9",
-"Source":"HDTV",
-"Container":"MP4",
-"Codec":"x264",
-"Resolution":"SD",
-"Origin":"Scene",
-"ReleaseName":"Jimmy.Kimmel.2014.09.15.Jane.Fonda.HDTV.x264-aAF",
-"Size":"505099926",
-"Time":"1410902133",
-"TvdbID":"71998",
-"TvrageID":"4055",
-"ImdbID":"0320037",
-"InfoHash":"123",
-"DownloadURL":"https:\/\/broadcasthe.net\/torrents.php?action=download&id=123&authkey=123&torrent_pass=123"
-},
-"1234":{
-"GroupName":"S01E02",
-"GroupID":"237456",
-"TorrentID":"1234",
-"SeriesID":"45853",
-"Series":"Mammon",
-"SeriesBanner":"https:\/\/cdn2.broadcasthe.net\/tvdb\/banners\/text\/274366.jpg",
-"SeriesPoster":"\/\/cdn2.broadcasthe.net\/tvdb\/banners\/posters\/274366-2.jpg",
-"YoutubeTrailer":"http:\/\/www.youtube.com\/v\/1VVbJecvHr8",
-"Category":"Episode",
-"Snatched":"0",
-"Seeders":"1",
-"Leechers":"23",
-"Source":"HDTV",
-"Container":"TS",
-"Codec":"h.264",
-"Resolution":"1080i",
-"Origin":"Internal",
-"ReleaseName":"Mammon.S01E02.1080i.HDTV.H.264-Irishman",
-"Size":"4021238596",
-"Time":"1410901918",
-"TvdbID":"274366",
-"TvrageID":"38472",
-"ImdbID":"2377081",
-"InfoHash":"1234",
-"DownloadURL":"https:\/\/broadcasthe.net\/torrents.php?action=download&id=1234&authkey=1234&torrent_pass=1234"
-}},
-"results":"117927"
-}
-}
\ No newline at end of file
diff --git a/src/NzbDrone.Core.Test/Files/Indexers/Fanzub/fanzub.xml b/src/NzbDrone.Core.Test/Files/Indexers/Fanzub/fanzub.xml
deleted file mode 100644
index bd4175086..000000000
--- a/src/NzbDrone.Core.Test/Files/Indexers/Fanzub/fanzub.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- Anime :: Fanzub
- http://www.fanzub.com/
- A Usenet Search Engine for Japanese Media
- en-us
-
- -
- [Vivid] Hanayamata - 10 [A33D6606]
- http://fanzub.com/nzb/296464
- <i>Age</i>: 0 days<br /><i>Size</i>: 530.48 MiB<br /><i>Parts</i>: 100%<br /><i>Files</i>: 1 other, 8 par2<br /><i>Subject</i>: [9/9] [Vivid] Hanayamata - 10 [A33D6606].vol63+27.par2 (1/28)
- Anime
- Sat, 13 Sep 2014 12:56:53 +0000
-
- http://fanzub.com/nzb/296464
-
- -
- (Sniper2000) - Pokemon HD - XY 37
- http://fanzub.com/nzb/296456
- <i>Age</i>: 0 days<br /><i>Size</i>: 2.79 GiB<br /><i>Parts</i>: 100%<br /><i>Files</i>: 1 nzb, 1 other, 77 par2, 30 rar<br /><i>Subject</i>: (Sniper2000) [108/108] - "XY 37.vol183+176.PAR2"Pokemon HD (1/272)
- Anime
- Sat, 13 Sep 2014 12:38:03 +0000
-
- http://fanzub.com/nzb/296456
-
- -
- [HorribleSubs] Kindaichi Case Files R - 23 [480p].mkv
- http://fanzub.com/nzb/296472
- <i>Age</i>: 0 days<br /><i>Size</i>: 153.87 MiB<br /><i>Parts</i>: 100%<br /><i>Files</i>: 7 par2, 6 split<br /><i>Subject</i>: [HorribleSubs] Kindaichi Case Files R - 23 [480p] [13/13] - "[HorribleSubs] Kindaichi Case Files R - 23 [480p].mkv.vol31+06.par2" yEnc (1/7)
- Anime
- Sat, 13 Sep 2014 11:51:59 +0000
-
- http://fanzub.com/nzb/296472
-
-
-
diff --git a/src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedLongIDs.json b/src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedLongIDs.json
deleted file mode 100644
index 9e4b114f7..000000000
--- a/src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedLongIDs.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "status": 0,
- "data": [
- {
- "id": 257142,
- "hash": "EABC50AEF9F53CEDED84ADF14144D3368E586F3A",
- "leechers": 1,
- "seeders": 46,
- "name": "Supernatural S10E17 1080p WEB-DL DD5.1 H.264-ECI",
- "times_completed": 49,
- "size": 1718009717,
- "utadded": 1428179446,
- "added": "2015-04-04T20:30:46+0000",
- "comments": 0,
- "numfiles": 1,
- "filename": "Supernatural.S10E17.1080p.WEB-DL.DD5.1.H.264-ECI.torrent",
- "freeleech": "no",
- "type_category": 2,
- "type_codec": 1,
- "type_medium": 6,
- "type_origin": 0,
- "username": "abc",
- "owner": 1107944,
- "tvdb": {
- "id": 78901,
- "season": 10,
- "episode": 17
- }
- },
- {
- "id": 257140,
- "hash": "BE3BA5396B9A30544353B55FDD89EDE46C8FB72A",
- "leechers": 0,
- "seeders": 18,
- "name": "Scandal S04E18 1080p WEB-DL DD5.1 H.264-ECI",
- "times_completed": 19,
- "size": 1789106197,
- "utadded": 1428179128,
- "added": "2015-04-04T20:25:28+0000",
- "comments": 0,
- "numfiles": 1,
- "filename": "Scandal.2012.S04E18.1080p.WEB-DL.DD5.1.H.264-ECI.torrent",
- "freeleech": "no",
- "type_category": 2,
- "type_codec": 1,
- "type_medium": 6,
- "type_origin": 0,
- "username": "abc",
- "owner": 1107944,
- "tvdb": {
- "id": 248841,
- "season": 4,
- "episode": 18
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedStringIDs.json b/src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedStringIDs.json
deleted file mode 100644
index 2c533f5c4..000000000
--- a/src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedStringIDs.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "status": 0,
- "data": [
- {
- "id": "257142",
- "hash": "EABC50AEF9F53CEDED84ADF14144D3368E586F3A",
- "leechers": 1,
- "seeders": 46,
- "name": "Supernatural S10E17 1080p WEB-DL DD5.1 H.264-ECI",
- "times_completed": 49,
- "size": 1718009717,
- "utadded": 1428179446,
- "added": "2015-04-04T20:30:46+0000",
- "comments": 0,
- "numfiles": 1,
- "filename": "Supernatural.S10E17.1080p.WEB-DL.DD5.1.H.264-ECI.torrent",
- "freeleech": "no",
- "type_category": 2,
- "type_codec": 1,
- "type_medium": 6,
- "type_origin": 0,
- "username": "abc",
- "owner": 1107944,
- "tvdb": {
- "id": 78901,
- "season": 10,
- "episode": 17
- }
- },
- {
- "id": "257140",
- "hash": "BE3BA5396B9A30544353B55FDD89EDE46C8FB72A",
- "leechers": 0,
- "seeders": 18,
- "name": "Scandal S04E18 1080p WEB-DL DD5.1 H.264-ECI",
- "times_completed": 19,
- "size": 1789106197,
- "utadded": 1428179128,
- "added": "2015-04-04T20:25:28+0000",
- "comments": 0,
- "numfiles": 1,
- "filename": "Scandal.2012.S04E18.1080p.WEB-DL.DD5.1.H.264-ECI.torrent",
- "freeleech": "no",
- "type_category": 2,
- "type_codec": 1,
- "type_medium": 6,
- "type_origin": 0,
- "username": "abc",
- "owner": 1107944,
- "tvdb": {
- "id": 248841,
- "season": 4,
- "episode": 18
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/src/NzbDrone.Core.Test/IndexerTests/FanzubTests/FanzubFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/FanzubTests/FanzubFixture.cs
deleted file mode 100644
index ed8587e38..000000000
--- a/src/NzbDrone.Core.Test/IndexerTests/FanzubTests/FanzubFixture.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Fanzub;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.IndexerTests.FanzubTests
-{
- [TestFixture]
- public class FanzubFixture : CoreTest
- {
- [SetUp]
- public void Setup()
- {
- Subject.Definition = new IndexerDefinition()
- {
- Name = "Fanzub",
- Settings = new FanzubSettings()
- };
- }
-
- [Test]
- public void should_parse_recent_feed_from_fanzub()
- {
- var recentFeed = ReadAllText(@"Files/Indexers/Fanzub/fanzub.xml");
-
- Mocker.GetMock()
- .Setup(o => o.Execute(It.Is(v => v.Method == HttpMethod.GET)))
- .Returns(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
- var releases = Subject.FetchRecent();
-
- releases.Should().HaveCount(3);
-
- var releaseInfo = releases.First();
-
- releaseInfo.Title.Should().Be("[Vivid] Hanayamata - 10 [A33D6606]");
- releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
- releaseInfo.DownloadUrl.Should().Be("http://fanzub.com/nzb/296464/Vivid%20Hanayamata%20-%2010.nzb");
- releaseInfo.InfoUrl.Should().BeNullOrEmpty();
- releaseInfo.CommentUrl.Should().BeNullOrEmpty();
- releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
- releaseInfo.PublishDate.Should().Be(DateTime.Parse("2014/09/13 12:56:53"));
- releaseInfo.Size.Should().Be(556246858);
- }
- }
-}
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 0cfc3eebe..f1afd11c4 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -258,7 +258,6 @@
-
@@ -441,15 +440,6 @@
Always
-
- Always
-
-
- Always
-
-
- Always
-
PreserveNewest
@@ -475,9 +465,6 @@
Designer
Always
-
- Always
-
Always
Designer
@@ -552,9 +539,6 @@
Always
-
- Always
-
Always
diff --git a/src/NzbDrone.Core/Datastore/Migration/015_remove_fanzub.cs b/src/NzbDrone.Core/Datastore/Migration/015_remove_fanzub.cs
new file mode 100644
index 000000000..75f4dc2c9
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/015_remove_fanzub.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+ [Migration(15)]
+ public class remove_fanzub : NzbDroneMigrationBase
+ {
+ protected override void MainDbUpgrade()
+ {
+ Execute.Sql("DELETE FROM Indexers WHERE Implementation = 'Fanzub';");
+ }
+ }
+}
diff --git a/src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs b/src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs
deleted file mode 100644
index fc66a83f1..000000000
--- a/src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using NLog;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Parser;
-
-namespace NzbDrone.Core.Indexers.Fanzub
-{
- public class Fanzub : HttpIndexerBase
- {
- public override string Name => "Fanzub";
-
- public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
-
- public Fanzub(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
- : base(httpClient, indexerStatusService, configService, parsingService, logger)
- {
-
- }
-
- public override IIndexerRequestGenerator GetRequestGenerator()
- {
- return new FanzubRequestGenerator() { Settings = Settings };
- }
-
- public override IParseIndexerResponse GetParser()
- {
- return new RssParser() { UseEnclosureUrl = true, UseEnclosureLength = true };
- }
- }
-}
diff --git a/src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs
deleted file mode 100644
index 07012107d..000000000
--- a/src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.IndexerSearch.Definitions;
-
-namespace NzbDrone.Core.Indexers.Fanzub
-{
- public class FanzubRequestGenerator : IIndexerRequestGenerator
- {
- private static readonly Regex RemoveCharactersRegex = new Regex(@"[!?`]", RegexOptions.Compiled);
-
- public FanzubSettings Settings { get; set; }
- public int PageSize { get; set; }
-
- public FanzubRequestGenerator()
- {
- PageSize = 100;
- }
-
- public virtual IndexerPageableRequestChain GetRecentRequests()
- {
- var pageableRequests = new IndexerPageableRequestChain();
-
- pageableRequests.Add(GetPagedRequests(null));
-
- return pageableRequests;
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(AlbumSearchCriteria searchCriteria)
- {
- throw new System.NotImplementedException();
- }
-
- public virtual IndexerPageableRequestChain GetSearchRequests(ArtistSearchCriteria searchCriteria)
- {
- throw new System.NotImplementedException();
- }
-
- private IEnumerable GetPagedRequests(string query)
- {
- var url = new StringBuilder();
- url.AppendFormat("{0}?cat=anime&max={1}", Settings.BaseUrl, PageSize);
-
- if (query.IsNotNullOrWhiteSpace())
- {
- url.AppendFormat("&q={0}", query);
- }
-
- yield return new IndexerRequest(url.ToString(), HttpAccept.Rss);
- }
-
- private IEnumerable GetTitleSearchStrings(string title, int absoluteEpisodeNumber)
- {
- var formats = new[] { "{0}%20{1:00}", "{0}%20-%20{1:00}" };
-
- return formats.Select(s => "\"" + string.Format(s, CleanTitle(title), absoluteEpisodeNumber) + "\"");
- }
-
- private string CleanTitle(string title)
- {
- return RemoveCharactersRegex.Replace(title, "");
- }
- }
-}
diff --git a/src/NzbDrone.Core/Indexers/Fanzub/FanzubSettings.cs b/src/NzbDrone.Core/Indexers/Fanzub/FanzubSettings.cs
deleted file mode 100644
index a0760b5d8..000000000
--- a/src/NzbDrone.Core/Indexers/Fanzub/FanzubSettings.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using FluentValidation;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Indexers.Fanzub
-{
- public class FanzubSettingsValidator : AbstractValidator
- {
- public FanzubSettingsValidator()
- {
- RuleFor(c => c.BaseUrl).ValidRootUrl();
- }
- }
-
- public class FanzubSettings : IIndexerSettings
- {
- private static readonly FanzubSettingsValidator Validator = new FanzubSettingsValidator();
-
- public FanzubSettings()
- {
- BaseUrl = "http://fanzub.com/rss/";
- }
-
- [FieldDefinition(0, Label = "Rss URL", HelpText = "Enter to URL to an Fanzub compatible RSS feed")]
- public string BaseUrl { get; set; }
-
- public NzbDroneValidationResult Validate()
- {
- return new NzbDroneValidationResult(Validator.Validate(this));
- }
- }
-}
diff --git a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
index 597ee8451..e121bbb06 100644
--- a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
@@ -35,14 +35,6 @@ namespace NzbDrone.Core.Indexers.Torznab
return new TorznabRssParser();
}
- public override IEnumerable DefaultDefinitions
- {
- get
- {
- yield return GetDefinition("HD4Free.xyz", GetSettings("http://hd4free.xyz"));
- }
- }
-
public Torznab(INewznabCapabilitiesProvider capabilitiesProvider, IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
: base(httpClient, indexerStatusService, configService, parsingService, logger)
{
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index b9196c308..d96e3c5fd 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -185,6 +185,7 @@
+
@@ -586,9 +587,6 @@
-
-
-