mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2025-03-03 18:26:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Browse source
This commit is contained in:
Mark McDowall 2011-12-01 23:45:34 -08:00
commit 1498027192
6 changed files with 47 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -42,4 +42,5 @@ _rawPackage/
NzbDrone.zip NzbDrone.zip
NzbDrone.sln.DotSettings.user* NzbDrone.sln.DotSettings.user*
config.xml config.xml
UpdateLogs/ UpdateLogs/
NzbDrone.Web/MediaCover

12
NzbDrone.Common/PathExtentions.cs
View file

@ -85,9 +85,19 @@ namespace NzbDrone.Common
return Path.Combine(enviromentProvider.GetAppDataPath(), LOG_DB_FILE); return Path.Combine(enviromentProvider.GetAppDataPath(), LOG_DB_FILE);
} }
public static string GetMediaCoverPath(this EnviromentProvider enviromentProvider)
{
return Path.Combine(enviromentProvider.GetWebRoot(), "MediaCover");
}
public static string GetBannerPath(this EnviromentProvider enviromentProvider) public static string GetBannerPath(this EnviromentProvider enviromentProvider)
{ {
return Path.Combine(enviromentProvider.GetWebRoot(), "Content", "Images", "Banners"); return Path.Combine(enviromentProvider.GetMediaCoverPath(), "Banners");
}
public static string GetFanArthPath(this EnviromentProvider enviromentProvider)
{
return Path.Combine(enviromentProvider.GetMediaCoverPath(), "Fanarts");
} }
public static string GetCacheFolder(this EnviromentProvider enviromentProvider) public static string GetCacheFolder(this EnviromentProvider enviromentProvider)

27
NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
View file

@ -289,20 +289,41 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
{ {
IList<IJob> fakeJobs = new List<IJob> { fakeJob }; IList<IJob> fakeJobs = new List<IJob> { fakeJob };
Mocker.SetConstant(fakeJobs); Mocker.SetConstant(fakeJobs);
WithRealDb(); WithRealDb();
var deletedJob = Builder<JobDefinition>.CreateNew().Build(); var deletedJob = Builder<JobDefinition>.CreateNew().Build();
Db.Insert(deletedJob); Db.Insert(deletedJob);
var jobProvider = Mocker.Resolve<JobProvider>(); var jobProvider = Mocker.Resolve<JobProvider>();
//Act //Act
jobProvider.Initialize(); jobProvider.Initialize();
//Assert //Assert
var registeredJobs = Db.Fetch<JobDefinition>(); var registeredJobs = Db.Fetch<JobDefinition>();
registeredJobs.Should().HaveCount(1); registeredJobs.Should().HaveCount(1);
registeredJobs.Should().NotContain(c => c.Name == deletedJob.Name); registeredJobs.Should().NotContain(c => c.TypeName == deletedJob.TypeName);
}
[Test]
public void inti_should_removed_jobs_that_no_longer_exist_even_with_same_name()
{
IList<IJob> fakeJobs = new List<IJob> { fakeJob };
Mocker.SetConstant(fakeJobs);
WithRealDb();
var deletedJob = Builder<JobDefinition>.CreateNew()
.With(c => c.Name = fakeJob.Name).Build();
Db.Insert(deletedJob);
var jobProvider = Mocker.Resolve<JobProvider>();
//Act
jobProvider.Initialize();
//Assert
var registeredJobs = Db.Fetch<JobDefinition>();
registeredJobs.Should().HaveCount(1);
registeredJobs.Should().NotContain(c => c.TypeName == deletedJob.TypeName);
} }
[Test] [Test]

27
NzbDrone.Core/Datastore/Connection.cs
View file

@ -1,9 +1,7 @@
using System; using System;
using System.Configuration; using System.Configuration;
using System.Data.Common; using System.Data.Common;
using System.Data.EntityClient;
using System.Data.SqlServerCe; using System.Data.SqlServerCe;
using MvcMiniProfiler;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Core.Instrumentation; using NzbDrone.Core.Instrumentation;
using PetaPoco; using PetaPoco;
@ -14,28 +12,22 @@ namespace NzbDrone.Core.Datastore
{ {
private readonly EnviromentProvider _enviromentProvider; private readonly EnviromentProvider _enviromentProvider;
static Connection()
public static void InitiFacotry()
{ {
Database.Mapper = new CustomeMapper();
var dataSet = ConfigurationManager.GetSection("system.data") as System.Data.DataSet; var dataSet = ConfigurationManager.GetSection("system.data") as System.Data.DataSet;
dataSet.Tables[0].Rows.Add("Microsoft SQL Server Compact Data Provider 4.0" dataSet.Tables[0].Rows.Add("Microsoft SQL Server Compact Data Provider 4.0"
, "System.Data.SqlServerCe.4.0" , "System.Data.SqlServerCe.4.0"
, ".NET Framework Data Provider for Microsoft SQL Server Compact" , ".NET Framework Data Provider for Microsoft SQL Server Compact"
, "System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"); , "System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91");
} }
public Connection(EnviromentProvider enviromentProvider) public Connection(EnviromentProvider enviromentProvider)
{ {
_enviromentProvider = enviromentProvider; _enviromentProvider = enviromentProvider;
} }
static Connection()
{
Database.Mapper = new CustomeMapper();
InitiFacotry();
}
public String MainConnectionString public String MainConnectionString
{ {
get get
@ -54,7 +46,6 @@ namespace NzbDrone.Core.Datastore
public static string GetConnectionString(string path) public static string GetConnectionString(string path)
{ {
//return String.Format("Data Source={0};Version=3;Cache Size=30000;Pooling=true;Default Timeout=2", path);
return String.Format("Data Source={0}", path); return String.Format("Data Source={0}", path);
} }
@ -73,8 +64,6 @@ namespace NzbDrone.Core.Datastore
return GetLogDbContext(LogConnectionString); return GetLogDbContext(LogConnectionString);
} }
public static IDatabase GetPetaPocoDb(string connectionString, Boolean profiled = true) public static IDatabase GetPetaPocoDb(string connectionString, Boolean profiled = true)
{ {
MigrationsHelper.Run(connectionString, true); MigrationsHelper.Run(connectionString, true);

2
NzbDrone.Core/Jobs/JobProvider.cs
View file

@ -76,7 +76,7 @@ namespace NzbDrone.Core.Jobs
foreach (var currentJob in currentJobs) foreach (var currentJob in currentJobs)
{ {
if (!_jobs.Any(c => c.Name == currentJob.Name)) if (!_jobs.Any(c => c.GetType().ToString() == currentJob.TypeName))
{ {
logger.Debug("Removing job from database '{0}'", currentJob.Name); logger.Debug("Removing job from database '{0}'", currentJob.Name);
_database.Delete(currentJob); _database.Delete(currentJob);

2
NzbDrone.Web/Views/Series/Details.cshtml
View file

@ -78,7 +78,7 @@
if(Model.HasBanner) if(Model.HasBanner)
{ {
bannerUrl = "../../Content/Images/Banners/" + Model.SeriesId + ".jpg"; bannerUrl = "../../MediaCover/Banners/" + Model.SeriesId + ".jpg";
} }
} }
<img src="@bannerUrl" alt="Banner"/> <img src="@bannerUrl" alt="Banner"/>