Mirrors/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-30 07:22:35 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into backbone

Browse Source
This commit is contained in:
Mark McDowall 2012-12-03 18:13:19 -08:00
commit ecab574042
16 changed files with 22 additions and 3999 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
NzbDrone.Core.Test/Files/RSS/SizeParsing/newzbin.xml
View File

@ -1,82 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<rss version="2.0" xml:lang="en-GB"
xmlns:report="http://www.newzbin2.es/DTD/2007/feeds/report/">
<channel>
<title>www.newzbin.com (reports)</title>
<link>http://www.newzbin.com/browse/category/p/tv/</link>
<description>Newzbin Reports Feed</description>
<pubDate>Mon, 25 Apr 2011 16:08:24 GMT</pubDate>
<ttl>42</ttl>
<generator>www.newzbin.com - Usenet Search</generator>
<copyright>Copyright (c) 2002 - 2007 Newzbin Limited. All Rights Reserved.</copyright>
<image>
<url>http://www.newzbin.com/m/i/logo/newzbinv3.png</url>
<link>http://www.newzbin.com/browse/category/p/tv/</link>
<title>www.newzbin.com</title>
<description>Visit Newzbin.com - The Ultimate In Usenet Indexing</description>
</image>
<item>
<title>Rookie Blue - 1x10 - Big Nickel</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/6076287/</guid>
<link>http://www.newzbin.com/browse/post/6076287/</link>
<comments>http://www.newzbin.com/browse/post/6076287/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/6076287">6076287</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=6076287">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/6076287/nzb/">NZB</a>)
(<a href="http://www.newzbin.com/nfo/view/txt/373966350/">NFO</a>)
(<a href="http://www.tvrage.com/Rookie_Blue/episodes/1064943067/1x10/">More Info</a>)
(Size: 1,235.6MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - TV Cap, HDTV | Video Format - x264, 720p | Video Genre - Action/Adv, Crime, Drama, Family | Language - English, German
</li>
<li>Groups: alt.binaries.illuminaten</li>
<li>Poster: AuToMaTiC &#60;AuTo@Illuminatenboard.org&#62;</li>
<li>PostDate: Sunday 06 Mar 2011, 01:05PM PDT</li>
</ul> ]]>
</description>
<report:id>6076287</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">TV Cap</report:attribute>
<report:attribute type="Source">HDTV</report:attribute>
<report:attribute type="Video Fmt">x264</report:attribute>
<report:attribute type="Video Fmt">720p</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Video Genre">Family</report:attribute>
<report:attribute type="Language">English</report:attribute>
<report:attribute type="Language">German</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.illuminaten</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/Rookie_Blue/episodes/1064943067/1x10/</report:moreinfo>
<report:nfo>
<report:fileid>373966350</report:fileid>
<report:filename>rookieblue-s01e10-720p-tvp.nfo</report:filename>
<report:link>http://www.newzbin.com/nfo/view/txt/373966350/</report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/6076287/nzb/</report:nzb>
<report:poster>AuToMaTiC &#60;AuTo@Illuminatenboard.org&#62;</report:poster>
<report:size type="bytes">1295652290</report:size>
<report:postdate>Sun, 06 Mar 2011 21:05:58 GMT</report:postdate>
<report:stats>
<report:views>2</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/6076287/nzb/"
length="1295652290" type="application/x-nzb" />
<pubDate>Mon, 25 Apr 2011 11:55:04 GMT</pubDate>
</item>
</channel>
</rss>

577
NzbDrone.Core.Test/Files/RSS/newbin_none_english.xml
View File

@ -1,577 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<rss version="2.0" xml:lang="en-GB"
xmlns:report="http://www.newzbin.com/DTD/2007/feeds/report/">
<channel>
<title>www.newzbin.com (reports)</title>
<link>http://www.newzbin.com/search/query/?q=plain+sight+1x11&#38;area=-1&#38;fpn=p&#38;searchaction=Go&#38;btnG_x=0&#38;btnG_y=0&#38;btnG=Go&#38;areadone=-1</link>
<description>Newzbin Reports Feed</description>
<pubDate>Sun, 10 Jul 2011 19:26:13 GMT</pubDate>
<ttl>42</ttl>
<generator>www.newzbin.com - Usenet Search</generator>
<copyright>Copyright (c) 2002 - 2007 Newzbin Limited. All Rights Reserved.</copyright>
<image>
<url>http://www.newzbin.com/m/i/logo/newzbinv3.png</url>
<link>http://www.newzbin.com/search/query/?q=plain+sight+1x11&#38;area=-1&#38;fpn=p&#38;searchaction=Go&#38;btnG_x=0&#38;btnG_y=0&#38;btnG=Go&#38;areadone=-1</link>
<title>www.newzbin.com</title>
<description>Visit Newzbin.com - The Ultimate In Usenet Indexing</description>
</image>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/6168058/</guid>
<link>http://www.newzbin.com/browse/post/6168058/</link>
<comments>http://www.newzbin.com/browse/post/6168058/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/6168058">6168058</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=6168058">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/6168058/nzb/">NZB</a>)
(<a href="http://www.newzbin.com/nfo/view/txt/393774229/">NFO</a>)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 401.0MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - DVD | Video Format - XviD | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - German
</li>
<li>Groups: alt.binaries.tv.deutsch, alt.binaries.ath, alt.binaries.ghosts</li>
<li>Poster: GhostUp10Special &#60;Besuche.uns@ghost-of-usenet.org&#62;</li>
<li>PostDate: Thursday 05 May 2011, 04:43PM PDT</li>
</ul> ]]>
</description>
<report:id>6168058</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">DVD</report:attribute>
<report:attribute type="Video Fmt">XviD</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">German</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.tv.deutsch</report:group>
<report:group>alt.binaries.ath</report:group>
<report:group>alt.binaries.ghosts</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>393774229</report:fileid>
<report:filename>deli-inplainsightxvid-s01e11.nfo</report:filename>
<report:link>http://www.newzbin.com/nfo/view/txt/393774229/</report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/6168058/nzb/</report:nzb>
<report:poster>GhostUp10Special &#60;Besuche.uns@ghost-of-usenet.org&#62;</report:poster>
<report:size type="bytes">420447818</report:size>
<report:postdate>Thu, 05 May 2011 23:43:45 GMT</report:postdate>
<report:stats>
<report:views>4</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/6168058/nzb/"
length="420447818" type="application/x-nzb" />
<pubDate>Fri, 17 Jun 2011 05:09:03 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/6161398/</guid>
<link>http://www.newzbin.com/browse/post/6161398/</link>
<comments>http://www.newzbin.com/browse/post/6161398/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/6161398">6161398</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=6161398">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/6161398/nzb/">NZB</a>)
(<a href="http://www.newzbin.com/nfo/view/txt/300006301/">NFO</a>)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 409.7MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - DVD | Video Format - XviD | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - Italian
</li>
<li>Groups: alt.binaries.tv</li>
<li>Poster: Bombvis (Bombvis)</li>
<li>PostDate: Tuesday 06 Apr 2010, 04:52AM PDT</li>
</ul> ]]>
</description>
<report:id>6161398</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">DVD</report:attribute>
<report:attribute type="Video Fmt">XviD</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">English</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.tv</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>300006301</report:fileid>
<report:filename>tpz-inplainsight111.nfo</report:filename>
<report:link>http://www.newzbin.com/nfo/view/txt/300006301/</report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/6161398/nzb/</report:nzb>
<report:poster>Bombvis (Bombvis)</report:poster>
<report:size type="bytes">429553520</report:size>
<report:postdate>Tue, 06 Apr 2010 11:52:26 GMT</report:postdate>
<report:stats>
<report:views>5</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/6161398/nzb/"
length="429553520" type="application/x-nzb" />
<pubDate>Mon, 13 Jun 2011 08:17:25 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/6108215/</guid>
<link>http://www.newzbin.com/browse/post/6108215/</link>
<comments>http://www.newzbin.com/browse/post/6108215/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/6108215">6108215</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=6108215">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/6108215/nzb/">NZB</a>)
(<a href="http://www.newzbin.com/nfo/view/txt/393598550/">NFO</a>)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 403.2MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - DVD | Video Format - XviD | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - German, English
</li>
<li>Groups: alt.binaries.mom, alt.binaries.tv.german</li>
<li>Poster: Zzzzzzz &#60;Zzzzzzz@Zzzzzzz.Zz&#62;</li>
<li>PostDate: Thursday 05 May 2011, 06:18AM PDT</li>
</ul> ]]>
</description>
<report:id>6108215</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">DVD</report:attribute>
<report:attribute type="Video Fmt">XviD</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">German</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.mom</report:group>
<report:group>alt.binaries.tv.german</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>393598550</report:fileid>
<report:filename>In.Plain.Sight.S01E11.Die.falsche.Schwester.German.WS.DVDRip.XviD-DELiCiOUS__www.realmom.info__.nfo</report:filename>
<report:link>http://www.newzbin.com/nfo/view/txt/393598550/</report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/6108215/nzb/</report:nzb>
<report:poster>Zzzzzzz &#60;Zzzzzzz@Zzzzzzz.Zz&#62;</report:poster>
<report:size type="bytes">422762521</report:size>
<report:postdate>Thu, 05 May 2011 13:18:03 GMT</report:postdate>
<report:stats>
<report:views>4</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/6108215/nzb/"
length="422762521" type="application/x-nzb" />
<pubDate>Mon, 09 May 2011 07:35:25 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/5955780/</guid>
<link>http://www.newzbin.com/browse/post/5955780/</link>
<comments>http://www.newzbin.com/browse/post/5955780/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/5955780">5955780</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=5955780">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/5955780/nzb/">NZB</a>)
(<a href="http://www.newzbin.com/nfo/view/txt/368038897/">NFO</a>)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 1,321.7MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - TV Cap, HDTV | Video Format - x264, 720p | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - French
</li>
<li>Groups: alt.binaries.multimedia, alt.binaries.teevee</li>
<li>Poster: nothing@here.com &#60;nothing here&#62;</li>
<li>PostDate: Sunday 13 Feb 2011, 01:07PM PDT</li>
</ul> ]]>
</description>
<report:id>5955780</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">TV Cap</report:attribute>
<report:attribute type="Source">HDTV</report:attribute>
<report:attribute type="Video Fmt">x264</report:attribute>
<report:attribute type="Video Fmt">720p</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">French</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.multimedia</report:group>
<report:group>alt.binaries.teevee</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>368038897</report:fileid>
<report:filename>in.plain.sight.s01e11.french.720p.hdtv.x264-hybris.nfo</report:filename>
<report:link>http://www.newzbin.com/nfo/view/txt/368038897/</report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/5955780/nzb/</report:nzb>
<report:poster>nothing@here.com &#60;nothing here&#62;</report:poster>
<report:size type="bytes">1385894096</report:size>
<report:postdate>Sun, 13 Feb 2011 21:07:51 GMT</report:postdate>
<report:stats>
<report:views>8</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/5955780/nzb/"
length="1385894096" type="application/x-nzb" />
<pubDate>Sun, 13 Feb 2011 21:44:05 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/5921224/</guid>
<link>http://www.newzbin.com/browse/post/5921224/</link>
<comments>http://www.newzbin.com/browse/post/5921224/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/5921224">5921224</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=5921224">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/5921224/nzb/">NZB</a>)
(NFO)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 360.2MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - DVD | Video Format - XviD | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - German
</li>
<li>Groups: alt.binaries.cores</li>
<li>Poster: 0</li>
<li>PostDate: Tuesday 12 Jan 2010, 05:29PM PDT</li>
</ul> ]]>
</description>
<report:id>5921224</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">DVD</report:attribute>
<report:attribute type="Video Fmt">XviD</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">German</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.cores</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>0</report:fileid>
<report:filename></report:filename>
<report:link></report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/5921224/nzb/</report:nzb>
<report:poster>0</report:poster>
<report:size type="bytes">377678229</report:size>
<report:postdate>Wed, 13 Jan 2010 01:29:08 GMT</report:postdate>
<report:stats>
<report:views>5</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/5921224/nzb/"
length="377678229" type="application/x-nzb" />
<pubDate>Fri, 21 Jan 2011 00:49:58 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/5913200/</guid>
<link>http://www.newzbin.com/browse/post/5913200/</link>
<comments>http://www.newzbin.com/browse/post/5913200/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/5913200">5913200</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=5913200">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/5913200/nzb/">NZB</a>)
(NFO)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 369.4MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - DVD | Video Format - XviD | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - German
</li>
<li>Groups: alt.binaries.cores, alt.binaries.tv.deutsch, alt.binaries.ath</li>
<li>Poster: poster17@illuminatenboard.org &#60;JBinUp@JBinUp&#62;</li>
<li>PostDate: Friday 15 Jan 2010, 05:42PM PDT</li>
</ul> ]]>
</description>
<report:id>5913200</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">DVD</report:attribute>
<report:attribute type="Video Fmt">XviD</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">German</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.cores</report:group>
<report:group>alt.binaries.tv.deutsch</report:group>
<report:group>alt.binaries.ath</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>0</report:fileid>
<report:filename></report:filename>
<report:link></report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/5913200/nzb/</report:nzb>
<report:poster>poster17@illuminatenboard.org &#60;JBinUp@JBinUp&#62;</report:poster>
<report:size type="bytes">387306157</report:size>
<report:postdate>Sat, 16 Jan 2010 01:42:41 GMT</report:postdate>
<report:stats>
<report:views>4</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/5913200/nzb/"
length="387306157" type="application/x-nzb" />
<pubDate>Fri, 14 Jan 2011 21:03:52 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/5666339/</guid>
<link>http://www.newzbin.com/browse/post/5666339/</link>
<comments>http://www.newzbin.com/browse/post/5666339/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/5666339">5666339</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=5666339">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/5666339/nzb/">NZB</a>)
(<a href="http://www.newzbin.com/nfo/view/txt/285077994/">NFO</a>)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 400.7MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - DVD | Video Format - XviD | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - German
</li>
<li>Groups: alt.binaries.cores, alt.binaries.tv.deutsch, alt.binaries.mom, alt.binaries.ath, alt.binaries.ghosts</li>
<li>Poster: JBinUp.com &#60;JBinUp@JBinUp.local&#62;</li>
<li>PostDate: Tuesday 12 Jan 2010, 03:15PM PDT</li>
</ul> ]]>
</description>
<report:id>5666339</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">DVD</report:attribute>
<report:attribute type="Video Fmt">XviD</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">German</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.cores</report:group>
<report:group>alt.binaries.tv.deutsch</report:group>
<report:group>alt.binaries.mom</report:group>
<report:group>alt.binaries.ath</report:group>
<report:group>alt.binaries.ghosts</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>285077994</report:fileid>
<report:filename>isd-plain-s01e11.nfo</report:filename>
<report:link>http://www.newzbin.com/nfo/view/txt/285077994/</report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/5666339/nzb/</report:nzb>
<report:poster>JBinUp.com &#60;JBinUp@JBinUp.local&#62;</report:poster>
<report:size type="bytes">420211504</report:size>
<report:postdate>Tue, 12 Jan 2010 23:15:45 GMT</report:postdate>
<report:stats>
<report:views>11</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/5666339/nzb/"
length="420211504" type="application/x-nzb" />
<pubDate>Fri, 25 Jun 2010 18:46:39 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/5663181/</guid>
<link>http://www.newzbin.com/browse/post/5663181/</link>
<comments>http://www.newzbin.com/browse/post/5663181/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/5663181">5663181</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=5663181">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/5663181/nzb/">NZB</a>)
(NFO)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 400.6MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - DVD | Video Format - XviD | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - French
</li>
<li>Groups: alt.binaries.movies.zeromovies, alt.binaries.series.tv.divx.french</li>
<li>Poster: per amica silentia lunae &#60;mail@mail.com&#62;</li>
<li>PostDate: Wednesday 16 Jun 2010, 09:27AM PDT</li>
</ul> ]]>
</description>
<report:id>5663181</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">DVD</report:attribute>
<report:attribute type="Video Fmt">XviD</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">French</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.movies.zeromovies</report:group>
<report:group>alt.binaries.series.tv.divx.french</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>0</report:fileid>
<report:filename></report:filename>
<report:link></report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/5663181/nzb/</report:nzb>
<report:poster>per amica silentia lunae &#60;mail@mail.com&#62;</report:poster>
<report:size type="bytes">420039144</report:size>
<report:postdate>Wed, 16 Jun 2010 16:27:43 GMT</report:postdate>
<report:stats>
<report:views>2</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/5663181/nzb/"
length="420039144" type="application/x-nzb" />
<pubDate>Wed, 23 Jun 2010 12:52:27 GMT</pubDate>
</item>
<item>
<title>In Plain Sight - 1x11 - Stan By Me</title>
<guid isPermaLink="true">http://www.newzbin.com/browse/post/5576127/</guid>
<link>http://www.newzbin.com/browse/post/5576127/</link>
<comments>http://www.newzbin.com/browse/post/5576127/#CommentsPH</comments>
<description>
<![CDATA[
<ul>
<li>
ID: <a href="http://www.newzbin.com/browse/post/5576127">5576127</a>
(<a
href="http://www.newzbin.com/account/bookmarks/add/?ps_id=5576127">Bookmark</a>)
(<a href="http://www.newzbin.com/browse/post/5576127/nzb/">NZB</a>)
(NFO)
(<a href="http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/">More Info</a>)
(Size: 1,490.2MB)
</li>
<li>
Attributes:
Category - TV
| Video Source - HDTV | Video Format - H.264, 720p | Video Genre - Action/Adv, Comedy, Crime, Drama | Language - French, German
</li>
<li>Groups: alt.binaries.ath, alt.binaries.hdtv.x264, alt.binaries.U-4all, alt.binaries.hdtv.german</li>
<li>Poster: ich &#60;usenet@u-4all.org&#62;</li>
<li>PostDate: Monday 22 Feb 2010, 02:33AM PDT</li>
</ul> ]]>
</description>
<report:id>5576127</report:id>
<report:category>TV</report:category>
<report:attributes>
<report:attribute type="Source">HDTV</report:attribute>
<report:attribute type="Video Fmt">H.264</report:attribute>
<report:attribute type="Video Fmt">720p</report:attribute>
<report:attribute type="Video Genre">Action/Adv</report:attribute>
<report:attribute type="Video Genre">Comedy</report:attribute>
<report:attribute type="Video Genre">Crime</report:attribute>
<report:attribute type="Video Genre">Drama</report:attribute>
<report:attribute type="Language">English</report:attribute>
<report:attribute type="Language">German</report:attribute>
</report:attributes>
<report:groups>
<report:group>alt.binaries.ath</report:group>
<report:group>alt.binaries.hdtv.x264</report:group>
<report:group>alt.binaries.U-4all</report:group>
<report:group>alt.binaries.hdtv.german</report:group>
</report:groups>
<report:progress value="1">Report is complete</report:progress>
<report:moreinfo>http://www.tvrage.com/In_Plain_Sight/episodes/665532/1x11/</report:moreinfo>
<report:nfo>
<report:fileid>0</report:fileid>
<report:filename></report:filename>
<report:link></report:link>
</report:nfo>
<report:nzb>http://www.newzbin.com/browse/post/5576127/nzb/</report:nzb>
<report:poster>ich &#60;usenet@u-4all.org&#62;</report:poster>
<report:size type="bytes">1562556611</report:size>
<report:postdate>Mon, 22 Feb 2010 10:33:35 GMT</report:postdate>
<report:stats>
<report:views>31</report:views>
<report:comments>0</report:comments>
</report:stats>
<enclosure url="http://www.newzbin.com/browse/post/5576127/nzb/"
length="1562556611" type="application/x-nzb" />
<pubDate>Fri, 26 Feb 2010 10:20:12 GMT</pubDate>
</item>
</channel>
</rss>

2943
NzbDrone.Core.Test/Files/RSS/newzbin.xml
View File

File diff suppressed because it is too large Load Diff

139
NzbDrone.Core.Test/IndexerTests.cs
View File

@ -27,7 +27,6 @@ namespace NzbDrone.Core.Test
public class IndexerTests : CoreTest
{
[TestCase("nzbsrus.xml")]
[TestCase("newzbin.xml")]
[TestCase("nzbmatrix.xml")]
[TestCase("newznab.xml")]
[TestCase("wombles.xml")]
@ -65,9 +64,6 @@ namespace NzbDrone.Core.Test
Mocker.GetMock<ConfigProvider>().SetupGet(c => c.NzbMatrixApiKey).Returns("MockedConfigValue");
Mocker.GetMock<ConfigProvider>().SetupGet(c => c.NzbMatrixUsername).Returns("MockedConfigValue");
Mocker.GetMock<ConfigProvider>().SetupGet(c => c.NewzbinUsername).Returns("MockedConfigValue");
Mocker.GetMock<ConfigProvider>().SetupGet(c => c.NewzbinPassword).Returns("MockedConfigValue");
Mocker.GetMock<ConfigProvider>().SetupGet(c => c.NzbsOrgHash).Returns("MockedConfigValue");
Mocker.GetMock<ConfigProvider>().SetupGet(c => c.NzbsOrgUId).Returns("MockedConfigValue");
@ -78,66 +74,6 @@ namespace NzbDrone.Core.Test
Mocker.GetMock<ConfigProvider>().SetupGet(c => c.FileSharingTalkSecret).Returns("MockedConfigValue");
}
[Test]
public void newzbin_parses_languae()
{
WithConfiguredIndexers();
Mocker.GetMock<HttpProvider>()
.Setup(h => h.DownloadStream(It.IsAny<String>(), It.IsAny<NetworkCredential>()))
.Returns(File.OpenRead(".\\Files\\Rss\\newbin_none_english.xml"));
var newzbin = Mocker.Resolve<Newzbin>();
var parseResults = newzbin.FetchRss();
foreach (var episodeParseResult in parseResults)
{
var Uri = new Uri(episodeParseResult.NzbUrl);
Uri.PathAndQuery.Should().NotContain("//");
}
parseResults.Should().NotBeEmpty();
parseResults.Should().NotContain(e => e.Language == LanguageType.English);
}
[Test]
public void newzbin_rss_fetch()
{
Mocker.Resolve<HttpProvider>();
var fakeSettings = Builder<IndexerDefinition>.CreateNew().Build();
Mocker.GetMock<IndexerProvider>()
.Setup(c => c.GetSettings(It.IsAny<Type>()))
.Returns(fakeSettings);
Mocker.GetMock<ConfigProvider>()
.SetupGet(c => c.NewzbinUsername)
.Returns("nzbdrone");
Mocker.GetMock<ConfigProvider>()
.SetupGet(c => c.NewzbinPassword)
.Returns("smartar39865");
var newzbinProvider = Mocker.Resolve<Newzbin>();
var parseResults = newzbinProvider.FetchRss();
foreach (var episodeParseResult in parseResults)
{
var Uri = new Uri(episodeParseResult.NzbUrl);
Uri.PathAndQuery.Should().NotContain("//");
}
parseResults.Should().NotBeEmpty();
parseResults.Should().OnlyContain(s => s.Indexer == newzbinProvider.Name);
parseResults.Should().OnlyContain(s => !String.IsNullOrEmpty(s.OriginalString));
Mark500Inconclusive();
ExceptionVerification.IgnoreWarns();
}
[Test]
public void custome_parser_partial_success()
{
@ -204,27 +140,6 @@ namespace NzbDrone.Core.Test
ExceptionVerification.IgnoreWarns();
}
[TestCase("simpsons", 21, 23)]
[TestCase("Hawaii Five-0 (2010)", 1, 1)]
[TestCase("In plain Sight", 1, 11, Ignore = true)]
public void newzbin_search_returns_valid_results(string title, int season, int episode)
{
Mocker.GetMock<ConfigProvider>()
.SetupGet(c => c.NewzbinUsername)
.Returns("nzbdrone");
Mocker.GetMock<ConfigProvider>()
.SetupGet(c => c.NewzbinPassword)
.Returns("smartar39865");
Mocker.Resolve<HttpProvider>();
var result = Mocker.Resolve<Newzbin>().FetchEpisode(title, season, episode);
Mark500Inconclusive();
result.Should().NotBeEmpty();
}
[TestCase("simpsons", 21, 23)]
[TestCase("The walking dead", 2, 10)]
public void nzbmatrix_search_returns_valid_results(string title, int season, int episode)
@ -277,22 +192,6 @@ namespace NzbDrone.Core.Test
result.Should().Be(clean);
}
[Test]
public void size_newzbin()
{
WithConfiguredIndexers();
Mocker.GetMock<HttpProvider>()
.Setup(h => h.DownloadStream(It.IsAny<String>(), It.IsAny<NetworkCredential>()))
.Returns(File.OpenRead(".\\Files\\Rss\\SizeParsing\\newzbin.xml"));
//Act
var parseResults = Mocker.Resolve<Newzbin>().FetchRss();
parseResults.Should().HaveCount(1);
parseResults[0].Size.Should().Be(1295620506);
}
[Test]
public void size_nzbmatrix()
{
@ -523,26 +422,6 @@ namespace NzbDrone.Core.Test
}
}
[Test]
public void Newzbin_NzbInfoUrl_should_contain_information_string()
{
WithConfiguredIndexers();
const string fileName = "newzbin.xml";
const string expectedString = "browse";
Mocker.GetMock<HttpProvider>()
.Setup(h => h.DownloadStream(It.IsAny<String>(), It.IsAny<NetworkCredential>()))
.Returns(File.OpenRead(".\\Files\\Rss\\" + fileName));
var parseResults = Mocker.Resolve<Newzbin>().FetchRss();
foreach (var episodeParseResult in parseResults)
{
episodeParseResult.NzbInfoUrl.Should().Contain(expectedString);
}
}
[Test]
public void NzbMatrix_NzbInfoUrl_should_contain_information_string()
{
@ -676,22 +555,6 @@ namespace NzbDrone.Core.Test
}
}
[Test]
public void releaseGroup_should_use_nfo_filename_for_newzbin()
{
WithConfiguredIndexers();
Mocker.GetMock<HttpProvider>()
.Setup(h => h.DownloadStream(It.IsAny<String>(), It.IsAny<NetworkCredential>()))
.Returns(File.OpenRead(".\\Files\\Rss\\SizeParsing\\newzbin.xml"));
//Act
var parseResults = Mocker.Resolve<Newzbin>().FetchRss();
parseResults.Should().HaveCount(1);
parseResults[0].ReleaseGroup.Should().Be("tvp");
}
[TestCase("30 Rock", "30%20Rock")]
[TestCase("The Office (US)", "Office%20US")]
[TestCase("Revenge", "Revenge")]
@ -704,4 +567,4 @@ namespace NzbDrone.Core.Test
Mocker.Resolve<Newznab>().GetQueryTitle(seriesTitle).Should().Be(expected);
}
}
}
}

9
NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
View File

@ -301,15 +301,9 @@
<Content Include="Files\RSS\newznab.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Files\RSS\newbin_none_english.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Files\Categories_json.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Files\RSS\SizeParsing\newzbin.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Files\RSS\SizeParsing\newznab.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@ -322,9 +316,6 @@
<Content Include="Files\Feed.nzbmatrix.com.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Files\RSS\newzbin.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Files\RSS\nzbmatrix.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

15
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/SabProviderFixture.cs
View File

@ -58,21 +58,6 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
Mocker.Resolve<SabProvider>().DownloadNzb(url, title, false).Should().BeTrue();
}
[Test]
public void newzbin_add_url_should_format_request_properly()
{
Mocker.GetMock<HttpProvider>(MockBehavior.Strict)
.Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=addid&name=6107863&priority=0&pp=3&cat=tv&nzbname=My+Series+Name+-+5x2-5x3+-+My+title+%5bBluray720p%5d+%5bProper%5d&output=json&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
.Returns("{ \"status\": true }");
//Act
bool result = Mocker.Resolve<SabProvider>().DownloadNzb("http://www.newzbin.com/browse/post/6107863/nzb", title, false);
//Assert
result.Should().BeTrue();
}
[Test]
public void add_by_url_should_detect_and_handle_sab_errors()
{

1
NzbDrone.Core/CentralDispatch.cs
View File

@ -87,7 +87,6 @@ namespace NzbDrone.Core
logger.Debug("Initializing Indexers...");
Kernel.Bind<IndexerBase>().To<NzbMatrix>();
Kernel.Bind<IndexerBase>().To<NzbsRUs>();
Kernel.Bind<IndexerBase>().To<Newzbin>();
Kernel.Bind<IndexerBase>().To<Newznab>();
Kernel.Bind<IndexerBase>().To<Wombles>();
Kernel.Bind<IndexerBase>().To<FileSharingTalk>();

18
NzbDrone.Core/Datastore/Migrations/Migration20121202.cs Normal file
View File

@ -0,0 +1,18 @@
using System;
using System.Data;
using Migrator.Framework;
using NzbDrone.Common;
namespace NzbDrone.Core.Datastore.Migrations
{
[Migration(20121202)]
public class Migration20121202 : NzbDroneMigration
{
protected override void MainDbUpgrade()
{
Database.ExecuteNonQuery("DELETE FROM Config WHERE [KEY] = 'NewzbinUsername'");
Database.ExecuteNonQuery("DELETE FROM Config WHERE [KEY] = 'NewzbinPassword'");
Database.ExecuteNonQuery("DELETE FROM IndexerDefinitions WHERE IndexProviderType = 'NzbDrone.Core.Providers.Indexer.Newzbin'");
}
}
}

4
NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -230,6 +230,7 @@
<Compile Include="Datastore\MigrationLogger.cs" />
<Compile Include="Datastore\MigrationsHelper.cs" />
<Compile Include="Datastore\CustomeMapper.cs" />
<Compile Include="Datastore\Migrations\Migration20121202.cs" />
<Compile Include="Datastore\Migrations\Migration20121122.cs" />
<Compile Include="Datastore\Migrations\Migration20121016.cs" />
<Compile Include="Datastore\Migrations\Migration20121012.cs" />
@ -453,9 +454,6 @@
<Compile Include="Providers\Indexer\IndexerBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\Indexer\Newzbin.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\Indexer\Newznab.cs">
<SubType>Code</SubType>
</Compile>

14
NzbDrone.Core/Providers/Core/ConfigProvider.cs
View File

@ -75,20 +75,6 @@ namespace NzbDrone.Core.Providers.Core
set { SetValue("NzbsrusHash", value); }
}
public virtual String NewzbinUsername
{
get { return GetValue("NewzbinUsername"); }
set { SetValue("NewzbinUsername", value); }
}
public virtual String NewzbinPassword
{
get { return GetValue("NewzbinPassword"); }
set { SetValue("NewzbinPassword", value); }
}
public virtual String FileSharingTalkUid
{
get { return GetValue("FileSharingTalkUid"); }

19
NzbDrone.Core/Providers/DownloadClients/SabProvider.cs
View File

@ -33,18 +33,6 @@ namespace NzbDrone.Core.Providers.DownloadClients
{
}
private static string GetNzbName(string urlString)
{
var url = new Uri(urlString);
if (url.Host.ToLower().Contains("newzbin"))
{
var postId = Regex.Match(urlString, @"\d{5,10}").Value;
return postId;
}
return urlString.Replace("&", "%26");
}
public virtual bool IsInQueue(EpisodeParseResult newParseResult)
{
try
@ -85,17 +73,12 @@ namespace NzbDrone.Core.Providers.DownloadClients
string cat = _configProvider.SabTvCategory;
int priority = recentlyAired ? (int)_configProvider.SabRecentTvPriority : (int)_configProvider.SabBacklogTvPriority;
string name = GetNzbName(url);
string name = url.Replace("&", "%26");
string nzbName = HttpUtility.UrlEncode(title);
string action = string.Format("mode=addurl&name={0}&priority={1}&pp=3&cat={2}&nzbname={3}&output=json",
name, priority, cat, nzbName);
if (url.ToLower().Contains("newzbin"))
{
action = action.Replace("mode=addurl", "mode=addid");
}
string request = GetSabRequest(action);
logger.Info("Adding report [{0}] to the queue.", title);

142
NzbDrone.Core/Providers/Indexer/Newzbin.cs
View File

@ -1,142 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.ServiceModel.Syndication;
using System.Text.RegularExpressions;
using System.Xml.Linq;
using Ninject;
using NzbDrone.Common;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository.Quality;
namespace NzbDrone.Core.Providers.Indexer
{
public class Newzbin : IndexerBase
{
private const string ROOT_DOMAIN = "https://www.newzbin2.es";
[Inject]
public Newzbin(HttpProvider httpProvider, ConfigProvider configProvider)
: base(httpProvider, configProvider)
{
}
private const string URL_PARAMS = "feed=rss&hauth=1&ps_rb_language=4096&ps_rb_video_format=3082257";
protected override string[] Urls
{
get
{
return new[]
{
ROOT_DOMAIN + "/browse/category/p/tv?" + URL_PARAMS
};
}
}
public override bool IsConfigured
{
get
{
return !string.IsNullOrWhiteSpace(_configProvider.NewzbinUsername) &&
!string.IsNullOrWhiteSpace(_configProvider.NewzbinPassword);
}
}
protected override NetworkCredential Credentials
{
get { return new NetworkCredential(_configProvider.NewzbinUsername, _configProvider.NewzbinPassword); }
}
protected override IList<string> GetEpisodeSearchUrls(string seriesTitle, int seasonNumber, int episodeNumber)
{
return new List<string>
{
String.Format(
ROOT_DOMAIN + @"/search/query/?q={0}+{1}x{2:00}&fpn=p&searchaction=Go&category=8&{3}",
seriesTitle, seasonNumber,episodeNumber, URL_PARAMS)
};
}
protected override IList<string> GetSeasonSearchUrls(string seriesTitle, int seasonNumber)
{
return new List<string>
{
String.Format(
ROOT_DOMAIN + @"/search/query/?q={0}+Season+{1}&fpn=p&searchaction=Go&category=8&{2}",
seriesTitle, seasonNumber, URL_PARAMS)
};
}
protected override IList<string> GetDailyEpisodeSearchUrls(string seriesTitle, DateTime date)
{
return new List<string>
{
String.Format(
ROOT_DOMAIN + @"/search/query/?q={0}+{1:yyyy-MM-dd}&fpn=p&searchaction=Go&category=8&{2}",
seriesTitle, date, URL_PARAMS)
};
}
protected override IList<string> GetPartialSeasonSearchUrls(string seriesTitle, int seasonNumber, int episodeWildcard)
{
return new List<string>
{
String.Format(
ROOT_DOMAIN + @"/search/query/?q={0}+{1}x{2}&fpn=p&searchaction=Go&category=8&{3}",
seriesTitle, seasonNumber, episodeWildcard, URL_PARAMS)
};
}
public override string Name
{
get { return "Newzbin"; }
}
protected override string NzbDownloadUrl(SyndicationItem item)
{
return item.Id + "nzb";
}
protected override string NzbInfoUrl(SyndicationItem item)
{
return item.Links[0].Uri.ToString();
}
protected override EpisodeParseResult CustomParser(SyndicationItem item, EpisodeParseResult currentResult)
{
if (currentResult != null)
{
var quality = Parser.ParseQuality(item.Summary.Text);
currentResult.Quality = quality;
var languageString = Regex.Match(item.Summary.Text, @"Language - \w*", RegexOptions.IgnoreCase).Value;
currentResult.Language = Parser.ParseLanguage(languageString);
var sizeString = Regex.Match(item.Summary.Text, @"\(Size: \d*\,?\d+\.\d{1,2}\w{2}\)", RegexOptions.IgnoreCase).Value;
currentResult.Size = Parser.GetReportSize(sizeString);
try
{
var releaseGroupText = item.ElementExtensions.Single(s => s.OuterName == "nfo")
.GetObject<XElement>()
.Element(XName.Get("filename", "http://www.newzbin2.es/DTD/2007/feeds/report/"))
.Value;
var releaseGroup = Parser.ParseReleaseGroup(releaseGroupText.Replace(".nfo", ""));
currentResult.ReleaseGroup = releaseGroup;
}
catch(Exception ex)
{
_logger.TraceException("Error getting release group for newzbin release", ex);
currentResult.ReleaseGroup = "";
}
}
return currentResult;
}
}
}

2
NzbDrone.Core/Providers/Indexer/NzbsRUs.cs
View File

@ -23,7 +23,7 @@ namespace NzbDrone.Core.Providers.Indexer
return new[]
{
string.Format(
"http://www.nzbsrus.com/rssfeed.php?cat=91,75&i={0}&h={1}",
"https://www.nzbsrus.com/rssfeed.php?cat=91,75&i={0}&h={1}",
_configProvider.NzbsrusUId,
_configProvider.NzbsrusHash)
};

11
NzbDrone.Web/Controllers/SettingsController.cs
View File

@ -101,15 +101,11 @@ namespace NzbDrone.Web.Controllers
NzbsrusUId = _configProvider.NzbsrusUId,
NzbsrusHash = _configProvider.NzbsrusHash,
NewzbinUsername = _configProvider.NewzbinUsername,
NewzbinPassword = _configProvider.NewzbinPassword,
FileSharingTalkUid = _configProvider.FileSharingTalkUid,
FileSharingTalkSecret = _configProvider.FileSharingTalkSecret,
NzbMatrixEnabled = _indexerProvider.GetSettings(typeof(NzbMatrix)).Enable,
NzbsRUsEnabled = _indexerProvider.GetSettings(typeof(NzbsRUs)).Enable,
NewzbinEnabled = _indexerProvider.GetSettings(typeof(Newzbin)).Enable,
NewznabEnabled = _indexerProvider.GetSettings(typeof(Newznab)).Enable,
WomblesEnabled = _indexerProvider.GetSettings(typeof(Wombles)).Enable,
FileSharingTalkEnabled = _indexerProvider.GetSettings(typeof(FileSharingTalk)).Enable,
@ -387,10 +383,6 @@ namespace NzbDrone.Web.Controllers
nzbsRUsSettings.Enable = data.NzbsRUsEnabled;
_indexerProvider.SaveSettings(nzbsRUsSettings);
var newzbinSettings = _indexerProvider.GetSettings(typeof(Newzbin));
newzbinSettings.Enable = data.NewzbinEnabled;
_indexerProvider.SaveSettings(newzbinSettings);
var newznabSettings = _indexerProvider.GetSettings(typeof(Newznab));
newznabSettings.Enable = data.NewznabEnabled;
_indexerProvider.SaveSettings(newznabSettings);
@ -417,9 +409,6 @@ namespace NzbDrone.Web.Controllers
_configProvider.NzbsrusUId = data.NzbsrusUId;
_configProvider.NzbsrusHash = data.NzbsrusHash;
_configProvider.NewzbinUsername = data.NewzbinUsername;
_configProvider.NewzbinPassword = data.NewzbinPassword;
_configProvider.FileSharingTalkUid = data.FileSharingTalkUid;
_configProvider.FileSharingTalkSecret = data.FileSharingTalkSecret;

18
NzbDrone.Web/Models/IndexerSettingsModel.cs
View File

@ -37,20 +37,6 @@ namespace NzbDrone.Web.Models
[RequiredIf("NzbsRUsEnabled", true, ErrorMessage = "API Key Required when NzbsRus is enabled")]
public String NzbsrusHash { get; set; }
[DataType(DataType.Text)]
[DisplayName("Username")]
[Description("Username for Newzbin")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
[RequiredIf("NewzbinEnabled", true, ErrorMessage = "Username Required when Newzbin is enabled")]
public String NewzbinUsername { get; set; }
[DataType(DataType.Text)]
[DisplayName("Password")]
[Description("Password for Newzbin")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
[RequiredIf("NewzbinEnabled", true, ErrorMessage = "Password Required when Newzbin is enabled")]
public String NewzbinPassword { get; set; }
[DataType(DataType.Text)]
[DisplayName("UID")]
[Description("UserID for File Sharing Talk")]
@ -73,10 +59,6 @@ namespace NzbDrone.Web.Models
[Description("Enable downloading episodes from NZBsRus")]
public bool NzbsRUsEnabled { get; set; }
[DisplayName("Newzbin")]
[Description("Enable downloading episodes from Newzbin")]
public bool NewzbinEnabled { get; set; }
[DisplayName("Newznab")]
[Description("Enable downloading episodes from Newznab Providers")]
public bool NewznabEnabled { get; set; }

27
NzbDrone.Web/Views/Settings/Indexers.cshtml
View File

@ -18,9 +18,6 @@
@Html.CheckBox("nzbsRusStatus", @Model.NzbsRUsEnabled, new { @class = "indexerStatusButton" })
<label for="nzbsRusStatus">NZBsRus</label>
@Html.CheckBox("newzbinStatus", @Model.NewzbinEnabled, new { @class = "indexerStatusButton" })
<label for="newzbinStatus">Newzbin</label>
@Html.CheckBox("newznabStatus", @Model.NewznabEnabled, new { @class = "indexerStatusButton" })
<label for="newznabStatus">Newznab</label>
@ -77,24 +74,6 @@
@Html.TextBoxFor(m => m.NzbsrusHash, new { @class = "inputClass" })
</div>
<h3><a href="#">Newzbin</a></h3>
<div class="indexerPanel">
<label class="labelClass">
Enable <span class="small">@Html.DescriptionFor(m => m.NewzbinEnabled)</span>
</label>
@Html.CheckBoxFor(m => m.NewzbinEnabled, new { @class = "inputClass checkClass enabledCheck" })
<label class="labelClass">@Html.LabelFor(m => m.NewzbinUsername)
<span class="small">@Html.DescriptionFor(m => m.NewzbinUsername)</span>
<span class="small">@Html.ValidationMessageFor(m => m.NewzbinUsername)</span>
</label>
@Html.TextBoxFor(m => m.NewzbinUsername, new { @class = "inputClass" })
<label class="labelClass">@Html.LabelFor(m => m.NewzbinPassword)
<span class="small">@Html.DescriptionFor(m => m.NewzbinPassword)</span>
<span class="small">@Html.ValidationMessageFor(m => m.NewzbinPassword)</span>
</label>
@Html.TextBoxFor(m => m.NewzbinPassword, new { @class = "inputClass", type = "password" })
</div>
<h3><a href="#">Newznab</a></h3>
<div class="indexerPanel">
<label class="labelClass">
@ -222,9 +201,6 @@
if (id == 'NzbsRUsEnabled')
$('#nzbsRusStatus').prop('checked', checked);
if (id == 'NewzbinEnabled')
$('#newzbinStatus').prop('checked', checked);
if (id == 'NewznabEnabled')
$('#newznabStatus').prop('checked', checked);
@ -254,9 +230,6 @@
if (id == 'nzbsRusStatus')
$('#NzbsRUsEnabled').prop('checked', checked);
if (id == 'newzbinStatus')
$('#NewzbinEnabled').prop('checked', checked);
if (id == 'newznabStatus')
$('#NewznabEnabled').prop('checked', checked);