Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/kayone/NzbDrone

This commit is contained in:
Mark McDowall 2011-06-01 20:37:04 -07:00
parent fdfd0a2153 3665856d79
commit b77a91b7f7
4 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Libraries/SQLite.Interop.dll
View File

Binary file not shown.

14
NzbDrone.Core.Test/EpisodeStatusTest.cs
View File

@ -17,7 +17,6 @@ namespace NzbDrone.Core.Test
[Row(1, false, false, EpisodeStatusType.NotAired)] [Row(1, false, false, EpisodeStatusType.NotAired)]
[Row(-2, false, false, EpisodeStatusType.Missing)] [Row(-2, false, false, EpisodeStatusType.Missing)]
[Row(1, true, false, EpisodeStatusType.Ready)] [Row(1, true, false, EpisodeStatusType.Ready)]
[Row(1, true, true, EpisodeStatusType.Ignored)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Ignored)]
public void no_grab_date(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status) public void no_grab_date(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
{ {
@ -43,7 +42,6 @@ namespace NzbDrone.Core.Test
[Row(1, false, false, EpisodeStatusType.NotAired)] [Row(1, false, false, EpisodeStatusType.NotAired)]
[Row(-2, false, false, EpisodeStatusType.Missing)] [Row(-2, false, false, EpisodeStatusType.Missing)]
[Row(1, true, false, EpisodeStatusType.Ready)] [Row(1, true, false, EpisodeStatusType.Ready)]
[Row(1, true, true, EpisodeStatusType.Ignored)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Ignored)]
public void old_grab_date(int offsetDays, bool hasEpisodes, bool ignored, public void old_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
EpisodeStatusType status) EpisodeStatusType status)
@ -70,8 +68,8 @@ namespace NzbDrone.Core.Test
[Row(1, false, false, EpisodeStatusType.Downloading)] [Row(1, false, false, EpisodeStatusType.Downloading)]
[Row(-2, false, false, EpisodeStatusType.Downloading)] [Row(-2, false, false, EpisodeStatusType.Downloading)]
[Row(1, true, false, EpisodeStatusType.Downloading)] [Row(1, true, false, EpisodeStatusType.Downloading)]
[Row(1, true, true, EpisodeStatusType.Ignored)] [Row(1, true, true, EpisodeStatusType.Downloading)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Downloading)]
public void recent_grab_date(int offsetDays, bool hasEpisodes, bool ignored, public void recent_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
EpisodeStatusType status) EpisodeStatusType status)
{ {
@ -95,8 +93,6 @@ namespace NzbDrone.Core.Test
[Test] [Test]
[Row(1, false, false, EpisodeStatusType.Ignored)] [Row(1, false, false, EpisodeStatusType.Ignored)]
[Row(-2, false, false, EpisodeStatusType.Ignored)] [Row(-2, false, false, EpisodeStatusType.Ignored)]
[Row(1, true, false, EpisodeStatusType.Ignored)]
[Row(1, true, true, EpisodeStatusType.Ignored)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Ignored)]
public void skipped_season(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status) public void skipped_season(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
{ {
@ -104,8 +100,10 @@ namespace NzbDrone.Core.Test
.With(e => e.AirDate = DateTime.Now.AddDays(offsetDays)) .With(e => e.AirDate = DateTime.Now.AddDays(offsetDays))
.With(e => e.Ignored = ignored) .With(e => e.Ignored = ignored)
.With(e => e.EpisodeFileId = 0) .With(e => e.EpisodeFileId = 0)
.With(e => e.GrabDate = null)
.With(e => e.Season = Builder<Season>.CreateNew() .With(e => e.Season = Builder<Season>.CreateNew()
.With(s => s.Monitored == false).Build()) .With(s => s.Monitored == false).Build())
.Build(); .Build();
if (hasEpisodes) if (hasEpisodes)
@ -124,12 +122,12 @@ namespace NzbDrone.Core.Test
.With(e => e.AirDate = DateTime.Now.AddYears(-200)) .With(e => e.AirDate = DateTime.Now.AddYears(-200))
.With(e => e.Ignored = false) .With(e => e.Ignored = false)
.With(e => e.EpisodeFileId = 0) .With(e => e.EpisodeFileId = 0)
.With(e=>e.GrabDate =null) .With(e => e.GrabDate = null)
.With(e => e.Season = Builder<Season>.CreateNew() .With(e => e.Season = Builder<Season>.CreateNew()
.With(s => s.Monitored = true).Build()) .With(s => s.Monitored = true).Build())
.Build(); .Build();
Assert.AreEqual(EpisodeStatusType.NotAired, episode.Status); Assert.AreEqual(EpisodeStatusType.NotAired, episode.Status);
} }
} }

12
NzbDrone.Core/Repository/Episode.cs
View File

@ -49,17 +49,17 @@ namespace NzbDrone.Core.Repository
{ {
get get
{ {
if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
var season = Season;
if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now) if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now)
{ {
return EpisodeStatusType.Downloading; return EpisodeStatusType.Downloading;
} }
if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
var season = Season;
if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
if (AirDate.Date.Year > 1900 && DateTime.Now.Date >= AirDate.Date) if (AirDate.Date.Year > 1900 && DateTime.Now.Date >= AirDate.Date)
{ {
return EpisodeStatusType.Missing; return EpisodeStatusType.Missing;

32
package.bat
View File

@ -1,15 +1,20 @@
SET TARGET=_deploy SET PACKAGEROOT=_rawPackage
SET TARGET=%PACKAGEROOT%\NzbDrone
rmdir /s "%TARGET%" xcopy IISExpress %TARGET%\IISExpress /E /V /I /Y
xcopy IISExpress %TARGET%\IISExpress /E /V /I /F /Y xcopy NzbDrone\bin\Release\*.* %TARGET%\ /E /V /I /Y
xcopy NzbDrone\bin\Release\*.* %TARGET%\ /E /V /I /F /Y
xcopy NzbDrone.Web\bin\*.* %TARGET%\NzbDrone.Web\bin\ /E /V /I /F /Y del %TARGET%\nlog.xml
xcopy NzbDrone.Web\App_GlobalResources\*.* %TARGET%\NzbDrone.Web\App_GlobalResources\ /E /V /I /F /Y del %TARGET%\*.vshost.exe.*
xcopy NzbDrone.Web\Content\*.* %TARGET%\NzbDrone.Web\Content\ /E /V /I /F /Y
xcopy NzbDrone.Web\Scripts\*.* %TARGET%\NzbDrone.Web\Scripts\ /E /V /I /F /Y
xcopy NzbDrone.Web\Views\*.* %TARGET%\NzbDrone.Web\Views\ /E /V /I /F /Y
xcopy NzbDrone.Web\bin\*.* %TARGET%\NzbDrone.Web\bin\ /E /V /I /Y
xcopy NzbDrone.Web\App_GlobalResources\*.* %TARGET%\NzbDrone.Web\App_GlobalResources\ /E /V /I /Y
xcopy NzbDrone.Web\Content\*.* %TARGET%\NzbDrone.Web\Content\ /E /V /I /Y
xcopy NzbDrone.Web\Scripts\*.* %TARGET%\NzbDrone.Web\Scripts\ /E /V /I /Y
xcopy NzbDrone.Web\Views\*.* %TARGET%\NzbDrone.Web\Views\ /E /V /I /Y
del %TARGET%\NzbDrone.Web\bin\*.xml /q
del %TARGET%\NzbDrone.Web\bin\ninject*.pdb /q
xcopy NzbDrone.Web\log.config %TARGET%\NzbDrone.Web\ xcopy NzbDrone.Web\log.config %TARGET%\NzbDrone.Web\
xcopy NzbDrone.Web\Global.asax %TARGET%\NzbDrone.Web\ xcopy NzbDrone.Web\Global.asax %TARGET%\NzbDrone.Web\
@ -17,7 +22,8 @@ xcopy NzbDrone.Web\favicon.ico %TARGET%\NzbDrone.Web\
xcopy NzbDrone.Web\web.config %TARGET%\NzbDrone.Web\ xcopy NzbDrone.Web\web.config %TARGET%\NzbDrone.Web\
CD "%TARGET%" CD %PACKAGEROOT%
..\Libraries\7zip\7za.exe a -tzip NzbDrone.zip * ..\Libraries\7zip\7za.exe a -tzip ..\NzbDrone.zip *
..\Libraries\7zip\7za.exe t NzbDrone.zip
cD .. CD ..
Pause