From 80e53f209d082ca9efc92f7b45ec339b05cab9e4 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 23 Jan 2017 15:31:09 +0100 Subject: [PATCH] Movies can now be added monitored or unmonitored. --- src/NzbDrone.Api/NetImport/NetImportModule.cs | 2 ++ .../NetImport/NetImportResource.cs | 1 + .../Migration/123_create_netimport_table.cs | 1 + .../MetadataSource/SkyHook/SkyHookProxy.cs | 1 + .../NetImport/HttpNetImportBase.cs | 1 + .../NetImport/NetImportDefinition.cs | 1 + .../Edit/NetImportEditViewTemplate.hbs | 22 +++++++++++++++++++ 7 files changed, 29 insertions(+) diff --git a/src/NzbDrone.Api/NetImport/NetImportModule.cs b/src/NzbDrone.Api/NetImport/NetImportModule.cs index 96faebb80..f56d1164a 100644 --- a/src/NzbDrone.Api/NetImport/NetImportModule.cs +++ b/src/NzbDrone.Api/NetImport/NetImportModule.cs @@ -21,6 +21,7 @@ namespace NzbDrone.Api.NetImport resource.EnableAuto = definition.EnableAuto; resource.ProfileId = definition.ProfileId; resource.RootFolderPath = definition.RootFolderPath; + resource.ShouldMonitor = definition.ShouldMonitor; } protected override void MapToModel(NetImportDefinition definition, NetImportResource resource) @@ -31,6 +32,7 @@ namespace NzbDrone.Api.NetImport definition.EnableAuto = resource.EnableAuto; definition.ProfileId = resource.ProfileId; definition.RootFolderPath = resource.RootFolderPath; + definition.ShouldMonitor = resource.ShouldMonitor; } protected override void Validate(NetImportDefinition definition, bool includeWarnings) diff --git a/src/NzbDrone.Api/NetImport/NetImportResource.cs b/src/NzbDrone.Api/NetImport/NetImportResource.cs index efde1f836..d46eec57e 100644 --- a/src/NzbDrone.Api/NetImport/NetImportResource.cs +++ b/src/NzbDrone.Api/NetImport/NetImportResource.cs @@ -6,6 +6,7 @@ namespace NzbDrone.Api.NetImport { public bool Enabled { get; set; } public bool EnableAuto { get; set; } + public bool ShouldMonitor { get; set; } public string RootFolderPath { get; set; } public int ProfileId { get; set; } } diff --git a/src/NzbDrone.Core/Datastore/Migration/123_create_netimport_table.cs b/src/NzbDrone.Core/Datastore/Migration/123_create_netimport_table.cs index 27d620eb9..09eb67992 100644 --- a/src/NzbDrone.Core/Datastore/Migration/123_create_netimport_table.cs +++ b/src/NzbDrone.Core/Datastore/Migration/123_create_netimport_table.cs @@ -19,6 +19,7 @@ namespace NzbDrone.Core.Datastore.Migration .WithColumn("Settings").AsString().Nullable() .WithColumn("EnableAuto").AsInt32() .WithColumn("RootFolderPath").AsString() + .WithColumn("ShouldMonitor").AsInt32() .WithColumn("ProfileId").AsInt32(); } } diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index 0d9446954..b6151d46b 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -593,6 +593,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook newMovie.Path = movie.Path; newMovie.RootFolderPath = movie.RootFolderPath; newMovie.ProfileId = movie.ProfileId; + newMovie.Monitored = movie.Monitored; return newMovie; } diff --git a/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs b/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs index 5c4448164..4454b2317 100644 --- a/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs +++ b/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs @@ -218,6 +218,7 @@ namespace NzbDrone.Core.NetImport { m.RootFolderPath = ((NetImportDefinition) Definition).RootFolderPath; m.ProfileId = ((NetImportDefinition) Definition).ProfileId; + m.Monitored = ((NetImportDefinition) Definition).ShouldMonitor; return m; }).ToList(); } diff --git a/src/NzbDrone.Core/NetImport/NetImportDefinition.cs b/src/NzbDrone.Core/NetImport/NetImportDefinition.cs index ae661e5b3..20b6d2312 100644 --- a/src/NzbDrone.Core/NetImport/NetImportDefinition.cs +++ b/src/NzbDrone.Core/NetImport/NetImportDefinition.cs @@ -8,6 +8,7 @@ namespace NzbDrone.Core.NetImport { public bool Enabled { get; set; } public bool EnableAuto { get; set; } + public bool ShouldMonitor { get; set; } public int ProfileId { get; set; } public LazyLoaded Profile { get; set; } public string RootFolderPath { get; set; } diff --git a/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs b/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs index 29b30cc5c..7653fa0e0 100644 --- a/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs +++ b/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs @@ -39,6 +39,28 @@ +
+ + +
+
+ + + + + +
+
+
+