From aa40fe8c94e71fa3a7d26e98acaf777f03b89e4c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 9 Dec 2012 20:50:05 -0800 Subject: [PATCH] Removed NzbMatrix New: Removed NzbMatrix --- .../Files/Feed.nzbmatrix.com.xml | 112 ---- .../Files/RSS/SizeParsing/nzbmatrix.xml | 23 - NzbDrone.Core.Test/Files/RSS/nzbmatrix.xml | 512 ------------------ NzbDrone.Core.Test/IndexerTests.cs | 114 ---- NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 9 - .../ProviderTests/IndexerProviderTest.cs | 4 +- NzbDrone.Core/CentralDispatch.cs | 1 - .../Datastore/Migrations/Migration20121209.cs | 18 + NzbDrone.Core/NzbDrone.Core.csproj | 4 +- .../Providers/Core/ConfigProvider.cs | 14 - NzbDrone.Core/Providers/Indexer/NzbMatrix.cs | 134 ----- .../Content/Images/Indexers/Newzbin.png | Bin 902 -> 0 bytes .../Content/Images/Indexers/NzbMatrix.png | Bin 719 -> 0 bytes .../Controllers/SettingsController.cs | 11 - NzbDrone.Web/Models/IndexerSettingsModel.cs | 18 - NzbDrone.Web/NzbDrone.Web.csproj | 2 - NzbDrone.Web/Views/Settings/Indexers.cshtml | 29 +- 17 files changed, 22 insertions(+), 983 deletions(-) delete mode 100644 NzbDrone.Core.Test/Files/Feed.nzbmatrix.com.xml delete mode 100644 NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbmatrix.xml delete mode 100644 NzbDrone.Core.Test/Files/RSS/nzbmatrix.xml create mode 100644 NzbDrone.Core/Datastore/Migrations/Migration20121209.cs delete mode 100644 NzbDrone.Core/Providers/Indexer/NzbMatrix.cs delete mode 100644 NzbDrone.Web/Content/Images/Indexers/Newzbin.png delete mode 100644 NzbDrone.Web/Content/Images/Indexers/NzbMatrix.png diff --git a/NzbDrone.Core.Test/Files/Feed.nzbmatrix.com.xml b/NzbDrone.Core.Test/Files/Feed.nzbmatrix.com.xml deleted file mode 100644 index 4a13c31cc..000000000 --- a/NzbDrone.Core.Test/Files/Feed.nzbmatrix.com.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - NZBMatrix.com RSS 2.0 - en - NZBMatrix - NZBMatrix.com RSS Feed - Usenet - http://nzbmatrix.com - Copyright 2010 NZBMatrix - Fri, 23 Apr 2010 01:28:23 -0400 - - 24.S08E19.HDTV.XviD-LOL - http://nzbmatrix.com/api-nzb-download.php?id=625437 - http://nzbmatrix.com/api-nzb-download.php?id=625437 - Name: Craig Ferguson 2010 04 22 Jeffrey Dean Morgan HDTV XviD LMAO
Category: TV: Divx/Xvid
Size: 424.85MB
Added: 2010-04-23 06:22:45]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - CSI.S10E20.HDTV.XviD-LOL - http://nzbmatrix.com/api-nzb-download.php?id=625436 - http://nzbmatrix.com/api-nzb-download.php?id=625436 - Name: Little People Big World S08E24 Brothers in Bavaria REPACK HDTV XviD MOMENTUM
Category: TV: Divx/Xvid
Size: 208.22MB
Added: 2010-04-23 06:21:44]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - The.Daily.Show.2010.04.29.Michael.Caine.HDTV.XviD-FQM.nzb - http://nzbmatrix.com/api-nzb-download.php?id=625435 - http://nzbmatrix.com/api-nzb-download.php?id=625435 - Name: Lopez Tonight 2010 04 21 Zoe Saldana HDTV XviD MOMENTUM
Category: TV: Divx/Xvid
Size: 424.31MB
Added: 2010-04-23 06:04:48]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - The Mentalist S02E20 720p HDTV x264 CTU - http://nzbmatrix.com/api-nzb-download.php?id=625434 - http://nzbmatrix.com/api-nzb-download.php?id=625434 - Name: The Mentalist S02E20 720p HDTV x264 CTU
Category: TV: HD
Size: 219.79MB
Added: 2010-04-23 05:57:50]]> - TV: HD - tv.hd - 41 - - - - 24.S06E01.HDTV.XviD-LOL - http://nzbmatrix.com/api-nzb-download.php?id=625433 - http://nzbmatrix.com/api-nzb-download.php?id=625433 - Name: Jimmy Kimmel 2010 04 22 Chace Crawford HDTV XviD 2HD
Category: TV: Divx/Xvid
Size: 433.32MB
Added: 2010-04-23 05:46:31]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - Bones.S05E19.HDTV.XviD-LOL - http://nzbmatrix.com/api-nzb-download.php?id=625430 - http://nzbmatrix.com/api-nzb-download.php?id=625430 - Name: Project Runway S07E14 WS DSR XviD MOMENTUM
Category: TV: Divx/Xvid
Size: 430.59MB
Added: 2010-04-23 05:34:44]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - David Letterman 2010 04 22 David Spade HDTV XviD LMAO - http://nzbmatrix.com/api-nzb-download.php?id=625402 - http://nzbmatrix.com/api-nzb-download.php?id=625402 - Name: David Letterman 2010 04 22 David Spade HDTV XviD LMAO
Category: TV: Divx/Xvid
Size: 416.25MB
Added: 2010-04-23 05:20:07]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - Jay Leno 2010 04 22 Jeff Corwin HDTV XviD LMAO - http://nzbmatrix.com/api-nzb-download.php?id=625389 - http://nzbmatrix.com/api-nzb-download.php?id=625389 - Name: Jay Leno 2010 04 22 Jeff Corwin HDTV XviD LMAO
Category: TV: Divx/Xvid
Size: 417.51MB
Added: 2010-04-23 05:06:07]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - The Colbert Report 2010 04 22 Gorillaz HDTV XviD FQM - http://nzbmatrix.com/api-nzb-download.php?id=625387 - http://nzbmatrix.com/api-nzb-download.php?id=625387 - Name: The Colbert Report 2010 04 22 Gorillaz HDTV XviD FQM
Category: TV: Divx/Xvid
Size: 216.94MB
Added: 2010-04-23 04:13:02]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - The Marriage Ref S01E08 HDTV XviD 2HD - http://nzbmatrix.com/api-nzb-download.php?id=625386 - http://nzbmatrix.com/api-nzb-download.php?id=625386 - Name: The Marriage Ref S01E08 HDTV XviD 2HD
Category: TV: Divx/Xvid
Size: 431.06MB
Added: 2010-04-23 04:11:08]]> - TV: Divx/Xvid - tv.divx/xvid - 6 - - - - \ No newline at end of file diff --git a/NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbmatrix.xml b/NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbmatrix.xml deleted file mode 100644 index 8ff043ef0..000000000 --- a/NzbDrone.Core.Test/Files/RSS/SizeParsing/nzbmatrix.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - NZBMatrix.com RSS 2.0 - en - NZBMatrix - NZBMatrix.com RSS Feed - Usenet - http://nzbmatrix.com - - Copyright 2011 NZBMatrix - Wed, 14 Sep 2011 02:18:04 +0200 - - House S04E11 720p HDTV x264 BAWLS - http://nzbmatrix.com/nzb-details.php?id=914522&hit=1 - http://nzbmatrix.com/nzb-details.php?id=914522&hit=1 - Name: House S04E11 FRENCH 720p HDTV x264 BAWLS
Category: TV: HD
Size: 1.24 GB
Added: 2011-04-25 15:06:58
Group: alt.binaries.multimedia
NFO: View NFO ]]> - TV: HD - tv.hd - 41 - - - - \ No newline at end of file diff --git a/NzbDrone.Core.Test/Files/RSS/nzbmatrix.xml b/NzbDrone.Core.Test/Files/RSS/nzbmatrix.xml deleted file mode 100644 index faf8729a6..000000000 --- a/NzbDrone.Core.Test/Files/RSS/nzbmatrix.xml +++ /dev/null @@ -1,512 +0,0 @@ - - - - NZBMatrix.com RSS 2.0 - en - NZBMatrix - NZBMatrix.com RSS Feed - Usenet - http://nzbmatrix.com - Copyright 2012 NZBMatrix - Wed, 02 May 2012 21:36:24 +0200 - - WKRP In Cincinnati 1x02 Pilot Episode pt2 par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265035&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265035&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x02 Pilot Episode pt2 par2 01 of 26
Category: TV: SD
Size: 271.58 MB
Added: 2012-05-02 18:27:26
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - repost 01 of 26 WKRP In Cincinnati 1x01 Pilot Episode pt1 par2 - http://api.nzbmatrix.com/v1.1/download.php?id=1265034&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265034&username=NzbDrone&apikey=FAKEAPIKEY - Name: repost 01 of 26 WKRP In Cincinnati 1x01 Pilot Episode pt1 par2
Category: TV: SD
Size: 268.98 MB
Added: 2012-05-02 18:27:25
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x11 The Contest Nobody Could Win par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265033&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265033&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x11 The Contest Nobody Could Win par2 01 of 26
Category: TV: SD
Size: 271.59 MB
Added: 2012-05-02 18:27:24
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x10 A Date With Jennifer par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265032&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265032&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x10 A Date With Jennifer par2 01 of 26
Category: TV: SD
Size: 271.59 MB
Added: 2012-05-02 18:27:23
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x09 Mamas Review par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265031&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265031&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x09 Mamas Review par2 01 of 26
Category: TV: SD
Size: 271.60 MB
Added: 2012-05-02 18:27:23
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x08 Love Returns par2 01 of 25 - http://api.nzbmatrix.com/v1.1/download.php?id=1265030&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265030&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x08 Love Returns par2 01 of 25
Category: TV: SD
Size: 253.21 MB
Added: 2012-05-02 18:27:21
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x07 Turkeys Away par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265029&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265029&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x07 Turkeys Away par2 01 of 26
Category: TV: SD
Size: 271.55 MB
Added: 2012-05-02 18:27:20
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x06 Baileys Show par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265028&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265028&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x06 Baileys Show par2 01 of 26
Category: TV: SD
Size: 269.84 MB
Added: 2012-05-02 18:27:19
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x05 Hold Up par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265027&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265027&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x05 Hold Up par2 01 of 26
Category: TV: SD
Size: 271.46 MB
Added: 2012-05-02 18:27:18
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x04 Hoodlum Rock par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265026&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265026&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x04 Hoodlum Rock par2 01 of 26
Category: TV: SD
Size: 271.54 MB
Added: 2012-05-02 18:27:16
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x03 Les On A Ledge par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265025&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265025&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x03 Les On A Ledge par2 01 of 26
Category: TV: SD
Size: 271.59 MB
Added: 2012-05-02 18:27:15
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - 3 Stooges original DVDrip xvid Yenc: 3 stooges 1934 1936 E01 PAR2 - http://api.nzbmatrix.com/v1.1/download.php?id=1265024&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265024&username=NzbDrone&apikey=FAKEAPIKEY - Name: 3 Stooges original DVDrip xvid Yenc: 3 stooges 1934 1936 E01 PAR2
Category: TV: SD
Size: 9.13 GB
Added: 2012-05-02 18:27:09
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x13 Goodbye Johnny par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265023&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265023&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x13 Goodbye Johnny par2 01 of 26
Category: TV: SD
Size: 271.54 MB
Added: 2012-05-02 18:27:06
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - WKRP In Cincinnati 1x12 Tornado par2 01 of 26 - http://api.nzbmatrix.com/v1.1/download.php?id=1265022&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265022&username=NzbDrone&apikey=FAKEAPIKEY - Name: WKRP In Cincinnati 1x12 Tornado par2 01 of 26
Category: TV: SD
Size: 271.49 MB
Added: 2012-05-02 18:27:05
Group: alt.binaries.classic.tv.shows
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Seconds from Disaster S05E02 The Bismarck HDTV x264 DEADPiXEL - http://api.nzbmatrix.com/v1.1/download.php?id=1265019&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265019&username=NzbDrone&apikey=FAKEAPIKEY - Name: Seconds from Disaster S05E02 The Bismarck HDTV x264 DEADPiXEL
Category: TV: SD
Size: 308.81 MB
Added: 2012-05-02 18:04:10
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Hit The Road Jack S01E07 720p HDTV x264 TLA - http://api.nzbmatrix.com/v1.1/download.php?id=1265016&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265016&username=NzbDrone&apikey=FAKEAPIKEY - Name: Hit The Road Jack S01E07 720p HDTV x264 TLA
Category: TV: HD (x264)
Size: 777.42 MB
Added: 2012-05-02 17:53:53
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - Hit The Road Jack S01E07 HDTV x264 TLA - http://api.nzbmatrix.com/v1.1/download.php?id=1265014&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265014&username=NzbDrone&apikey=FAKEAPIKEY - Name: Hit The Road Jack S01E07 HDTV x264 TLA
Category: TV: SD
Size: 275.32 MB
Added: 2012-05-02 17:49:43
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Wild Life At The Zoo S01E03 PDTV XviD OTT - http://api.nzbmatrix.com/v1.1/download.php?id=1265010&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265010&username=NzbDrone&apikey=FAKEAPIKEY - Name: Wild Life At The Zoo S01E03 PDTV XviD OTT
Category: TV: SD
Size: 265.62 MB
Added: 2012-05-02 17:39:11
Group: alt.binaries.teevee
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Top Shot S04E12 720p HDTV x264 KILLERS - http://api.nzbmatrix.com/v1.1/download.php?id=1265007&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265007&username=NzbDrone&apikey=FAKEAPIKEY - Name: Top Shot S04E12 720p HDTV x264 KILLERS
Category: TV: HD (x264)
Size: 2.22 GB
Added: 2012-05-02 17:29:52
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - The Biggest Loser Australia s07e69 PDTV XviD BF1 - http://api.nzbmatrix.com/v1.1/download.php?id=1265006&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265006&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Biggest Loser Australia s07e69 PDTV XviD BF1
Category: TV: SD
Size: 770.88 MB
Added: 2012-05-02 17:23:23
Group: alt.binaries.multimedia
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Deadliest Catch S08E04 HDTV x264 KILLERS - http://api.nzbmatrix.com/v1.1/download.php?id=1265003&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265003&username=NzbDrone&apikey=FAKEAPIKEY - Name: Deadliest Catch S08E04 HDTV x264 KILLERS
Category: TV: SD
Size: 669.59 MB
Added: 2012-05-02 17:15:58
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Track and Field USA vs The World at the Penn Relays 2012 HDTV X264 QCF - http://api.nzbmatrix.com/v1.1/download.php?id=1265002&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1265002&username=NzbDrone&apikey=FAKEAPIKEY - Name: Track and Field USA vs The World at the Penn Relays 2012 HDTV X264 QCF
Category: TV: SD
Size: 998.90 MB
Added: 2012-05-02 17:08:24
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Randling S01E01 PDTV x264 RTA - http://api.nzbmatrix.com/v1.1/download.php?id=1264790&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264790&username=NzbDrone&apikey=FAKEAPIKEY - Name: Randling S01E01 PDTV x264 RTA
Category: TV: SD
Size: 247.27 MB
Added: 2012-05-02 16:11:40
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - The Biggest Loser AU S07E69 PDTV x264 RTA - http://api.nzbmatrix.com/v1.1/download.php?id=1264787&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264787&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Biggest Loser AU S07E69 PDTV x264 RTA
Category: TV: SD
Size: 901.54 MB
Added: 2012-05-02 16:10:19
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Jimmy Kimmel 2012 05 01 720p HDTV x264 ORENJI - http://api.nzbmatrix.com/v1.1/download.php?id=1264774&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264774&username=NzbDrone&apikey=FAKEAPIKEY - Name: Jimmy Kimmel 2012 05 01 720p HDTV x264 ORENJI
Category: TV: HD (x264)
Size: 1.15 GB
Added: 2012-05-02 15:51:52
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - Aquila (1997–1998) S2 - http://api.nzbmatrix.com/v1.1/download.php?id=1264771&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264771&username=NzbDrone&apikey=FAKEAPIKEY - Name: Aquila (1997–1998) S2
Category: TV: SD
Size: 1.16 GB
Added: 2012-05-02 15:42:42
Group: alt.binaries.multimedia.scifi
NFO: View NFO
View NZB: View
IMDB Link: Go To IMDB]]> - TV: SD - tv.sd - 6 - - - - Aquila (1997–1998) S1 - http://api.nzbmatrix.com/v1.1/download.php?id=1264770&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264770&username=NzbDrone&apikey=FAKEAPIKEY - Name: Aquila (1997–1998) S1
Category: TV: SD
Size: 1.36 GB
Added: 2012-05-02 15:42:31
Group: alt.binaries.multimedia.scifi
NFO: View NFO
View NZB: View
IMDB Link: Go To IMDB]]> - TV: SD - tv.sd - 6 - - - - Top Shot S04E11 HDTV x264 KILLERS - http://api.nzbmatrix.com/v1.1/download.php?id=1264746&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264746&username=NzbDrone&apikey=FAKEAPIKEY - Name: Top Shot S04E11 HDTV x264 KILLERS
Category: TV: SD
Size: 514.21 MB
Added: 2012-05-02 14:56:54
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - The Biggest Loser S13E18 720p HDTV x264 ORENJI - http://api.nzbmatrix.com/v1.1/download.php?id=1264727&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264727&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Biggest Loser S13E18 720p HDTV x264 ORENJI
Category: TV: HD (x264)
Size: 1.28 GB
Added: 2012-05-02 14:31:46
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - American Experience S24E07 720p HDTV x264 ORENJI - http://api.nzbmatrix.com/v1.1/download.php?id=1264721&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264721&username=NzbDrone&apikey=FAKEAPIKEY - Name: American Experience S24E07 720p HDTV x264 ORENJI
Category: TV: HD (x264)
Size: 1.76 GB
Added: 2012-05-02 14:27:47
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - The Matt Lucas Awards S01E04 720p HDTV x264 C4TV - http://api.nzbmatrix.com/v1.1/download.php?id=1264704&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264704&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Matt Lucas Awards S01E04 720p HDTV x264 C4TV
Category: TV: HD (x264)
Size: 753.04 MB
Added: 2012-05-02 13:55:42
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - Craig Ferguson 2012 05 01 Jesse Tyler Ferguson HDTV x264 2HD - http://api.nzbmatrix.com/v1.1/download.php?id=1264702&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264702&username=NzbDrone&apikey=FAKEAPIKEY - Name: Craig Ferguson 2012 05 01 Jesse Tyler Ferguson HDTV x264 2HD
Category: TV: SD
Size: 303.25 MB
Added: 2012-05-02 13:51:28
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Craig Ferguson 2012 05 01 Jesse Tyler Ferguson 720p HDTV x264 2HD - http://api.nzbmatrix.com/v1.1/download.php?id=1264696&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264696&username=NzbDrone&apikey=FAKEAPIKEY - Name: Craig Ferguson 2012 05 01 Jesse Tyler Ferguson 720p HDTV x264 2HD
Category: TV: HD (x264)
Size: 1.10 GB
Added: 2012-05-02 13:39:47
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - The Matt Lucas Awards S01E04 HDTV x264 C4TV - http://api.nzbmatrix.com/v1.1/download.php?id=1264693&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264693&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Matt Lucas Awards S01E04 HDTV x264 C4TV
Category: TV: SD
Size: 248.48 MB
Added: 2012-05-02 13:27:19
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Britain Unzipped S01E02 PDTV x264 C4TV - http://api.nzbmatrix.com/v1.1/download.php?id=1264692&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264692&username=NzbDrone&apikey=FAKEAPIKEY - Name: Britain Unzipped S01E02 PDTV x264 C4TV
Category: TV: SD
Size: 640.75 MB
Added: 2012-05-02 13:11:41
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Australias Got Talent S06E09 PDTV x264 TASTETV - http://api.nzbmatrix.com/v1.1/download.php?id=1264685&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264685&username=NzbDrone&apikey=FAKEAPIKEY - Name: Australias Got Talent S06E09 PDTV x264 TASTETV
Category: TV: SD
Size: 582.44 MB
Added: 2012-05-02 13:01:48
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - The Project 2012 05 02 PDTV x264 RTA - http://api.nzbmatrix.com/v1.1/download.php?id=1264671&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264671&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Project 2012 05 02 PDTV x264 RTA
Category: TV: SD
Size: 373.64 MB
Added: 2012-05-02 11:59:05
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - The GC S01E01 720p HDTV x264 FiHTV - http://api.nzbmatrix.com/v1.1/download.php?id=1264662&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264662&username=NzbDrone&apikey=FAKEAPIKEY - Name: The GC S01E01 720p HDTV x264 FiHTV
Category: TV: HD (x264)
Size: 633.58 MB
Added: 2012-05-02 11:14:54
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - The Real Housewives of Orange County S07E09 Bowling for Champs 720p HD TV x264 - http://api.nzbmatrix.com/v1.1/download.php?id=1264660&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264660&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Real Housewives of Orange County S07E09 Bowling for Champs 720p HD TV x264
Category: TV: HD (x264)
Size: 863.08 MB
Added: 2012-05-02 11:05:42
Group: alt.binaries.multimedia
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - Hardcore Pawn S05E20 Ashleys Breakdown HDTV XviD [WRCR] - http://api.nzbmatrix.com/v1.1/download.php?id=1264659&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264659&username=NzbDrone&apikey=FAKEAPIKEY - Name: Hardcore Pawn S05E20 Ashleys Breakdown HDTV XviD [WRCR]
Category: TV: SD
Size: 199.26 MB
Added: 2012-05-02 11:02:00
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Packed To The Rafters S05E03 The Power Of Words PDTV x264 BWB - http://api.nzbmatrix.com/v1.1/download.php?id=1264642&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264642&username=NzbDrone&apikey=FAKEAPIKEY - Name: Packed To The Rafters S05E03 The Power Of Words PDTV x264 BWB
Category: TV: SD
Size: 378.34 MB
Added: 2012-05-02 10:44:35
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Friends S06E14 720p HDTV DD2 0 x264 Hype - http://api.nzbmatrix.com/v1.1/download.php?id=1264629&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264629&username=NzbDrone&apikey=FAKEAPIKEY - Name: Friends S06E14 720p HDTV DD2 0 x264 Hype
Category: TV: HD (x264)
Size: 1.05 GB
Added: 2012-05-02 10:26:25
Group: alt.binaries.tvseries
NFO: View NFO
View NZB: View
IMDB Link: Go To IMDB]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - Private Practice S05E20 720p WEB DL DD5 1 H 264 - http://api.nzbmatrix.com/v1.1/download.php?id=1264614&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264614&username=NzbDrone&apikey=FAKEAPIKEY - Name: Private Practice S05E20 720p WEB DL DD5 1 H 264
Category: TV: HD (x264)
Size: 1.69 GB
Added: 2012-05-02 09:37:11
Group: alt.binaries.hdtv
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - 90210 S04E22 720p WEB DL DD5 1 H 264 - http://api.nzbmatrix.com/v1.1/download.php?id=1264613&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264613&username=NzbDrone&apikey=FAKEAPIKEY - Name: 90210 S04E22 720p WEB DL DD5 1 H 264
Category: TV: HD (x264)
Size: 1.64 GB
Added: 2012-05-02 09:37:01
Group: alt.binaries.hdtv
View NZB: View ]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - Jimmy Kimmel 2012 05 01 David Arquette HDTV x264 2HD - http://api.nzbmatrix.com/v1.1/download.php?id=1264610&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264610&username=NzbDrone&apikey=FAKEAPIKEY - Name: Jimmy Kimmel 2012 05 01 David Arquette HDTV x264 2HD
Category: TV: SD
Size: 485.79 MB
Added: 2012-05-02 09:24:17
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - The Colbert Report 2012 05 01 Carne Ross HDTV x264 2HD - http://api.nzbmatrix.com/v1.1/download.php?id=1264605&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264605&username=NzbDrone&apikey=FAKEAPIKEY - Name: The Colbert Report 2012 05 01 Carne Ross HDTV x264 2HD
Category: TV: SD
Size: 141.84 MB
Added: 2012-05-02 09:18:47
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - The GC S01E01 HDTV x264 FiHTV - http://api.nzbmatrix.com/v1.1/download.php?id=1264603&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264603&username=NzbDrone&apikey=FAKEAPIKEY - Name: The GC S01E01 HDTV x264 FiHTV
Category: TV: SD
Size: 218.21 MB
Added: 2012-05-02 09:17:42
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - 2012 Comedy Gala NZ PDTV x264 FiHTV - http://api.nzbmatrix.com/v1.1/download.php?id=1264599&username=NzbDrone&apikey=FAKEAPIKEY - http://api.nzbmatrix.com/v1.1/download.php?id=1264599&username=NzbDrone&apikey=FAKEAPIKEY - Name: 2012 Comedy Gala NZ PDTV x264 FiHTV
Category: TV: SD
Size: 669.39 MB
Added: 2012-05-02 09:04:41
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Dancing With The Stars AU S12E03 PDTV x264 RTA - http://api.nzbmatrix.com/v1.1/download.php?id=1264596&username=markus101&apikey=23469df9e8d921a3e98d75ca08056f8a - http://api.nzbmatrix.com/v1.1/download.php?id=1264596&username=markus101&apikey=23469df9e8d921a3e98d75ca08056f8a - Name: Dancing With The Stars AU S12E03 PDTV x264 RTA
Category: TV: SD
Size: 1.30 GB
Added: 2012-05-02 08:41:54
Group: alt.binaries.multimedia
NFO: View NFO
View NZB: View ]]> - TV: SD - tv.sd - 6 - - - - Game of Thrones S02E05 720p HDTV DD5 1 x264 EbP - http://api.nzbmatrix.com/v1.1/download.php?id=1264595&username=markus101&apikey=23469df9e8d921a3e98d75ca08056f8a - http://api.nzbmatrix.com/v1.1/download.php?id=1264595&username=markus101&apikey=23469df9e8d921a3e98d75ca08056f8a - Name: Game of Thrones S02E05 720p HDTV DD5 1 x264 EbP
Category: TV: HD (x264)
Size: 3.28 GB
Added: 2012-05-02 08:36:56
Group: alt.binaries.hdtv
NFO: View NFO
View NZB: View
IMDB Link: Go To IMDB]]> - TV: HD (x264) - tv.hd (x264) - 41 - - - - \ No newline at end of file diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs index db8aff2be..e46a369b7 100644 --- a/NzbDrone.Core.Test/IndexerTests.cs +++ b/NzbDrone.Core.Test/IndexerTests.cs @@ -27,7 +27,6 @@ namespace NzbDrone.Core.Test public class IndexerTests : CoreTest { [TestCase("nzbsrus.xml")] - [TestCase("nzbmatrix.xml")] [TestCase("newznab.xml")] [TestCase("wombles.xml")] [TestCase("filesharingtalk.xml")] @@ -61,9 +60,6 @@ namespace NzbDrone.Core.Test private void WithConfiguredIndexers() { - Mocker.GetMock().SetupGet(c => c.NzbMatrixApiKey).Returns("MockedConfigValue"); - Mocker.GetMock().SetupGet(c => c.NzbMatrixUsername).Returns("MockedConfigValue"); - Mocker.GetMock().SetupGet(c => c.NzbsOrgHash).Returns("MockedConfigValue"); Mocker.GetMock().SetupGet(c => c.NzbsOrgUId).Returns("MockedConfigValue"); @@ -124,52 +120,6 @@ namespace NzbDrone.Core.Test Assert.AreEqual(LanguageType.Finnish, result.Language); } - [Test] - public void downloadFeed() - { - Mocker.Resolve(); - - var fakeSettings = Builder.CreateNew().Build(); - Mocker.GetMock() - .Setup(c => c.GetSettings(It.IsAny())) - .Returns(fakeSettings); - - Mocker.Resolve().FetchRss(); - - Mark500Inconclusive(); - ExceptionVerification.IgnoreWarns(); - } - - [TestCase("simpsons", 21, 23)] - [TestCase("The walking dead", 2, 10)] - public void nzbmatrix_search_returns_valid_results(string title, int season, int episode) - { - WithConfiguredIndexers(); - - - Mocker.Resolve(); - - var result = Mocker.Resolve().FetchEpisode(title, season, episode); - - Mark500Inconclusive(); - - result.Should().NotBeEmpty(); - } - - [Test] - public void nzbmatrix_multi_word_search_returns_valid_results() - { - WithConfiguredIndexers(); - - Mocker.Resolve(); - - var result = Mocker.Resolve().FetchEpisode("Blue Bloods", 1, 19); - - Mark500Inconclusive(); - - result.Should().NotBeEmpty(); - } - [TestCase("hawaii five-0 (2010)", "hawaii+five+0+2010")] [TestCase("this& that", "this+that")] [TestCase("this& that", "this+that")] @@ -182,32 +132,6 @@ namespace NzbDrone.Core.Test result.Should().Be(clean); } - [TestCase("hawaii five-0 (2010)", "hawaii+five+0+2010")] - [TestCase("this& that", "this+that")] - [TestCase("this& that", "this+that")] - [TestCase("grey's anatomy", "greys+anatomy")] - public void get_query_title_nzbmatrix_should_replace_apostrophe_with_empty_string(string raw, string clean) - { - var result = Mocker.Resolve().GetQueryTitle(raw); - result.Should().Be(clean); - } - - [Test] - public void size_nzbmatrix() - { - WithConfiguredIndexers(); - - Mocker.GetMock() - .Setup(h => h.DownloadStream(It.IsAny(), It.IsAny())) - .Returns(File.OpenRead(".\\Files\\Rss\\SizeParsing\\nzbmatrix.xml")); - - //Act - var parseResults = Mocker.Resolve().FetchRss(); - - parseResults.Should().HaveCount(1); - parseResults[0].Size.Should().Be(1331439862); - } - [Test] public void size_nzbsrus() { @@ -344,24 +268,6 @@ namespace NzbDrone.Core.Test parseResults.Should().NotContain(s => s.NzbUrl.Contains("details")); } - [Test] - public void nzbmatrix_should_use_age_from_custom() - { - WithConfiguredIndexers(); - - var expectedAge = DateTime.Now.Subtract(new DateTime(2011, 4, 25, 15, 6, 58)).Days; - - Mocker.GetMock() - .Setup(h => h.DownloadStream(It.IsAny(), It.IsAny())) - .Returns(File.OpenRead(".\\Files\\Rss\\SizeParsing\\nzbmatrix.xml")); - - //Act - var parseResults = Mocker.Resolve().FetchRss(); - - parseResults.Should().HaveCount(1); - parseResults[0].Age.Should().Be(expectedAge); - } - private static void Mark500Inconclusive() { ExceptionVerification.MarkInconclusive(typeof(WebException)); @@ -422,26 +328,6 @@ namespace NzbDrone.Core.Test } } - [Test] - public void NzbMatrix_NzbInfoUrl_should_contain_information_string() - { - WithConfiguredIndexers(); - - const string fileName = "nzbmatrix.xml"; - const string expectedString = "nzb-details"; - - 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 Newznab_NzbInfoUrl_should_contain_information_string() { diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 77485c464..97f786122 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -306,18 +306,9 @@ Always - - Always - Always - - Always - - - Always - Always diff --git a/NzbDrone.Core.Test/ProviderTests/IndexerProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/IndexerProviderTest.cs index d1f732ca6..04502e7da 100644 --- a/NzbDrone.Core.Test/ProviderTests/IndexerProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/IndexerProviderTest.cs @@ -166,7 +166,7 @@ namespace NzbDrone.Core.Test.ProviderTests protected override string[] Urls { - get { return new[] { "http://rss.nzbmatrix.com/rss.php?cat=TV" }; } + get { return new[] { "http://rss.nzbs.com/rss.php?cat=TV" }; } } public override bool IsConfigured @@ -279,7 +279,7 @@ namespace NzbDrone.Core.Test.ProviderTests protected override string[] Urls { - get { return new[] { "http://rss.nzbmatrix.com/rss.php?cat=TV" }; } + get { return new[] { "http://rss.nzbs.com/rss.php?cat=TV" }; } } public override bool IsConfigured diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 79ef4d2ff..137eeb4d9 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -86,7 +86,6 @@ namespace NzbDrone.Core private void InitIndexers() { logger.Debug("Initializing Indexers..."); - Kernel.Bind().To(); Kernel.Bind().To(); Kernel.Bind().To(); Kernel.Bind().To(); diff --git a/NzbDrone.Core/Datastore/Migrations/Migration20121209.cs b/NzbDrone.Core/Datastore/Migrations/Migration20121209.cs new file mode 100644 index 000000000..db71af7e5 --- /dev/null +++ b/NzbDrone.Core/Datastore/Migrations/Migration20121209.cs @@ -0,0 +1,18 @@ +using System; +using System.Data; +using Migrator.Framework; +using NzbDrone.Common; + +namespace NzbDrone.Core.Datastore.Migrations +{ + [Migration(20121209)] + public class Migration20121209 : NzbDroneMigration + { + protected override void MainDbUpgrade() + { + Database.ExecuteNonQuery("DELETE FROM Config WHERE [KEY] = 'NzbMatrixUsername'"); + Database.ExecuteNonQuery("DELETE FROM Config WHERE [KEY] = 'NzbMatrixApiKey'"); + Database.ExecuteNonQuery("DELETE FROM IndexerDefinitions WHERE IndexProviderType = 'NzbDrone.Core.Providers.Indexer.NzbMatrix'"); + } + } +} \ No newline at end of file diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index c878c2b97..040b15634 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -227,6 +227,7 @@ + @@ -454,9 +455,6 @@ Code - - Code - Code diff --git a/NzbDrone.Core/Providers/Core/ConfigProvider.cs b/NzbDrone.Core/Providers/Core/ConfigProvider.cs index 6f7c64ef1..8ce01e061 100644 --- a/NzbDrone.Core/Providers/Core/ConfigProvider.cs +++ b/NzbDrone.Core/Providers/Core/ConfigProvider.cs @@ -33,20 +33,6 @@ namespace NzbDrone.Core.Providers.Core return _database.Fetch(); } - public virtual String NzbMatrixUsername - { - get { return GetValue("NzbMatrixUsername"); } - - set { SetValue("NzbMatrixUsername", value); } - } - - public virtual String NzbMatrixApiKey - { - get { return GetValue("NzbMatrixApiKey"); } - - set { SetValue("NzbMatrixApiKey", value); } - } - public virtual String NzbsOrgUId { get { return GetValue("NzbsOrgUId"); } diff --git a/NzbDrone.Core/Providers/Indexer/NzbMatrix.cs b/NzbDrone.Core/Providers/Indexer/NzbMatrix.cs deleted file mode 100644 index 4760d8671..000000000 --- a/NzbDrone.Core/Providers/Indexer/NzbMatrix.cs +++ /dev/null @@ -1,134 +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 NzbMatrix : IndexerBase - { - [Inject] - public NzbMatrix(HttpProvider httpProvider, ConfigProvider configProvider) - : base(httpProvider, configProvider) - { - } - - private static readonly Regex TitleSearchRegex = new Regex(@"[\W]", RegexOptions.IgnoreCase | RegexOptions.Compiled); - - protected override string[] Urls - { - get - { - return new[] - { - string.Format( - "http://rss.nzbmatrix.com/rss.php?page=download&username={0}&apikey={1}&subcat=6,41&english=1&scenename=1&num=50", - _configProvider.NzbMatrixUsername, - _configProvider.NzbMatrixApiKey) - }; - } - } - - public override bool IsConfigured - { - get - { - return !string.IsNullOrWhiteSpace(_configProvider.NzbMatrixUsername) && - !string.IsNullOrWhiteSpace(_configProvider.NzbMatrixApiKey); - } - } - - protected override IList GetEpisodeSearchUrls(string seriesTitle, int seasonNumber, int episodeNumber) - { - var searchUrls = new List(); - - foreach (var url in Urls) - { - searchUrls.Add(String.Format("{0}&term=(\"{1}+s{2:00}e{3:00}\",\"{1}+{2}x{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}&term={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}&term=(\"{1}+Season\",\"{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}&term=(\"{1}+S{2:00}E{3}\", \"{1}+{2}x{3}\")", url, seriesTitle, seasonNumber, episodeWildcard)); - } - - return searchUrls; - } - - public override string Name - { - get { return "NzbMatrix"; } - } - - protected override string NzbDownloadUrl(SyndicationItem item) - { - return item.Links[0].Uri.ToString(); - } - - protected override string NzbInfoUrl(SyndicationItem item) - { - return Regex.Match(item.Summary.Text, "(?<=\\View\\<\\/a\\>)", RegexOptions.Compiled | RegexOptions.IgnoreCase).Value; - } - - protected override EpisodeParseResult CustomParser(SyndicationItem item, EpisodeParseResult currentResult) - { - if (currentResult != null) - { - var sizeString = Regex.Match(item.Summary.Text, @"Size: \d+\.\d{1,2} \w{2}
", RegexOptions.IgnoreCase).Value; - currentResult.Size = Parser.GetReportSize(sizeString); - - var ageString = Regex.Match(item.Summary.Text, @"(?<=\Added\:\<\/b\>\s)(?.+?)(?=\
)", RegexOptions.Compiled | RegexOptions.IgnoreCase).Value; - currentResult.Age = DateTime.Now.Subtract(DateTime.Parse(ageString)).Days; - } - - return currentResult; - } - - public override string GetQueryTitle(string title) - { - //Replace apostrophe with empty string - title = title.Replace("'", ""); - title = RemoveThe.Replace(title, string.Empty); - var cleanTitle = TitleSearchRegex.Replace(title, "+").Trim('+', ' '); - - //remove any repeating +s - cleanTitle = Regex.Replace(cleanTitle, @"\+{1,100}", "+"); - return cleanTitle; - } - } -} \ No newline at end of file diff --git a/NzbDrone.Web/Content/Images/Indexers/Newzbin.png b/NzbDrone.Web/Content/Images/Indexers/Newzbin.png deleted file mode 100644 index 66ebe4329e24f1fb090caca12ebbd1679540ce1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 902 zcmV;119|+3P)0 zUG|N9-iY=-__OKYwPSHi)(xEa1C6%8;M$*)BbAyX@9F8u_4=u0ag@KGnon#Nx8UYA zJoRv5xM1T{vK1BpkhfDJEK5k{Qsc(~5eaoa@U@rWrH2AIxKOlCrSlbAkx0?eyo39i z&|sFfJ~@|JTnTo>-wi4lW2V6CsWaa_8;ykY=N{RU$=7gj#l*<@O&qD#NG0CL)ONq? z+cSAgj~DRi%KYkWok)B@Eq@&Fx|$gUGzr|lx}L{{Y%b!7#OAO4wcW-v4fi#%@rc4o zsWP579sYtX=vBKRGF8hj#3KP0IETsr01`t-TLkIcb+0+U)Yux|J7qA!W@|{yTHw5f zY|)|Dm#;f?2}>176a-vSQ~-Drz$5@)$iV3q16OQ949JS!7w?{E z(IE{^AXQmgPI@BI-wd}0jDS!AfGH}t03!rHQ3)+I2mM70aJk&V)!?sWGwCO1GMS8D zh2n3%v&R+~Qgjz6g+u|AsH{K`D1=}yCHSV@htbt-l>BZ@4|#N>#F=$}*UlH;>cOsN z9or0ePu3*JI*ODFjD*`e_Ztj9a)G|PeKAE*BfaJMR5qmj_>dHHXg@ zZ<|?3#vM$f2PB50|9K&M3u6r8=}TJ#GiBtKW*4krAmr9mS<6?2X6V`*Ou^i@IIKw`tXGTt=9*;$q8(otIz~?H#ti_Y|9j&ClG> cT&m~&4e|w7Z`48GO8@`>07*qoM6N<$g3HyCT6M_Vn@tEB@HAb)CVX^@v-cpF4~35 z4pyNQtzc~Hu2Ml=DGGuS!HuBBji3aokkG275eYSFjm@KZjftgB)MjSxz29*WGHP(= zS)J#f^Y|YnBEox!ooDL@1DrqC(bp`oM@T9G52OMU9cXX)v9^{gbAI(^2UFARZa?zN z>A(J*;{NZCFs_Q%iHf*rShKojvh(WBHe(nE&~pi~=fe{h?;a|JLSx%vve`vAVyX;O zSx8w=Ivvq-XQHmFi&K@B=ahj7j{ZHEUlItI(6VyvGBAQl9NJq%c@&VYPV>c%@3xQU z$yG*}DYG?q@Y3~QK?bc9C?PN*z1@!)>dWJT5U_4AF9 z9-qpf6bJ$Wu|%wDTTXuTDW&HT%7FM7?_;!4437T)!O1g2XY4-(4qWYi*zCeGh~xE6 zBEpR0qt;d2`=cKhI>OLm1BG)I(E-Dg0}b}sG%YF#&_sX$>Mf8Z4H>e9#b`954GKk) z2uV`l@DE#d>!vKA60Iz=Y_Sx}Wj_0K^~1JC4pz=sU&HYopKtChM+pkhT8JZI zVt5KIW)@UwyjarJD%$_``kdB0f0GBLZ7pt(QxPHw+Qy8H6qqRj+5(1hY)Rw=7fye9 ztUASS@1*kBGtPc{>{_l|3>oenAi)zTPqhnJ`*G9YS35U!H7;itPxz+2HaGV)Eai4)Aw4eOkygB9o~ZYI=T~hzA9LL6nfw3%002ovPDHLkV1hgf BMq>Z~ diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index a90741d5e..8f0753d75 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -95,16 +95,12 @@ namespace NzbDrone.Web.Controllers { Retention = _configProvider.Retention, - NzbMatrixUsername = _configProvider.NzbMatrixUsername, - NzbMatrixApiKey = _configProvider.NzbMatrixApiKey, - NzbsrusUId = _configProvider.NzbsrusUId, NzbsrusHash = _configProvider.NzbsrusHash, FileSharingTalkUid = _configProvider.FileSharingTalkUid, FileSharingTalkSecret = _configProvider.FileSharingTalkSecret, - NzbMatrixEnabled = _indexerProvider.GetSettings(typeof(NzbMatrix)).Enable, NzbsRUsEnabled = _indexerProvider.GetSettings(typeof(NzbsRUs)).Enable, NewznabEnabled = _indexerProvider.GetSettings(typeof(Newznab)).Enable, WomblesEnabled = _indexerProvider.GetSettings(typeof(Wombles)).Enable, @@ -375,10 +371,6 @@ namespace NzbDrone.Web.Controllers { _configProvider.Retention = data.Retention; - var nzbMatrixSettings = _indexerProvider.GetSettings(typeof(NzbMatrix)); - nzbMatrixSettings.Enable = data.NzbMatrixEnabled; - _indexerProvider.SaveSettings(nzbMatrixSettings); - var nzbsRUsSettings = _indexerProvider.GetSettings(typeof(NzbsRUs)); nzbsRUsSettings.Enable = data.NzbsRUsEnabled; _indexerProvider.SaveSettings(nzbsRUsSettings); @@ -403,9 +395,6 @@ namespace NzbDrone.Web.Controllers nzbClubSettings.Enable = data.NzbClubEnabled; _indexerProvider.SaveSettings(nzbClubSettings); - _configProvider.NzbMatrixUsername = data.NzbMatrixUsername; - _configProvider.NzbMatrixApiKey = data.NzbMatrixApiKey; - _configProvider.NzbsrusUId = data.NzbsrusUId; _configProvider.NzbsrusHash = data.NzbsrusHash; diff --git a/NzbDrone.Web/Models/IndexerSettingsModel.cs b/NzbDrone.Web/Models/IndexerSettingsModel.cs index ed80db35b..2cbc4ba6b 100644 --- a/NzbDrone.Web/Models/IndexerSettingsModel.cs +++ b/NzbDrone.Web/Models/IndexerSettingsModel.cs @@ -9,20 +9,6 @@ namespace NzbDrone.Web.Models { public class IndexerSettingsModel { - [DataType(DataType.Text)] - [DisplayName("Username")] - [Description("Username for NZB Matrix")] - [DisplayFormat(ConvertEmptyStringToNull = false)] - [RequiredIf("NzbMatrixEnabled", true, ErrorMessage = "Username Required when NZBMatrix is enabled")] - public String NzbMatrixUsername { get; set; } - - [DataType(DataType.Text)] - [DisplayName("API Key")] - [Description("API Key for NZB Matrix")] - [DisplayFormat(ConvertEmptyStringToNull = false)] - [RequiredIf("NzbMatrixEnabled", true, ErrorMessage = "API Key Required when NZBMatrix is enabled")] - public String NzbMatrixApiKey { get; set; } - [DataType(DataType.Text)] [DisplayName("User ID")] [Description("User ID for NZBsRus")] @@ -51,10 +37,6 @@ namespace NzbDrone.Web.Models [RequiredIf("FileSharingTalkEnabled", true, ErrorMessage = "Password Secret Required when File Sharing Talk is enabled")] public String FileSharingTalkSecret { get; set; } - [DisplayName("NZB Matrix")] - [Description("Enable downloading episodes from NZB Matrix")] - public bool NzbMatrixEnabled { get; set; } - [DisplayName("NZBsRUs")] [Description("Enable downloading episodes from NZBsRus")] public bool NzbsRUsEnabled { get; set; } diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index c49922708..354702db6 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -273,8 +273,6 @@ - - diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml index 819623dc3..66c216b62 100644 --- a/NzbDrone.Web/Views/Settings/Indexers.cshtml +++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml @@ -11,10 +11,7 @@ } -
- @Html.CheckBox("nzbMatrixStatus", @Model.NzbMatrixEnabled, new { @class = "indexerStatusButton" }) - - +
@Html.CheckBox("nzbsRusStatus", @Model.NzbsRUsEnabled, new { @class = "indexerStatusButton" }) @@ -37,24 +34,6 @@ @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "IndexersForm", name = "IndexersForm", @class = "settingsForm" })) {
-

NZBMatrix

-
- - @Html.CheckBoxFor(m => m.NzbMatrixEnabled, new { @class = "inputClass checkClass enabledCheck" }) - - @Html.TextBoxFor(m => m.NzbMatrixUsername, new { @class = "inputClass" }) - - @Html.TextBoxFor(m => m.NzbMatrixApiKey, new { @class = "inputClass" }) -
-

NZBsRus

NZBsRus does not support backlog searching
@@ -195,9 +174,6 @@ var id = $(this).prop('id'); var checked = $(this).prop('checked'); - if (id == 'NzbMatrixEnabled') - $('#nzbMatrixStatus').prop('checked', checked); - if (id == 'NzbsRUsEnabled') $('#nzbsRusStatus').prop('checked', checked); @@ -223,9 +199,6 @@ $(document).on('change', '.indexerStatusButton', function () { var id = $(this).prop('id'); var checked = $(this).prop('checked'); - - if (id == 'nzbMatrixStatus') - $('#NzbMatrixEnabled').prop('checked', checked); if (id == 'nzbsRusStatus') $('#NzbsRUsEnabled').prop('checked', checked);