From dec06e20d6e69b10b1fe24613b676279034ab4fe Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 3 May 2012 15:08:35 -0700 Subject: [PATCH] New: Nzbs.org removed, added as a default Newznab provider. (Please update your settings) --- .../Files/RSS/SizeParsing/nzbsorg.xml | 27 -- NzbDrone.Core.Test/Files/RSS/nzbsorg.xml | 366 ------------------ NzbDrone.Core.Test/IndexerTests.cs | 58 --- NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 6 - NzbDrone.Core/CentralDispatch.cs | 15 +- NzbDrone.Core/NzbDrone.Core.csproj | 3 - NzbDrone.Core/Providers/Indexer/NzbsOrg.cs | 117 ------ .../Controllers/SettingsController.cs | 11 - NzbDrone.Web/Models/IndexerSettingsModel.cs | 18 - NzbDrone.Web/Views/Settings/Indexers.cshtml | 29 +- 10 files changed, 15 insertions(+), 635 deletions(-) delete mode 100644 NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbsorg.xml delete mode 100644 NzbDrone.Core.Test/Files/RSS/nzbsorg.xml delete mode 100644 NzbDrone.Core/Providers/Indexer/NzbsOrg.cs diff --git a/NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbsorg.xml b/NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbsorg.xml deleted file mode 100644 index 7060086f1..000000000 --- a/NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbsorg.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - All Categories - NZBs(dot)ORG RSS Feed - http://nzbs.org/index.php?&catid= - All Categories feed for NZBs(dot)ORG - en-us - - Shameless.S08E17.720p.HDTV.x264-BiA - - Wed, 14 Sep 2011 02:14:09 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=750588 - Category: TV-x264
Size: 1.67 GB
Files: 44 (8 pars)
Group: a.b.teevee
.NFO: View NFO
Ext. Link: http://www.tvrage.com/shows/id-5162
Posted: Wed September 14th 00:00:15 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=750588 - 750588 - - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=750588&i=9695&h=92653d4053a322e123dbbb3da887c5c5 - - 1788245756 - Wed, 14 Sep 2011 00:00:15 +0000 - - http://www.tvrage.com/shows/id-5162 - - - \ No newline at end of file diff --git a/NzbDrone.Core.Test/Files/RSS/nzbsorg.xml b/NzbDrone.Core.Test/Files/RSS/nzbsorg.xml deleted file mode 100644 index 91046fb74..000000000 --- a/NzbDrone.Core.Test/Files/RSS/nzbsorg.xml +++ /dev/null @@ -1,366 +0,0 @@ - - - -TV - NZBs(dot)ORG RSS Feed -http://nzbs.org/index.php?&catid=&type=1 -TV feed for NZBs(dot)ORG -en-us - - Kings.S01E03.Prosperity.720p.HDTV.x264.PROPER-dH - Tue, 05 Apr 2011 07:16:52 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605571 - Category: TV-x264
Size: 922.1 MB
Files: 21 (9 pars)
Group: a.b.multimedia
.NFO: None
Posted: Tue April 5th 05:08:26 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605571 - 605571 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605571&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 966876952 - Tue, 05 Apr 2011 05:08:26 +0000 - - - Relapse.S01E01.David.and.Brooke.HDTV.XviD-MOMENTUM - Tue, 05 Apr 2011 07:07:19 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605569 - Category: TV-XviD
Size: 396.9 MB
Files: 36 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Ext. Link: http://www.aetv.com/relapse/
Posted: Tue April 5th 05:05:21 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605569 - 605569 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605569&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 416155248 - Tue, 05 Apr 2011 05:05:21 +0000 - http://www.aetv.com/relapse/ - - - WWE.Monday.Night.Raw.2011.04.04.HDTV.XviD-W4F - Tue, 05 Apr 2011 07:07:15 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605566 - Category: TV-XviD
Size: 1.27 GB
Files: 41 (13 pars)
Group: a.b.multimedia
.NFO: View NFO
Posted: Tue April 5th 05:00:31 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605566 - 605566 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605566&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 1363050400 - Tue, 05 Apr 2011 05:00:31 +0000 - - - Endgame.S01E04.HDTV.XviD-2HD - Tue, 05 Apr 2011 07:07:14 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605565 - Category: TV-XviD
Size: 415.7 MB
Files: 34 (10 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 04:59:21 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605565 - 605565 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605565&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 435883204 - Tue, 05 Apr 2011 04:59:21 +0000 - - - NCAA.Basketball.2011.Tournament.Championship.Butler.vs.UConn.HDTV.XviD-FQM - Tue, 05 Apr 2011 07:07:12 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605564 - Category: TV-XviD
Size: 1.26 GB
Files: 76 (13 pars)
Group: a.b.multimedia
.NFO: View NFO
Ext. Link: http://www.ncaa.com/
Posted: Tue April 5th 04:57:22 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605564 - 605564 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605564&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 1349676970 - Tue, 05 Apr 2011 04:57:22 +0000 - http://www.ncaa.com/ - - - WWE.Hall.of.Fame.Induction.Ceremony.2011.720p.HDTV.x264-KYR - Tue, 05 Apr 2011 06:47:51 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605553 - Category: TV-x264
Size: 1.27 GB
Files: 43 (14 pars)
Group: a.b.multimedia
.NFO: View NFO
Posted: Tue April 5th 04:45:59 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605553 - 605553 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605553&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 1365699871 - Tue, 05 Apr 2011 04:45:59 +0000 - - - Inside.the.Vault.S01E09.HDTV.XviD-MOMENTUM - Tue, 05 Apr 2011 06:47:49 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605552 - Category: TV-XviD
Size: 197.7 MB
Files: 23 (6 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 04:42:36 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605552 - 605552 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605552&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 207259060 - Tue, 05 Apr 2011 04:42:36 +0000 - - - American.Pickers.S03E03.Franks.Big.Shot.HDTV.XviD-MOMENTUM - Tue, 05 Apr 2011 06:38:23 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605551 - Category: TV-XviD
Size: 395.8 MB
Files: 36 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 04:37:39 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605551 - 605551 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605551&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 414999248 - Tue, 05 Apr 2011 04:37:39 +0000 - - - The.Colbert.Report.2011.04.04.Andrew.Chaikin.HDTV.XviD-FQM - Tue, 05 Apr 2011 06:10:21 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605538 - Category: TV-XviD
Size: 198.9 MB
Files: 20 (6 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 04:09:27 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605538 - 605538 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605538&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 208534960 - Tue, 05 Apr 2011 04:09:27 +0000 - - - Pawn.Stars.S03E44.Pablo.Pawncasso.HDTV.XviD-MOMENTUM - Tue, 05 Apr 2011 06:10:15 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605537 - Category: TV-XviD
Size: 198.5 MB
Files: 23 (6 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 04:02:34 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605537 - 605537 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605537&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 208139732 - Tue, 05 Apr 2011 04:02:34 +0000 - - - The.Kennedys.Part.1.and.Part.2.DSR.XviD-SYS - Tue, 05 Apr 2011 06:10:06 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605536 - Category: TV-XviD
Size: 792.6 MB
Files: 61 (8 pars)
Group: a.b.teevee
.NFO: View NFO
Ext. Link: http://www.reelzchannel.com/kennedys/
Posted: Tue April 5th 04:02:00 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605536 - 605536 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605536&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 831055164 - Tue, 05 Apr 2011 04:02:00 +0000 - http://www.reelzchannel.com/kennedys/ - - - Nurse.Jackie.S03E02.720p.HDTV.x264-ORENJI - Tue, 05 Apr 2011 06:00:44 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605535 - Category: TV-x264
Size: 849.3 MB
Files: 26 (6 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 03:58:06 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605535 - 605535 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605535&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 890553088 - Tue, 05 Apr 2011 03:58:06 +0000 - - - The Killing S01E01-02 1080i HDTV DD5.1 MPEG2-TrollHD - Tue, 05 Apr 2011 06:00:43 +0000 - TV-Other - http://nzbs.org/index.php?action=view&nzbid=605534 - Category: TV-Other
Size: 6.77 GB
Files: 77 (12 pars)
Group: a.b.hdtv
.NFO: None
Posted: Tue April 5th 03:50:44 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605534 - 605534 - TV-Other - http://nzbs.org/index.php?action=getnzb&nzbid=605534&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 7271142303 - Tue, 05 Apr 2011 03:50:44 +0000 - - - Pawn.Stars.S03E43.Evel.Genius.HDTV.XviD-MOMENTUM - Tue, 05 Apr 2011 05:51:18 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605533 - Category: TV-XviD
Size: 206.3 MB
Files: 26 (8 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 03:49:24 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605533 - 605533 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605533&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 216304268 - Tue, 05 Apr 2011 03:49:24 +0000 - - - United.States.of.Tara.S03E02.720p.HDTV.x264-ORENJI - Tue, 05 Apr 2011 05:51:16 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605532 - Category: TV-x264
Size: 846.9 MB
Files: 26 (6 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 03:42:42 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605532 - 605532 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605532&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 888024966 - Tue, 05 Apr 2011 03:42:42 +0000 - - - WWE.Wrestlemania.27.PPV.HDTV.XviD-KYR - Tue, 05 Apr 2011 05:41:55 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605528 - Category: TV-XviD
Size: 2.51 GB
Files: 66 (14 pars)
Group: a.b.multimedia
.NFO: View NFO
Posted: Tue April 5th 03:38:30 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605528 - 605528 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605528&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 2690082009 - Tue, 05 Apr 2011 03:38:30 +0000 - - - The.Daily.Show.2011.04.04.Billy.Crystal.HDTV.XviD-FQM - Tue, 05 Apr 2011 05:41:54 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605527 - Category: TV-XviD
Size: 199.0 MB
Files: 20 (6 pars)
Group: a.b.teevee
.NFO: View NFO
Ext. Link: http://www.thedailyshow.com/
Posted: Tue April 5th 03:37:59 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605527 - 605527 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605527&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 208686256 - Tue, 05 Apr 2011 03:37:59 +0000 - http://www.thedailyshow.com/ - - - The.Event.S01E16.720p.HDTV.X264-DIMENSION REPOST - Tue, 05 Apr 2011 05:32:29 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605519 - Category: TV-x264
Size: 1.28 GB
Files: 42 (14 pars)
Group: a.b.multimedia
.NFO: View NFO
Posted: Tue April 5th 03:24:05 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605519 - 605519 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605519&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 1369823254 - Tue, 05 Apr 2011 03:24:05 +0000 - - - United.States.of.Tara.S03E02.Crackerjack.HDTV.XviD-FQM - Tue, 05 Apr 2011 05:13:44 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605506 - Category: TV-XviD
Size: 265.2 MB
Files: 24 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Ext. Link: http://www.sho.com/site/tara/
Posted: Tue April 5th 03:08:58 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605506 - 605506 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605506&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 278057587 - Tue, 05 Apr 2011 03:08:58 +0000 - http://www.sho.com/site/tara/ - - - Harrys.Law.S01E12.HDTV.XviD-2HD - Tue, 05 Apr 2011 05:13:41 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605505 - Category: TV-XviD
Size: 397.8 MB
Files: 30 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 03:07:39 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605505 - 605505 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605505&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 417156038 - Tue, 05 Apr 2011 03:07:39 +0000 - - - Castle.2009.S03E20.720p.HDTV.X264-DIMENSION - Tue, 05 Apr 2011 05:13:36 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605504 - Category: TV-x264
Size: 1.24 GB
Files: 35 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 03:07:21 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605504 - 605504 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605504&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 1333441054 - Tue, 05 Apr 2011 03:07:21 +0000 - - - Stargate.Universe.S02E15.720p.HDTV.X264-DIMENSION - Tue, 05 Apr 2011 05:13:28 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605503 - Category: TV-x264
Size: 1.25 GB
Files: 35 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 03:05:25 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605503 - 605503 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605503&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 1337316693 - Tue, 05 Apr 2011 03:05:25 +0000 - - - Harrys.Law.S01E12.720p.HDTV.X264-DIMENSION - Tue, 05 Apr 2011 05:13:18 +0000 - TV-x264 - http://nzbs.org/index.php?action=view&nzbid=605502 - Category: TV-x264
Size: 1.24 GB
Files: 35 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Posted: Tue April 5th 03:03:36 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605502 - 605502 - TV-x264 - http://nzbs.org/index.php?action=getnzb&nzbid=605502&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 1334867450 - Tue, 05 Apr 2011 03:03:36 +0000 - - - Castle.2009.S03E20.HDTV.XviD-LOL - Tue, 05 Apr 2011 05:13:08 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605500 - Category: TV-XviD
Size: 396.7 MB
Files: 36 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Ext. Link: http://www.tvrage.com/Castle
Posted: Tue April 5th 03:02:22 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605500 - 605500 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605500&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 415952872 - Tue, 05 Apr 2011 03:02:22 +0000 - http://www.tvrage.com/Castle - - - Stargate.Universe.S02E15.HDTV.XviD-LOL - Tue, 05 Apr 2011 05:03:36 +0000 - TV-XviD - http://nzbs.org/index.php?action=view&nzbid=605499 - Category: TV-XviD
Size: 397.4 MB
Files: 36 (7 pars)
Group: a.b.teevee
.NFO: View NFO
Ext. Link: http://tvrage.com/Stargate_Universe
Posted: Tue April 5th 03:01:16 UTC
Add to My NZBs
Download NZB
]]> - http://nzbs.org/index.php?action=view&nzbid=605499 - 605499 - TV-XviD - http://nzbs.org/index.php?action=getnzb&nzbid=605499&i=43516&h=bc8edb4cc49d4ae440775adec5ac001f - - 416749161 - Tue, 05 Apr 2011 03:01:16 +0000 - http://tvrage.com/Stargate_Universe - - - \ No newline at end of file diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs index 131f00113..546148696 100644 --- a/NzbDrone.Core.Test/IndexerTests.cs +++ b/NzbDrone.Core.Test/IndexerTests.cs @@ -202,28 +202,6 @@ namespace NzbDrone.Core.Test ExceptionVerification.IgnoreWarns(); } - [TestCase("simpsons", 21, 23)] - [TestCase("Hawaii Five-0 (2010)", 1, 5)] - [TestCase("In plain Sight", 1, 4)] - public void nzbsorg_search_returns_valid_results(string title, int season, int episode) - { - Mocker.GetMock() - .SetupGet(c => c.NzbsOrgUId) - .Returns("43516"); - - Mocker.GetMock() - .SetupGet(c => c.NzbsOrgHash) - .Returns("bc8edb4cc49d4ae440775adec5ac001f"); - - Mocker.Resolve(); - - var result = Mocker.Resolve().FetchEpisode(title, season, episode); - - Mark500Inconclusive(); - - result.Should().NotBeEmpty(); - } - [TestCase("simpsons", 21, 23)] [TestCase("Hawaii Five-0 (2010)", 1, 1)] [TestCase("In plain Sight", 1, 11, Ignore = true)] @@ -329,22 +307,6 @@ namespace NzbDrone.Core.Test parseResults[0].Size.Should().Be(1331439862); } - [Test] - public void size_nzbsorg() - { - WithConfiguredIndexers(); - - Mocker.GetMock() - .Setup(h => h.DownloadStream(It.IsAny(), It.IsAny())) - .Returns(File.OpenRead(".\\Files\\Rss\\SizeParsing\\nzbsorg.xml")); - - //Act - var parseResults = Mocker.Resolve().FetchRss(); - - parseResults.Should().HaveCount(1); - parseResults[0].Size.Should().Be(1793148846); - } - [Test] public void size_nzbsrus() { @@ -565,26 +527,6 @@ namespace NzbDrone.Core.Test Thread.CurrentThread.CurrentCulture = currentCulture; } - [Test] - public void NzbsOrg_NzbInfoUrl_should_contain_information_string() - { - WithConfiguredIndexers(); - - const string fileName = "nzbsorg.xml"; - const string expectedString = "action=view"; - - Mocker.GetMock() - .Setup(h => h.DownloadStream(It.IsAny(), It.IsAny())) - .Returns(File.OpenRead(".\\Files\\Rss\\" + fileName)); - - var parseResults = Mocker.Resolve().FetchRss(); - - foreach (var episodeParseResult in parseResults) - { - episodeParseResult.NzbInfoUrl.Should().Contain(expectedString); - } - } - [Test] public void NzbsRus_NzbInfoUrl_should_contain_information_string() { diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 6fe11d091..74cac4081 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -258,9 +258,6 @@ Always - - Always - Always @@ -276,9 +273,6 @@ Always - - Always - Always diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 09b5e91ad..ff4685b5a 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; @@ -12,6 +13,7 @@ using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Providers.ExternalNotification; using NzbDrone.Core.Providers.Indexer; +using NzbDrone.Core.Repository; using PetaPoco; using SignalR; using SignalR.Hosting.AspNet; @@ -91,7 +93,6 @@ namespace NzbDrone.Core private void InitIndexers() { logger.Debug("Initializing Indexers..."); - Kernel.Bind().To(); Kernel.Bind().To(); Kernel.Bind().To(); Kernel.Bind().To(); @@ -103,6 +104,18 @@ namespace NzbDrone.Core var indexers = Kernel.GetAll(); Kernel.Get().InitializeIndexers(indexers.ToList()); + + var newznabIndexers = new List + { + new NewznabDefinition + { + Enable = false, + Name = "Nzbs.org", + Url = "http://nzbs.org" + } + }; + + Kernel.Get().InitializeNewznabIndexers(newznabIndexers); } private void InitJobs() diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 8a4e71889..d635f1212 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -428,9 +428,6 @@ Code - - Code - Code diff --git a/NzbDrone.Core/Providers/Indexer/NzbsOrg.cs b/NzbDrone.Core/Providers/Indexer/NzbsOrg.cs deleted file mode 100644 index 320d7a000..000000000 --- a/NzbDrone.Core/Providers/Indexer/NzbsOrg.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ServiceModel.Syndication; -using System.Text.RegularExpressions; -using Ninject; -using NzbDrone.Common; -using NzbDrone.Core.Model; -using NzbDrone.Core.Providers.Core; - -namespace NzbDrone.Core.Providers.Indexer -{ - public class NzbsOrg : IndexerBase - { - [Inject] - public NzbsOrg(HttpProvider httpProvider, ConfigProvider configProvider) - : base(httpProvider, configProvider) - { - } - - protected override string[] Urls - { - get - { - return new[] - { - string.Format("http://nzbs.org/rss.php?type=1&i={0}&h={1}&num=50&dl=1", - _configProvider.NzbsOrgUId, _configProvider.NzbsOrgHash) - }; - } - } - - public override bool IsConfigured - { - get - { - return !string.IsNullOrWhiteSpace(_configProvider.NzbsOrgUId) && - !string.IsNullOrWhiteSpace(_configProvider.NzbsOrgHash); - } - } - - protected override IList GetEpisodeSearchUrls(string seriesTitle, int seasonNumber, int episodeNumber) - { - var searchUrls = new List(); - - foreach (var url in Urls) - { - searchUrls.Add(String.Format("{0}&action=search&q={1}+{2}+{3:00}", url, seriesTitle, seasonNumber, episodeNumber)); - } - - return searchUrls; - } - - protected override IList GetDailyEpisodeSearchUrls(string seriesTitle, DateTime date) - { - var searchUrls = new List(); - - foreach (var url in Urls) - { - searchUrls.Add(String.Format("{0}&action=search&q={1}+{2:yyyy.MM.dd}", url, seriesTitle, date)); - } - - return searchUrls; - } - - protected override IList GetSeasonSearchUrls(string seriesTitle, int seasonNumber) - { - var searchUrls = new List(); - - foreach (var url in Urls) - { - searchUrls.Add(String.Format("{0}&action=search&q={1}+Season", url, seriesTitle)); - searchUrls.Add(String.Format("{0}&action=search&q={1}+S{2:00}", url, seriesTitle, seasonNumber)); - } - - return searchUrls; - } - - protected override IList GetPartialSeasonSearchUrls(string seriesTitle, int seasonNumber, int episodeWildcard) - { - var searchUrls = new List(); - - foreach (var url in Urls) - { - searchUrls.Add(String.Format("{0}&action=search&q={1}+S{2:00}E{3}", - url, seriesTitle, seasonNumber, episodeWildcard)); - } - - return searchUrls; - } - - public override string Name - { - get { return "Nzbs.org"; } - } - - protected override string NzbDownloadUrl(SyndicationItem item) - { - return item.Id; - } - - protected override string NzbInfoUrl(SyndicationItem item) - { - return item.Links[0].Uri.ToString(); - } - - protected override EpisodeParseResult CustomParser(SyndicationItem item, EpisodeParseResult currentResult) - { - if (currentResult != null) - { - var sizeString = Regex.Match(item.Summary.Text, @">\d+\.\d{1,2} \w{2}", RegexOptions.IgnoreCase).Value; - currentResult.Size = Parser.GetReportSize(sizeString); - } - - return currentResult; - } - } -} \ No newline at end of file diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index 9ef4f447d..6337db7dd 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -67,16 +67,12 @@ namespace NzbDrone.Web.Controllers NzbsrusUId = _configProvider.NzbsrusUId, NzbsrusHash = _configProvider.NzbsrusHash, - NzbsOrgHash = _configProvider.NzbsOrgHash, - NzbsOrgUId = _configProvider.NzbsOrgUId, - NewzbinUsername = _configProvider.NewzbinUsername, NewzbinPassword = _configProvider.NewzbinPassword, FileSharingTalkUid = _configProvider.FileSharingTalkUid, FileSharingTalkSecret = _configProvider.FileSharingTalkSecret, - NzbsOrgEnabled = _indexerProvider.GetSettings(typeof(NzbsOrg)).Enable, NzbMatrixEnabled = _indexerProvider.GetSettings(typeof(NzbMatrix)).Enable, NzbsRUsEnabled = _indexerProvider.GetSettings(typeof(NzbsRUs)).Enable, NewzbinEnabled = _indexerProvider.GetSettings(typeof(Newzbin)).Enable, @@ -350,10 +346,6 @@ namespace NzbDrone.Web.Controllers { _configProvider.Retention = data.Retention; - var nzbsOrgSettings = _indexerProvider.GetSettings(typeof(NzbsOrg)); - nzbsOrgSettings.Enable = data.NzbsOrgEnabled; - _indexerProvider.SaveSettings(nzbsOrgSettings); - var nzbMatrixSettings = _indexerProvider.GetSettings(typeof(NzbMatrix)); nzbMatrixSettings.Enable = data.NzbMatrixEnabled; _indexerProvider.SaveSettings(nzbMatrixSettings); @@ -386,9 +378,6 @@ namespace NzbDrone.Web.Controllers nzbClubSettings.Enable = data.NzbClubEnabled; _indexerProvider.SaveSettings(nzbClubSettings); - _configProvider.NzbsOrgUId = data.NzbsOrgUId; - _configProvider.NzbsOrgHash = data.NzbsOrgHash; - _configProvider.NzbMatrixUsername = data.NzbMatrixUsername; _configProvider.NzbMatrixApiKey = data.NzbMatrixApiKey; diff --git a/NzbDrone.Web/Models/IndexerSettingsModel.cs b/NzbDrone.Web/Models/IndexerSettingsModel.cs index 58d734b4a..3f6b3b915 100644 --- a/NzbDrone.Web/Models/IndexerSettingsModel.cs +++ b/NzbDrone.Web/Models/IndexerSettingsModel.cs @@ -23,20 +23,6 @@ namespace NzbDrone.Web.Models [RequiredIf("NzbMatrixEnabled", true, ErrorMessage = "API Key Required when NZBMatrix is enabled")] public String NzbMatrixApiKey { get; set; } - [DataType(DataType.Text)] - [DisplayName("UID")] - [Description("User ID for Nzbs.org")] - [DisplayFormat(ConvertEmptyStringToNull = false)] - [RequiredIf("NzbsOrgEnabled", true, ErrorMessage = "UID Required when Nzbs.org is enabled")] - public String NzbsOrgUId { get; set; } - - [DataType(DataType.Text)] - [DisplayName("Hash")] - [Description("Hash for Nzbs.org")] - [DisplayFormat(ConvertEmptyStringToNull = false)] - [RequiredIf("NzbsOrgEnabled", true, ErrorMessage = "Hash Required when Nzbs.org is enabled")] - public String NzbsOrgHash { get; set; } - [DataType(DataType.Text)] [DisplayName("UID")] [Description("User ID for NZBsRus")] @@ -79,10 +65,6 @@ namespace NzbDrone.Web.Models [RequiredIf("FileSharingTalkEnabled", true, ErrorMessage = "Password Secret Required when File Sharing Talk is enabled")] public String FileSharingTalkSecret { get; set; } - [DisplayName("NZBs.org")] - [Description("Enable downloading episodes from Nzbs.org")] - public bool NzbsOrgEnabled { get; set; } - [DisplayName("NZB Matrix")] [Description("Enable downloading episodes from NZB Matrix")] public bool NzbMatrixEnabled { get; set; } diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml index 42a9525fb..93ef790fd 100644 --- a/NzbDrone.Web/Views/Settings/Indexers.cshtml +++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml @@ -10,9 +10,6 @@
RSS feeds are checked every 25 minutes for new episodes.
- @Html.CheckBox("nzbsOrgStatus", @Model.NzbsOrgEnabled, new{ @class = "indexerStatusButton" }) - - @Html.CheckBox("nzbMatrixStatus", @Model.NzbMatrixEnabled, new { @class = "indexerStatusButton" }) @@ -41,24 +38,6 @@ @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "IndexersForm", name = "IndexersForm", @class = "settingsForm" })) {
-

NZBs.org

-
- - @Html.CheckBoxFor(m => m.NzbsOrgEnabled, new { @class = "inputClass checkClass enabledCheck" }) - - @Html.TextBoxFor(m => m.NzbsOrgUId, new { @class = "inputClass" }) - - @Html.TextBoxFor(m => m.NzbsOrgHash, new { @class = "inputClass" }) -
-

NZBMatrix