From 9e4bb278ef0a351e6c9fd2d18edde03c31e9b928 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 3 Feb 2013 20:18:59 -0800 Subject: [PATCH] moved rootdir to eloquera --- NzbDrone.Api/RootFolders/RootFolderModule.cs | 13 +- NzbDrone.Common/EnvironmentProvider.cs | 10 +- NzbDrone.Common/PathExtentions.cs | 6 + .../Datastore/ObjectDatabaseFixture.cs | 14 ++ NzbDrone.Core.Test/Framework/ObjectDbTest.cs | 5 +- NzbDrone.Core.Test/Framework/SqlCeTest.cs | 26 +++ NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 1 + .../NzbDrone.Core.Test.ncrunchproject | 1 + .../FreeSpaceOnDrivesFixture.cs | 9 +- .../RootDirProviderFixture.cs | 60 ++---- NzbDrone.Core/ContainerExtentions.cs | 3 +- NzbDrone.Core/Datastore/EloqueraDb.cs | 4 +- NzbDrone.Core/Datastore/EloqueraDbFactory.cs | 37 +++- .../Datastore/Migrations/Migration20130203.cs | 33 +++ .../Datastore/Migrations/NzbDroneMigration.cs | 9 + NzbDrone.Core/Datastore/MigrationsHelper.cs | 16 +- NzbDrone.Core/NzbDrone.Core.csproj | 4 +- NzbDrone.Core/Repository/RootDir.cs | 14 +- .../RootFolders/RootFolderRepository.cs | 46 +++++ .../RootFolderService.cs} | 51 +++-- .../NzbDrone.Services.Api.csproj | 6 +- NzbDrone.Web/App_Data/nzbdrone.eq | Bin 0 -> 494156 bytes .../Controllers/AddSeriesController.cs | 188 ------------------ NzbDrone.Web/Controllers/SharedController.cs | 9 +- NzbDrone.Web/Eloquera.config | 31 +++ NzbDrone.Web/NzbDrone.Web.csproj | 28 ++- NzbDrone.Web/Views/AddSeries/AddNew.cshtml | 13 -- .../Views/AddSeries/ExistingSeries.cshtml | 44 ---- NzbDrone.Web/Views/AddSeries/Index.cshtml | 92 --------- NzbDrone.Web/Views/AddSeries/RootDir.cshtml | 10 - NzbDrone.Web/Views/AddSeries/RootList.cshtml | 16 -- NzbDrone.Web/Views/Series/Index.cshtml | 155 ++++++++------- .../Views/Shared/NoSeriesBanner.cshtml | 3 +- NzbDrone.Web/packages.config | 1 + NzbDrone.ncrunchsolution | 3 +- 35 files changed, 397 insertions(+), 564 deletions(-) create mode 100644 NzbDrone.Core/Datastore/Migrations/Migration20130203.cs create mode 100644 NzbDrone.Core/RootFolders/RootFolderRepository.cs rename NzbDrone.Core/{Providers/RootDirProvider.cs => RootFolders/RootFolderService.cs} (73%) create mode 100644 NzbDrone.Web/App_Data/nzbdrone.eq delete mode 100644 NzbDrone.Web/Controllers/AddSeriesController.cs create mode 100644 NzbDrone.Web/Eloquera.config delete mode 100644 NzbDrone.Web/Views/AddSeries/AddNew.cshtml delete mode 100644 NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml delete mode 100644 NzbDrone.Web/Views/AddSeries/Index.cshtml delete mode 100644 NzbDrone.Web/Views/AddSeries/RootDir.cshtml delete mode 100644 NzbDrone.Web/Views/AddSeries/RootList.cshtml diff --git a/NzbDrone.Api/RootFolders/RootFolderModule.cs b/NzbDrone.Api/RootFolders/RootFolderModule.cs index 306b2d61c..46c39dd3a 100644 --- a/NzbDrone.Api/RootFolders/RootFolderModule.cs +++ b/NzbDrone.Api/RootFolders/RootFolderModule.cs @@ -3,17 +3,18 @@ using Nancy; using NzbDrone.Api.Extentions; using NzbDrone.Core.Providers; using NzbDrone.Core.Repository; +using NzbDrone.Core.RootFolders; namespace NzbDrone.Api.RootFolders { public class RootDirModule : NzbDroneApiModule { - private readonly RootDirProvider _rootDirProvider; + private readonly RootFolderService _rootFolderService; - public RootDirModule(RootDirProvider rootDirProvider) + public RootDirModule(RootFolderService rootFolderService) : base("//rootdir") { - _rootDirProvider = rootDirProvider; + _rootFolderService = rootFolderService; Get["/"] = x => GetRootFolders(); Post["/"] = x => AddRootFolder(); @@ -22,18 +23,18 @@ namespace NzbDrone.Api.RootFolders private Response AddRootFolder() { - var dir = _rootDirProvider.Add(Request.Body.FromJson()); + var dir = _rootFolderService.Add(Request.Body.FromJson()); return dir.AsResponse(HttpStatusCode.Created); } private Response GetRootFolders() { - return _rootDirProvider.AllWithFreeSpace().AsResponse(); + return _rootFolderService.All().AsResponse(); } private Response DeleteRootFolder(int folderId) { - _rootDirProvider.Remove(folderId); + _rootFolderService.Remove(folderId); return new Response { StatusCode = HttpStatusCode.OK }; } } diff --git a/NzbDrone.Common/EnvironmentProvider.cs b/NzbDrone.Common/EnvironmentProvider.cs index 1cd2ffcee..616819ab4 100644 --- a/NzbDrone.Common/EnvironmentProvider.cs +++ b/NzbDrone.Common/EnvironmentProvider.cs @@ -107,7 +107,15 @@ namespace NzbDrone.Common { get { - return new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName; + var path = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName; + + if (path.StartsWith(Environment.GetFolderPath(Environment.SpecialFolder.Windows), + StringComparison.InvariantCultureIgnoreCase)) + { + path = Directory.GetCurrentDirectory(); + } + + return path; } } diff --git a/NzbDrone.Common/PathExtentions.cs b/NzbDrone.Common/PathExtentions.cs index 6a3058115..5eefc625a 100644 --- a/NzbDrone.Common/PathExtentions.cs +++ b/NzbDrone.Common/PathExtentions.cs @@ -7,6 +7,7 @@ namespace NzbDrone.Common { private const string WEB_FOLDER = "NzbDrone.Web\\"; private const string APP_DATA = "App_Data\\"; + private const string WEB_BIN = "bin\\"; public const string IIS_FOLDER = "IISExpress"; public const string IIS_EXE = "iisexpress.exe"; @@ -70,6 +71,11 @@ namespace NzbDrone.Common return Path.Combine(environmentProvider.GetWebRoot(), APP_DATA); } + public static string GetWebBinPath(this EnvironmentProvider environmentProvider) + { + return Path.Combine(environmentProvider.GetWebRoot(), WEB_BIN); + } + public static string GetNlogConfigPath(this EnvironmentProvider environmentProvider) { return Path.Combine(environmentProvider.GetWebRoot(), LOG_CONFIG_FILE); diff --git a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs index cd96feb4e..cadc86a33 100644 --- a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs +++ b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs @@ -1,4 +1,5 @@ using System.Linq; +using Eloquera.Client; using FizzWare.NBuilder; using FluentAssertions; using NUnit.Framework; @@ -82,6 +83,19 @@ namespace NzbDrone.Core.Test.Datastore Db.Insert(testSeries); testSeries.Id.Should().NotBe(0); } + + [Test] + public void should_be_able_to_read_unknow_type() + { + Db.AsQueryable().ToList().Should().BeEmpty(); + } + } + + public class UnKnowType + { + [ID] + public string Id; + public string Field1 { get; set; } } } diff --git a/NzbDrone.Core.Test/Framework/ObjectDbTest.cs b/NzbDrone.Core.Test/Framework/ObjectDbTest.cs index 897810a91..e0a13ecca 100644 --- a/NzbDrone.Core.Test/Framework/ObjectDbTest.cs +++ b/NzbDrone.Core.Test/Framework/ObjectDbTest.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using NUnit.Framework; +using NzbDrone.Common; using NzbDrone.Core.Datastore; namespace NzbDrone.Core.Test.Framework @@ -23,11 +24,11 @@ namespace NzbDrone.Core.Test.Framework { if (memory) { - _db = new EloqueraDbFactory().CreateMemoryDb(); + _db = new EloqueraDbFactory(new EnvironmentProvider()).CreateMemoryDb(); } else { - _db = new EloqueraDbFactory().Create(Guid.NewGuid().ToString()); + _db = new EloqueraDbFactory(new EnvironmentProvider()).Create(); } Mocker.SetConstant(Db); diff --git a/NzbDrone.Core.Test/Framework/SqlCeTest.cs b/NzbDrone.Core.Test/Framework/SqlCeTest.cs index c47dd737c..89bf44cda 100644 --- a/NzbDrone.Core.Test/Framework/SqlCeTest.cs +++ b/NzbDrone.Core.Test/Framework/SqlCeTest.cs @@ -28,6 +28,32 @@ namespace NzbDrone.Core.Test.Framework } + public abstract class CoreTest : CoreTest + { + private TSubject _subject; + + + protected TSubject Subject + { + get + { + if (_subject == null) + { + _subject = Mocker.Resolve(); + } + + return _subject; + + } + } + + + protected void InitiateSubject() + { + _subject = Mocker.Resolve(); + } + } + public abstract class SqlCeTest : CoreTest { diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 8862d93d8..33e889883 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -79,6 +79,7 @@ ..\packages\EloqueraDB.5.0.0\lib\net40\Eloquera.Server.exe + True ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.ncrunchproject b/NzbDrone.Core.Test/NzbDrone.Core.Test.ncrunchproject index 9812b56a3..ab51924af 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.ncrunchproject +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.ncrunchproject @@ -31,5 +31,6 @@ NzbDrone\.Core\.Test\.Integeration\.ServiceIntegerationFixture\..* + ..\NzbDrone.Core\bin\Debug\Eloquera.Server.exe PostBuildEventDisabled \ No newline at end of file diff --git a/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/FreeSpaceOnDrivesFixture.cs b/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/FreeSpaceOnDrivesFixture.cs index aadb33bf7..fb5902d53 100644 --- a/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/FreeSpaceOnDrivesFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/FreeSpaceOnDrivesFixture.cs @@ -12,6 +12,7 @@ using NzbDrone.Common; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Repository; +using NzbDrone.Core.RootFolders; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common; using NzbDrone.Test.Common.AutoMoq; @@ -38,7 +39,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests .Setup(s => s.FreeDiskSpace(new DirectoryInfo(@"C:\"))) .Returns(123456); - var result = Mocker.Resolve().FreeSpaceOnDrives(); + var result = Mocker.Resolve().FreeSpaceOnDrives(); result.Should().HaveCount(1); } @@ -59,7 +60,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests .Setup(s => s.FreeDiskSpace(new DirectoryInfo(@"C:\"))) .Returns(123456); - var result = Mocker.Resolve().FreeSpaceOnDrives(); + var result = Mocker.Resolve().FreeSpaceOnDrives(); result.Should().HaveCount(1); } @@ -84,7 +85,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests .Setup(s => s.FreeDiskSpace(It.IsAny())) .Returns(123456); - var result = Mocker.Resolve().FreeSpaceOnDrives(); + var result = Mocker.Resolve().FreeSpaceOnDrives(); result.Should().HaveCount(2); } @@ -104,7 +105,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests .Setup(s => s.FreeDiskSpace(It.IsAny())) .Throws(new DirectoryNotFoundException()); - var result = Mocker.Resolve().FreeSpaceOnDrives(); + var result = Mocker.Resolve().FreeSpaceOnDrives(); result.Should().HaveCount(0); diff --git a/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/RootDirProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/RootDirProviderFixture.cs index a7701dcc3..111ac0ade 100644 --- a/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/RootDirProviderFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/RootDirProviderTests/RootDirProviderFixture.cs @@ -1,6 +1,7 @@ // ReSharper disable RedundantUsingDirective using System; +using System.Collections.Generic; using System.IO; using System.Linq; @@ -11,6 +12,7 @@ using NzbDrone.Common; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Repository; +using NzbDrone.Core.RootFolders; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common.AutoMoq; @@ -18,7 +20,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests { [TestFixture] // ReSharper disable InconsistentNaming - public class RootDirProviderFixture : SqlCeTest + public class RootDirProviderFixture : CoreTest { [SetUp] public void Setup() @@ -35,32 +37,15 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests .Returns(false); } - [Test] - public void GetRootDir_should_return_all_existing_roots() - { - WithRealDb(); - - Db.Insert(new RootDir { Path = @"C:\TV" }); - Db.Insert(new RootDir { Path = @"C:\TV2" }); - - var result = Mocker.Resolve().GetAll(); - result.Should().HaveCount(2); - } [TestCase("D:\\TV Shows\\")] [TestCase("//server//folder")] public void should_be_able_to_add_root_dir(string path) { - WithRealDb(); + var root = new RootDir { Path = path }; + Subject.Add(root); - //Act - var rootDirProvider = Mocker.Resolve(); - rootDirProvider.Add(new RootDir { Path = path }); - - //Assert - var rootDirs = rootDirProvider.GetAll(); - rootDirs.Should().HaveCount(1); - rootDirs.First().Path.Should().Be(path); + Mocker.GetMock().Verify(c => c.Add(root), Times.Once()); } [Test] @@ -68,34 +53,25 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests { WithNoneExistingFolder(); - var rootDirProvider = Mocker.Resolve(); - Assert.Throws(() => rootDirProvider.Add(new RootDir { Path = "C:\\TEST" })); + Assert.Throws(() => Subject.Add(new RootDir { Path = "C:\\TEST" })); } [Test] public void should_be_able_to_remove_root_dir() { - WithRealDb(); - - //Act - var rootDirProvider = Mocker.Resolve(); - rootDirProvider.Add(new RootDir { Path = @"C:\TV" }); - rootDirProvider.Add(new RootDir { Path = @"C:\TV2" }); - rootDirProvider.Remove(1); - - //Assert - var rootDirs = rootDirProvider.GetAll(); - rootDirs.Should().HaveCount(1); + Subject.Remove(1); + Mocker.GetMock().Verify(c => c.Delete(1), Times.Once()); } - [Test] public void None_existing_folder_returns_empty_list() { WithNoneExistingFolder(); + Mocker.GetMock().Setup(c => c.All()).Returns(new List()); + const string path = "d:\\bad folder"; - var result = Mocker.Resolve().GetUnmappedFolders(path); + var result = Subject.GetUnmappedFolders(path); result.Should().NotBeNull(); result.Should().BeEmpty(); @@ -105,7 +81,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests [Test] public void GetUnmappedFolders_throw_on_empty_folders() { - Assert.Throws(() => Mocker.Resolve().GetUnmappedFolders("")); + Assert.Throws(() => Mocker.Resolve().GetUnmappedFolders("")); } [TestCase("")] @@ -114,19 +90,17 @@ namespace NzbDrone.Core.Test.ProviderTests.RootDirProviderTests public void invalid_folder_path_throws_on_add(string path) { Assert.Throws(() => - Mocker.Resolve().Add(new RootDir { Id = 0, Path = path }) + Mocker.Resolve().Add(new RootDir { Id = 0, Path = path }) ); } [Test] public void adding_duplicated_root_folder_should_throw() { - WithRealDb(); + Mocker.GetMock().Setup(c => c.All()).Returns(new List { new RootDir { Path = "C:\\TV" } }); - //Act - var rootDirProvider = Mocker.Resolve(); - rootDirProvider.Add(new RootDir { Path = @"C:\TV" }); - Assert.Throws(() => rootDirProvider.Add(new RootDir { Path = @"C:\TV" })); + Subject.Add(new RootDir { Path = @"C:\TV" }); + Assert.Throws(() => Subject.Add(new RootDir { Path = @"C:\TV" })); } } } \ No newline at end of file diff --git a/NzbDrone.Core/ContainerExtentions.cs b/NzbDrone.Core/ContainerExtentions.cs index c76b35397..2f0c452cd 100644 --- a/NzbDrone.Core/ContainerExtentions.cs +++ b/NzbDrone.Core/ContainerExtentions.cs @@ -82,8 +82,7 @@ namespace NzbDrone.Core container.Register(c => { - var env = c.Resolve(); - return c.Resolve().Create(env.GetElqMainDbPath()); + return c.Resolve().Create(); }).As().SingleInstance(); container.RegisterType().WithParameter(ResolvedParameter.ForNamed("DatabaseTarget")); diff --git a/NzbDrone.Core/Datastore/EloqueraDb.cs b/NzbDrone.Core/Datastore/EloqueraDb.cs index 4cf96e9a1..be00281de 100644 --- a/NzbDrone.Core/Datastore/EloqueraDb.cs +++ b/NzbDrone.Core/Datastore/EloqueraDb.cs @@ -43,12 +43,12 @@ namespace NzbDrone.Core.Datastore } - public void Delete(T obj) + public void Delete(T obj) where T : new() { _db.Delete(obj); } - public void DeleteMany(IEnumerable objects) + public void DeleteMany(IEnumerable objects) where T: new() { foreach (var o in objects) { diff --git a/NzbDrone.Core/Datastore/EloqueraDbFactory.cs b/NzbDrone.Core/Datastore/EloqueraDbFactory.cs index 29dd92ed6..ec1d6fe5c 100644 --- a/NzbDrone.Core/Datastore/EloqueraDbFactory.cs +++ b/NzbDrone.Core/Datastore/EloqueraDbFactory.cs @@ -2,27 +2,52 @@ using System.IO; using System.Linq; using Eloquera.Client; +using NzbDrone.Common; namespace NzbDrone.Core.Datastore { public class EloqueraDbFactory { + private readonly EnvironmentProvider _environmentProvider; + + private readonly string dllPath; + + public EloqueraDbFactory(EnvironmentProvider environmentProvider) + { + _environmentProvider = environmentProvider; + dllPath = _environmentProvider.GetWebBinPath();// this is the path where Eloquera dlls live. + } + public EloqueraDb CreateMemoryDb() { - return InternalCreate("server=(local);password=;options=inmemory;",Guid.NewGuid().ToString()); + return InternalCreate("server=(local);password=;options=inmemory;uselocalpath=" + dllPath, Guid.NewGuid().ToString()); } - public EloqueraDb Create(string dbPath) + public EloqueraDb Create(string dbPath = null) { - var file = new FileInfo(dbPath).Name; - return InternalCreate(string.Format("server=(local);database={0};usedatapath={1};password=;", file, dbPath),file); + if (dbPath == null) + { + dbPath = _environmentProvider.GetElqMainDbPath(); + } + + var file = new FileInfo(dbPath); + + return InternalCreate(string.Format("server=(local);password=;usedatapath={0};uselocalpath={1}", file.Directory.FullName, dllPath), file.Name); } private EloqueraDb InternalCreate(string connectionString, string databaseName) { var db = new DB(connectionString); - db.CreateDatabase(databaseName); - db.OpenDatabase(databaseName); + try + { + db.OpenDatabase(databaseName); + } + catch (FileNotFoundException) + { + db.CreateDatabase(databaseName); + db.OpenDatabase(databaseName); + } + return new EloqueraDb(db); } diff --git a/NzbDrone.Core/Datastore/Migrations/Migration20130203.cs b/NzbDrone.Core/Datastore/Migrations/Migration20130203.cs new file mode 100644 index 000000000..795c82766 --- /dev/null +++ b/NzbDrone.Core/Datastore/Migrations/Migration20130203.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using Migrator.Framework; +using NzbDrone.Core.Repository; +using NzbDrone.Core.RootFolders; + +namespace NzbDrone.Core.Datastore.Migrations +{ + [Migration(20130203)] + public class Migration20130203 : NzbDroneMigration + { + protected override void MainDbUpgrade() + { + var objectDb = GetObjectDb(); + + + var rootFolderRepo = new RootFolderRepository(objectDb); + + + using (var dataReader = Database.ExecuteQuery("SELECT * from RootDirs")) + { + var dirs = new List(); + while (dataReader.Read()) + { + var rootFolder = new RootDir { Path = dataReader["Path"].ToString() }; + dirs.Add(rootFolder); + } + objectDb.InsertMany(dirs); + } + //Database.RemoveTable("RootDirs"); + + } + } +} \ No newline at end of file diff --git a/NzbDrone.Core/Datastore/Migrations/NzbDroneMigration.cs b/NzbDrone.Core/Datastore/Migrations/NzbDroneMigration.cs index cef596c3d..be0735e84 100644 --- a/NzbDrone.Core/Datastore/Migrations/NzbDroneMigration.cs +++ b/NzbDrone.Core/Datastore/Migrations/NzbDroneMigration.cs @@ -1,4 +1,5 @@ using System; +using System.Data.SqlServerCe; using System.Linq; using Migrator.Framework; using NzbDrone.Common; @@ -32,6 +33,14 @@ namespace NzbDrone.Core.Datastore.Migrations } } + protected EloqueraDb GetObjectDb() + { + + var sqlCeConnection = new SqlCeConnection(Database.ConnectionString); + + var eqPath = sqlCeConnection.Database.Replace(".sdf", ".eq"); + return new EloqueraDbFactory(new EnvironmentProvider()).Create(eqPath); + } public override void Down() { diff --git a/NzbDrone.Core/Datastore/MigrationsHelper.cs b/NzbDrone.Core/Datastore/MigrationsHelper.cs index 6de4814cf..801ce1ed5 100644 --- a/NzbDrone.Core/Datastore/MigrationsHelper.cs +++ b/NzbDrone.Core/Datastore/MigrationsHelper.cs @@ -9,37 +9,37 @@ namespace NzbDrone.Core.Datastore { public class MigrationsHelper { - private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + private static readonly Logger logger = LogManager.GetCurrentClassLogger(); - public static void Run(string connetionString, bool trace) + public static void Run(string connectionString, bool trace) { - EnsureDatabase(connetionString); + EnsureDatabase(connectionString); - Logger.Trace("Preparing to run database migration"); + logger.Trace("Preparing to run database migration"); try { Migrator.Migrator migrator; if (trace) { - migrator = new Migrator.Migrator("sqlserverce", connetionString, Assembly.GetAssembly(typeof(MigrationsHelper)), true, new MigrationLogger()); + migrator = new Migrator.Migrator("sqlserverce", connectionString, Assembly.GetAssembly(typeof(MigrationsHelper)), true, new MigrationLogger()); } else { - migrator = new Migrator.Migrator("sqlserverce", connetionString, Assembly.GetAssembly(typeof(MigrationsHelper))); + migrator = new Migrator.Migrator("sqlserverce", connectionString, Assembly.GetAssembly(typeof(MigrationsHelper))); } migrator.MigrateToLastVersion(); - Logger.Info("Database migration completed"); + logger.Info("Database migration completed"); } catch (Exception e) { - Logger.FatalException("An error has occurred while migrating database", e); + logger.FatalException("An error has occurred while migrating database", e); throw; } } diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 56b2b5300..777e7997d 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -237,6 +237,7 @@ + @@ -536,7 +537,7 @@ Code - + Code @@ -599,6 +600,7 @@ + diff --git a/NzbDrone.Core/Repository/RootDir.cs b/NzbDrone.Core/Repository/RootDir.cs index 3003dbf6f..7cb43d9e4 100644 --- a/NzbDrone.Core/Repository/RootDir.cs +++ b/NzbDrone.Core/Repository/RootDir.cs @@ -3,9 +3,21 @@ using PetaPoco; namespace NzbDrone.Core.Repository { + public interface IRootDir + { + int Id { get; set; } + string Path { get; set; } + + [ResultColumn] + ulong FreeSpace { get; set; } + + [Ignore] + List UnmappedFolders { get; set; } + } + [TableName("RootDirs")] [PrimaryKey("Id", autoIncrement = true)] - public class RootDir + public class RootDir : IRootDir { public virtual int Id { get; set; } diff --git a/NzbDrone.Core/RootFolders/RootFolderRepository.cs b/NzbDrone.Core/RootFolders/RootFolderRepository.cs new file mode 100644 index 000000000..3492c6a15 --- /dev/null +++ b/NzbDrone.Core/RootFolders/RootFolderRepository.cs @@ -0,0 +1,46 @@ +using System.Collections.Generic; +using NzbDrone.Core.Datastore; +using NzbDrone.Core.Repository; +using System.Linq; + +namespace NzbDrone.Core.RootFolders +{ + public interface IRootFolderRepository + { + List All(); + RootDir Get(int rootFolderId); + RootDir Add(RootDir rootFolder); + void Delete(int rootFolderId); + } + + public class RootFolderRepository : IRootFolderRepository + { + private readonly EloqueraDb _db; + + public RootFolderRepository(EloqueraDb db) + { + _db = db; + } + + public List All() + { + return _db.AsQueryable().ToList(); + } + + public RootDir Get(int rootFolderId) + { + return _db.AsQueryable().Single(c => c.Id == rootFolderId); + } + + public RootDir Add(RootDir rootFolder) + { + return _db.Insert(rootFolder); + } + + public void Delete(int rootFolderId) + { + _db.Delete(Get(rootFolderId)); + } + } + +} diff --git a/NzbDrone.Core/Providers/RootDirProvider.cs b/NzbDrone.Core/RootFolders/RootFolderService.cs similarity index 73% rename from NzbDrone.Core/Providers/RootDirProvider.cs rename to NzbDrone.Core/RootFolders/RootFolderService.cs index b28a4f03a..02b0de1e3 100644 --- a/NzbDrone.Core/Providers/RootDirProvider.cs +++ b/NzbDrone.Core/RootFolders/RootFolderService.cs @@ -1,30 +1,40 @@ -using System; +using System.Linq; +using System; using System.Collections.Generic; using System.IO; using NLog; using NzbDrone.Common; +using NzbDrone.Core.Providers; using NzbDrone.Core.Repository; -using PetaPoco; -namespace NzbDrone.Core.Providers +namespace NzbDrone.Core.RootFolders { - public class RootDirProvider + public interface IRootFolderService + { + List All(); + RootDir Add(RootDir rootDir); + void Remove(int rootDirId); + List GetUnmappedFolders(string path); + Dictionary FreeSpaceOnDrives(); + } + + public class RootFolderService : IRootFolderService { - private readonly IDatabase _database; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + private readonly IRootFolderRepository _rootFolderRepository; private readonly DiskProvider _diskProvider; private readonly SeriesProvider _seriesProvider; - public RootDirProvider(IDatabase database, SeriesProvider seriesProvider, DiskProvider diskProvider) + public RootFolderService(IRootFolderRepository rootFolderRepository, SeriesProvider seriesProvider, DiskProvider diskProvider) { - _database = database; + _rootFolderRepository = rootFolderRepository; _diskProvider = diskProvider; _seriesProvider = seriesProvider; } - public virtual List GetAll() + public virtual List All() { - return _database.Fetch(); + return _rootFolderRepository.All(); } public virtual RootDir Add(RootDir rootDir) @@ -35,20 +45,19 @@ namespace NzbDrone.Core.Providers if (!_diskProvider.FolderExists(rootDir.Path)) throw new DirectoryNotFoundException("Can't add root directory that doesn't exist."); - if (GetAll().Exists(r => DiskProvider.PathEquals(r.Path, rootDir.Path))) + if (All().Exists(r => DiskProvider.PathEquals(r.Path, rootDir.Path))) throw new InvalidOperationException("Root directory already exist."); - var id = _database.Insert(rootDir); - rootDir.Id = Convert.ToInt32(id); + _rootFolderRepository.Add(rootDir); + rootDir.FreeSpace = _diskProvider.FreeDiskSpace(new DirectoryInfo(rootDir.Path)); rootDir.UnmappedFolders = GetUnmappedFolders(rootDir.Path); - return rootDir; } public virtual void Remove(int rootDirId) { - _database.Delete(rootDirId); + _rootFolderRepository.Delete(rootDirId); } public virtual List GetUnmappedFolders(string path) @@ -77,24 +86,12 @@ namespace NzbDrone.Core.Providers return results; } - public virtual List AllWithFreeSpace() - { - var rootDirs = GetAll(); - - foreach (var rootDir in rootDirs) - { - rootDir.FreeSpace = _diskProvider.FreeDiskSpace(new DirectoryInfo(rootDir.Path)); - rootDir.UnmappedFolders = GetUnmappedFolders(rootDir.Path); - } - - return rootDirs; - } public virtual Dictionary FreeSpaceOnDrives() { var freeSpace = new Dictionary(); - var rootDirs = GetAll(); + var rootDirs = All(); foreach (var rootDir in rootDirs) { diff --git a/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj b/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj index d135f28af..4e6d27d09 100644 --- a/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj +++ b/NzbDrone.Services.Api/NzbDrone.Services.Api.csproj @@ -14,7 +14,7 @@ NzbDrone.Services.Api NzbDrone.Services.Api v4.0 - true + false @@ -150,9 +150,9 @@ True True - 0 + 1306 / - http://localhost:14615/ + http://localhost/NzbDrone.Services.Api False False diff --git a/NzbDrone.Web/App_Data/nzbdrone.eq b/NzbDrone.Web/App_Data/nzbdrone.eq new file mode 100644 index 0000000000000000000000000000000000000000..2f4763722534132cffd9c8ae41ac8985c4406de3 GIT binary patch literal 494156 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 literal 0 HcmV?d00001 diff --git a/NzbDrone.Web/Controllers/AddSeriesController.cs b/NzbDrone.Web/Controllers/AddSeriesController.cs deleted file mode 100644 index beff7c071..000000000 --- a/NzbDrone.Web/Controllers/AddSeriesController.cs +++ /dev/null @@ -1,188 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Web.Mvc; -using NLog; -using NzbDrone.Common; -using NzbDrone.Core.Jobs; -using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Repository; -using NzbDrone.Web.Filters; -using NzbDrone.Web.Models; -using TvdbLib.Exceptions; - -namespace NzbDrone.Web.Controllers -{ - public class AddSeriesController : Controller - { - private readonly ConfigProvider _configProvider; - private readonly QualityProvider _qualityProvider; - private readonly RootDirProvider _rootFolderProvider; - private readonly SeriesProvider _seriesProvider; - private readonly JobProvider _jobProvider; - private readonly TvDbProvider _tvDbProvider; - private readonly DiskProvider _diskProvider; - - private static readonly Logger logger = LogManager.GetCurrentClassLogger(); - - public AddSeriesController(RootDirProvider rootFolderProvider, - ConfigProvider configProvider, - QualityProvider qualityProvider, TvDbProvider tvDbProvider, - SeriesProvider seriesProvider, JobProvider jobProvider, - DiskProvider diskProvider) - { - - _rootFolderProvider = rootFolderProvider; - _configProvider = configProvider; - _qualityProvider = qualityProvider; - _tvDbProvider = tvDbProvider; - _seriesProvider = seriesProvider; - _jobProvider = jobProvider; - _diskProvider = diskProvider; - } - - public ActionResult Index() - { - return View(); - } - - public ActionResult AddNew() - { - ViewData["RootDirs"] = _rootFolderProvider.GetAll().Select(c => c.Path).OrderBy(e => e).ToList(); - - var defaultQuality = _configProvider.DefaultQualityProfile; - var qualityProfiles = _qualityProvider.All(); - - ViewData["qualityProfiles"] = new SelectList( - qualityProfiles, - "QualityProfileId", - "Name", - defaultQuality); - - return View(); - } - - public ActionResult ExistingSeries() - { - var result = new ExistingSeriesModel(); - - var unmappedList = new List(); - - foreach (var folder in _rootFolderProvider.GetAll()) - { - unmappedList.AddRange(_rootFolderProvider.GetUnmappedFolders(folder.Path)); - } - - result.ExistingSeries = new List>(); - - foreach (var folder in unmappedList) - { - var foldername = new DirectoryInfo(folder).Name; - - try - { - var tvdbResult = _tvDbProvider.SearchSeries(foldername).FirstOrDefault(); - - var title = String.Empty; - var seriesId = 0; - if (tvdbResult != null) - { - title = tvdbResult.SeriesName; - seriesId = tvdbResult.id; - } - - result.ExistingSeries.Add(new Tuple(folder, title, seriesId)); - } - catch (Exception ex) - { - logger.WarnException("Failed to connect to TheTVDB to search for: " + foldername, ex); - return View(); - } - } - - var defaultQuality = Convert.ToInt32(_configProvider.DefaultQualityProfile); - result.Quality = new SelectList(_qualityProvider.All(), "QualityProfileId", "Name", defaultQuality); - - return View(result); - } - - [HttpPost] - [JsonErrorFilter] - public JsonResult AddNewSeries(string path, string seriesName, int seriesId, int qualityProfileId, string startDate) - { - if (string.IsNullOrWhiteSpace(path) || String.Equals(path, "null", StringComparison.InvariantCultureIgnoreCase)) - return JsonNotificationResult.Error("Couldn't add " + seriesName, "You need a valid root folder"); - - path = Path.Combine(path, MediaFileProvider.CleanFilename(seriesName)); - - //Create the folder for the new series - //Use the created folder name when adding the series - path = _diskProvider.CreateDirectory(path); - - return AddExistingSeries(path, seriesName, seriesId, qualityProfileId, startDate); - } - - [HttpPost] - [JsonErrorFilter] - public JsonResult AddExistingSeries(string path, string seriesName, int seriesId, int qualityProfileId, string startDate) - { - if (seriesId == 0 || String.IsNullOrWhiteSpace(seriesName)) - return JsonNotificationResult.Error("Add Existing series failed.", "Invalid Series information"); - - DateTime? date = null; - - if (!String.IsNullOrWhiteSpace(startDate)) - date = DateTime.Parse(startDate, null, DateTimeStyles.RoundtripKind); - - _seriesProvider.AddSeries(seriesName, path, seriesId, qualityProfileId, date); - _jobProvider.QueueJob(typeof(ImportNewSeriesJob)); - - return JsonNotificationResult.Info(seriesName, "Was added successfully"); - } - - [HttpGet] - [JsonErrorFilter] - public JsonResult LookupSeries(string term) - { - - return JsonNotificationResult.Info("Lookup Failed", "Unknown error while connecting to TheTVDB"); - - } - - public ActionResult RootList() - { - IEnumerable rootDir = _rootFolderProvider.GetAll().Select(c => c.Path).OrderBy(e => e); - return PartialView("RootList", rootDir); - } - - public ActionResult RootDir() - { - return PartialView("RootDir"); - } - - [HttpPost] - [JsonErrorFilter] - public JsonResult SaveRootDir(string path) - { - if (String.IsNullOrWhiteSpace(path)) - JsonNotificationResult.Error("Can't add root folder", "Path can not be empty"); - - _rootFolderProvider.Add(new RootDir { Path = path }); - - return JsonNotificationResult.Info("Root Folder saved", "Root folder saved successfully."); - } - - [JsonErrorFilter] - public JsonResult DeleteRootDir(string path) - { - - var id = _rootFolderProvider.GetAll().Where(c => c.Path == path).First().Id; - _rootFolderProvider.Remove(id); - - return null; - } - } -} \ No newline at end of file diff --git a/NzbDrone.Web/Controllers/SharedController.cs b/NzbDrone.Web/Controllers/SharedController.cs index a4f43d8d5..3ca431803 100644 --- a/NzbDrone.Web/Controllers/SharedController.cs +++ b/NzbDrone.Web/Controllers/SharedController.cs @@ -1,6 +1,7 @@ using System.Web.Mvc; using NzbDrone.Common; using NzbDrone.Core.Providers; +using NzbDrone.Core.RootFolders; using NzbDrone.Web.Models; namespace NzbDrone.Web.Controllers @@ -8,12 +9,12 @@ namespace NzbDrone.Web.Controllers public class SharedController : Controller { private readonly EnvironmentProvider _environmentProvider; - private readonly RootDirProvider _rootDirProvider; + private readonly RootFolderService _rootFolderService; - public SharedController(EnvironmentProvider environmentProvider, RootDirProvider rootDirProvider) + public SharedController(EnvironmentProvider environmentProvider, RootFolderService rootFolderService) { _environmentProvider = environmentProvider; - _rootDirProvider = rootDirProvider; + _rootFolderService = rootFolderService; } public ActionResult Index() @@ -32,7 +33,7 @@ namespace NzbDrone.Web.Controllers [OutputCache(Duration = 600)] public ActionResult FreeSpace() { - var rootDirs = _rootDirProvider.FreeSpaceOnDrives(); + var rootDirs = _rootFolderService.FreeSpaceOnDrives(); return PartialView(rootDirs); } diff --git a/NzbDrone.Web/Eloquera.config b/NzbDrone.Web/Eloquera.config new file mode 100644 index 000000000..5ae536d21 --- /dev/null +++ b/NzbDrone.Web/Eloquera.config @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 2340aaeee..bc97a5604 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -17,7 +17,7 @@ true false - false + true @@ -26,6 +26,10 @@ ..\ true \_backboneApp\JsLibraries\|\Scripts\ + + + + true @@ -88,6 +92,17 @@ ..\packages\DynamicQuery.1.0\lib\35\Dynamic.dll + + False + ..\packages\EloqueraDB.5.0.0\lib\net40\Eloquera.Client.dll + + + False + ..\packages\EloqueraDB.5.0.0\lib\net40\Eloquera.Common.dll + + + ..\packages\EloqueraDB.5.0.0\lib\net40\Eloquera.Server.exe + ..\packages\LowercaseRoutesMVC.1.0.3\lib\LowercaseRoutesMVC.dll @@ -341,7 +356,6 @@ - @@ -401,6 +415,7 @@ + @@ -606,8 +621,6 @@ - - Designer @@ -624,7 +637,6 @@ - @@ -666,15 +678,9 @@ - - - - - - diff --git a/NzbDrone.Web/Views/AddSeries/AddNew.cshtml b/NzbDrone.Web/Views/AddSeries/AddNew.cshtml deleted file mode 100644 index 9b86fb816..000000000 --- a/NzbDrone.Web/Views/AddSeries/AddNew.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@using System.Collections -@{ Layout = null; } -
-
- - @Html.Hidden("newSeriesId", 0, new { @class = "seriesId" }) -
- @Html.DropDownList("newSeriesPath", new SelectList((IList)ViewData["RootDirs"]), new { style = "width: 406px; margin-left: 0px;" }) - @Html.DropDownList("qualityList", (SelectList)ViewData["QualityProfiles"], new { @class = "qualitySelector" }) - @Html.TextBox("newStartDate", "", new { type = "date", @class = "jQuery-datepicker start-date", placeholder = "Custom Start Date", title = "Only download episodes that aired after the specified date" }) - -
\ No newline at end of file diff --git a/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml b/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml deleted file mode 100644 index 9f84db2e2..000000000 --- a/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml +++ /dev/null @@ -1,44 +0,0 @@ -@using System.Collections -@using NzbDrone.Web.Models -@using System.Web.Mvc.Html -@model ExistingSeriesModel -@{ - Layout = null; -} - -@if (Model == null) -{ -

- Error searching TheTVDB, please try again later. -

-} - -else if (!Model.ExistingSeries.Any()) -{ -

- No series available. Try adding a new Root Folder. -

-} -else -{ - @Html.DropDownList(Guid.NewGuid().ToString(), Model.Quality, new { @class = "qualitySelector masterQualitySelector" }) - - @Html.TextBox(Guid.NewGuid().ToString(), "", new { type="date", @class = "jQuery-datepicker start-date-master", placeholder = "Custom Start Date", title = "Only download episodes that aired after the specified date" }) - - foreach (var series in Model.ExistingSeries) - { -
- - - -
- - @Html.Hidden("seriesId", series.Item3, new { @class = "seriesId" }) - @Html.DropDownList(Guid.NewGuid().ToString(), Model.Quality, new { @class = "qualitySelector" }) - @Html.TextBox(Guid.NewGuid().ToString(), "", new { type="date", @class = "jQuery-datepicker start-date", placeholder = "Custom Start Date", title = "Only download episodes that aired after the specified date" }) - -
-
- } -} diff --git a/NzbDrone.Web/Views/AddSeries/Index.cshtml b/NzbDrone.Web/Views/AddSeries/Index.cshtml deleted file mode 100644 index a9e15a06c..000000000 --- a/NzbDrone.Web/Views/AddSeries/Index.cshtml +++ /dev/null @@ -1,92 +0,0 @@ -@using NzbDrone.Web.Helpers -@{ViewBag.Title = "Add Series";} - -@section HeaderContent -{ - -} - -@{Html.RenderAction("RootDir");} -
-

- Add New Series

-
- @{ Html.RenderAction("AddNew", "AddSeries"); } -
-

- Add Series Already on Disk

-
- - - @Ajax.RenderAction( - "ExistingSeries", - "AddSeries", - null, - new AjaxOptions { UpdateTargetId = "existingSeries", InsertionMode = InsertionMode.Replace } - ) -
-
- -@section Scripts -{ - @Html.IncludeScript("NzbDrone/addSeries.js") - - -} \ No newline at end of file diff --git a/NzbDrone.Web/Views/AddSeries/RootDir.cshtml b/NzbDrone.Web/Views/AddSeries/RootDir.cshtml deleted file mode 100644 index fb5908da9..000000000 --- a/NzbDrone.Web/Views/AddSeries/RootDir.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -

- Manage Root Folders -

- - - - - @{Html.RenderAction("RootList");} - diff --git a/NzbDrone.Web/Views/AddSeries/RootList.cshtml b/NzbDrone.Web/Views/AddSeries/RootList.cshtml deleted file mode 100644 index 95c1fdb9f..000000000 --- a/NzbDrone.Web/Views/AddSeries/RootList.cshtml +++ /dev/null @@ -1,16 +0,0 @@ -@model IEnumerable -@if (!Model.Any()) -{ -
- You have no root folders added. -
-} -@foreach (var root in Model) -{ -
-
- -
- @root -
-} diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml index c9cb9f8e2..c747b70a1 100644 --- a/NzbDrone.Web/Views/Series/Index.cshtml +++ b/NzbDrone.Web/Views/Series/Index.cshtml @@ -5,16 +5,16 @@ { @Html.IncludeCss("Settings.css") } - @section ActionMenu{
    -
  • @Html.ActionLink("Add Series", "Index", "AddSeries", null, new { Title = "Add a new or existing series" })
    • +
  • Add Series
  • @Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null, new { Title = "Check for newly released downloads" })
  • @Html.ActionLink("Series Editor", "Editor", "Series", null, new { Title = "Edit multiple series" })
@@ -61,7 +57,7 @@ - + @@ -70,7 +66,7 @@ - + @*Commands Column*@ @@ -96,7 +92,7 @@ @Html.IncludeScript("NzbDrone/series.js")
Status TitleNetwork Next Airing Episodes