self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-25 02:30:20 +02:00
Code Issues Releases Activity

ApplicationPath is actuall app path in mono.

Browse Source
This commit is contained in:
kay.one 2013-02-16 15:19:09 -08:00
parent 83186ba87b
commit 6c289f4482
11 changed files with 39 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NzbDrone.Common/EnvironmentProvider.cs
View File

@ -36,11 +36,6 @@ public static bool IsProduction
}
}
public static bool IsMono
{
get { return Type.GetType("Mono.Runtime") != null; }
}
public static bool IsDebug
{
get

8
NzbDrone.Core.Test/CentralDispatchFixture.cs
View File

@ -5,7 +5,6 @@
using FluentAssertions;
using NCrunch.Framework;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Jobs;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.ExternalNotification;
@ -29,10 +28,9 @@ class CentralDispatchFixture : SqlCeTest
public CentralDispatchFixture()
{
if (EnvironmentProvider.IsMono)
{
throw new IgnoreException("SqlCe is not supported");
}
#if __MonoCS__
throw new IgnoreException("SqlCe is not supported");
#endif
InitLogging();
var dispatch = new CentralDispatch();

9
NzbDrone.Core.Test/Framework/SqlCeTest.cs
View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers.Core;
@ -17,10 +16,10 @@ public abstract class SqlCeTest : CoreTest
[SetUp]
public void CoreTestSetup()
{
if (EnvironmentProvider.IsMono)
{
throw new IgnoreException("SqlCe is not supported in mono.");
}
#if __MonoCS__
throw new IgnoreException("SqlCe is not supported in mono.");
#endif
if (NCrunch.Framework.NCrunchEnvironment.NCrunchIsResident())
{

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

@ -440,9 +440,8 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>if not exist "$(TargetDir)x86" md "$(TargetDir)x86"
xcopy /s /y "$(SolutionDir)\SqlCe\*.*" "$(TargetDir)"</PreBuildEvent>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>if not exist "$(TargetDir)x86" md "$(TargetDir)x86"

27
NzbDrone.Core/Datastore/ConnectionFactory.cs
View File

@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data.Common;
using System.Data.OleDb;
using System.Data.SqlClient;
using System.Reflection;
using NLog;
using NzbDrone.Common;
@ -19,16 +21,22 @@ static ConnectionFactory()
{
Database.Mapper = new CustomeMapper();
if (EnvironmentProvider.IsMono) return;
#if __MonoCS__
#else
var dataSet = (System.Data.DataSet)ConfigurationManager.GetSection("system.data");
dataSet.Tables[0].Rows.Add("Microsoft SQL Server Compact Data Provider 4.0"
, "System.Data.SqlServerCe.4.0"
, ".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.4.0"
, ".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");
var proxyType = Assembly.Load("NzbDrone.SqlCe").GetExportedTypes()[0];
var instance = Activator.CreateInstance(proxyType);
var factoryMethod = proxyType.GetMethod("GetSqlCeProviderFactory");
_factory = (DbProviderFactory)factoryMethod.Invoke(instance, null);
#endif
_factory = SqlCeProxy.GetSqlCeProviderFactory();
}
@ -75,10 +83,9 @@ public IDatabase GetLogPetaPocoDb(Boolean profiled = true)
public static IDatabase GetPetaPocoDb(string connectionString, Boolean profiled = true)
{
if (EnvironmentProvider.IsMono)
{
throw new NotSupportedException("SqlCe is not supported in mono");
}
#if __MonoCS__
throw new NotSupportedException("SqlCe is not supported in mono");
#endif
lock (initilized)
{

6
NzbDrone.Core/Datastore/Migrations/NzbDroneMigration.cs
View File

@ -1,8 +1,6 @@
using System;
using System.Data.Common;
using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
using Migrator.Framework;
using NzbDrone.Common;
@ -37,8 +35,8 @@ public override void Up()
protected EloqueraDb GetObjectDb()
{
var sqlCeConnection = SqlCeProxy.EnsureDatabase(Database.ConnectionString);
var sqlCeConnection = new SqlConnection(Database.ConnectionString);
var eqPath = sqlCeConnection.Database.Replace(".sdf", ".eq");
return new EloqueraDbFactory(new EnvironmentProvider()).Create(eqPath);
}

10
NzbDrone.Core/Datastore/MigrationsHelper.cs
View File

@ -1,5 +1,6 @@
using System.Linq;
using System;
using System.IO;
using System.Reflection;
using NLog;
@ -12,7 +13,7 @@ public class MigrationsHelper
public static void Run(string connectionString, bool trace)
{
SqlCeProxy.EnsureDatabase(connectionString);
EnsureDatabase(connectionString);
logger.Trace("Preparing to run database migration");
@ -28,6 +29,8 @@ public static void Run(string connectionString, bool trace)
migrator = new Migrator.Migrator("sqlserverce", connectionString, Assembly.GetAssembly(typeof(MigrationsHelper)));
}
migrator.MigrateToLastVersion();
logger.Info("Database migration completed");
@ -40,7 +43,10 @@ public static void Run(string connectionString, bool trace)
}
}
private static void EnsureDatabase(string constr)
{
}
public static string GetIndexName(string tableName, params string[] columns)
{

32
NzbDrone.Core/Datastore/SqlCeProxy.cs
View File

@ -1,32 +0,0 @@
using System;
using System.Data.Common;
using System.Linq;
using System.Reflection;
namespace NzbDrone.Core.Datastore
{
public static class SqlCeProxy
{
private static readonly object instance;
private static readonly Type proxyType;
static SqlCeProxy()
{
proxyType = Assembly.Load("NzbDrone.SqlCe").GetExportedTypes()[0];
instance = Activator.CreateInstance(proxyType);
}
public static DbConnection EnsureDatabase(string connectionString)
{
var factoryMethod = proxyType.GetMethod("EnsureDatabase");
return (DbConnection)factoryMethod.Invoke(instance, new object[] { connectionString });
}
public static DbProviderFactory GetSqlCeProviderFactory()
{
var factoryMethod = proxyType.GetMethod("GetSqlCeProviderFactory");
return (DbProviderFactory)factoryMethod.Invoke(instance, null);
}
}
}

1
NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -297,7 +297,6 @@
<Compile Include="Datastore\Migrations\SchemaInfo.cs" />
<Compile Include="Datastore\PetaPoco\EpisodeSeasonRelator.cs" />
<Compile Include="Datastore\PetaPoco\PetaPoco.cs" />
<Compile Include="Datastore\SqlCeProxy.cs" />
<Compile Include="Fluent.cs" />
<Compile Include="Helpers\Converters\EpochDateTimeConverter.cs" />
<Compile Include="Helpers\SabnzbdQueueTimeConverter.cs" />

8
NzbDrone.SqlCe/SqlCeProxy.cs
View File

@ -6,17 +6,15 @@ namespace NzbDrone.SqlCe
{
public class SqlCeProxy
{
public SqlCeConnection EnsureDatabase(string connectionString)
public void EnsureDatabase(string constr)
{
var connection = new SqlCeConnection(connectionString);
var connection = new SqlCeConnection(constr);
if (!File.Exists(connection.Database))
{
var engine = new SqlCeEngine(connectionString);
var engine = new SqlCeEngine(constr);
engine.CreateDatabase();
}
return connection;
}
public DbProviderFactory GetSqlCeProviderFactory()

BIN
SqlCe/NzbDrone.SqlCe.dll
View File

Binary file not shown.