From 5128481b23adc999dcd02176328c61e2e2074020 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 8 Mar 2020 22:49:00 -0400
Subject: [PATCH] New: Additional Path Validation on Movie Add

---
 src/NzbDrone.Api/Movies/MovieModule.cs  | 6 +++++-
 src/Radarr.Api.V3/Movies/MovieModule.cs | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/NzbDrone.Api/Movies/MovieModule.cs b/src/NzbDrone.Api/Movies/MovieModule.cs
index e579f87cb..49b2ec24c 100644
--- a/src/NzbDrone.Api/Movies/MovieModule.cs
+++ b/src/NzbDrone.Api/Movies/MovieModule.cs
@@ -35,6 +35,7 @@ namespace NzbDrone.Api.Movies
                            IMovieService moviesService,
                            IMapCoversToLocal coverMapper,
                            RootFolderValidator rootFolderValidator,
+                           MappedNetworkDriveValidator mappedNetworkDriveValidator,
                            MoviePathValidator moviesPathValidator,
                            MovieExistsValidator moviesExistsValidator,
                            MovieAncestorValidator moviesAncestorValidator,
@@ -59,6 +60,7 @@ namespace NzbDrone.Api.Movies
                            .Cascade(CascadeMode.StopOnFirstFailure)
                            .IsValidPath()
                            .SetValidator(rootFolderValidator)
+                           .SetValidator(mappedNetworkDriveValidator)
                            .SetValidator(moviesPathValidator)
                            .SetValidator(moviesAncestorValidator)
                            .SetValidator(systemFolderValidator)
@@ -67,7 +69,9 @@ namespace NzbDrone.Api.Movies
             SharedValidator.RuleFor(s => s.ProfileId).SetValidator(profileExistsValidator);
 
             PostValidator.RuleFor(s => s.Path).IsValidPath().When(s => s.RootFolderPath.IsNullOrWhiteSpace());
-            PostValidator.RuleFor(s => s.RootFolderPath).IsValidPath().When(s => s.Path.IsNullOrWhiteSpace());
+            PostValidator.RuleFor(s => s.RootFolderPath)
+                         .IsValidPath()
+                         .When(s => s.Path.IsNullOrWhiteSpace());
             PostValidator.RuleFor(s => s.Title).NotEmpty();
             PostValidator.RuleFor(s => s.TmdbId).NotNull().NotEmpty().SetValidator(moviesExistsValidator);
 
diff --git a/src/Radarr.Api.V3/Movies/MovieModule.cs b/src/Radarr.Api.V3/Movies/MovieModule.cs
index 1ae827006..ee4486ba2 100644
--- a/src/Radarr.Api.V3/Movies/MovieModule.cs
+++ b/src/Radarr.Api.V3/Movies/MovieModule.cs
@@ -40,9 +40,11 @@ namespace Radarr.Api.V3.Movies
                             IManageCommandQueue commandQueueManager,
                             IUpgradableSpecification qualityUpgradableSpecification,
                             RootFolderValidator rootFolderValidator,
+                            MappedNetworkDriveValidator mappedNetworkDriveValidator,
                             MoviePathValidator moviesPathValidator,
                             MovieExistsValidator moviesExistsValidator,
                             MovieAncestorValidator moviesAncestorValidator,
+                            SystemFolderValidator systemFolderValidator,
                             ProfileExistsValidator profileExistsValidator,
                             MovieFolderAsRootFolderValidator movieFolderAsRootFolderValidator)
             : base(signalRBroadcaster)
@@ -64,8 +66,10 @@ namespace Radarr.Api.V3.Movies
                            .Cascade(CascadeMode.StopOnFirstFailure)
                            .IsValidPath()
                            .SetValidator(rootFolderValidator)
+                           .SetValidator(mappedNetworkDriveValidator)
                            .SetValidator(moviesPathValidator)
                            .SetValidator(moviesAncestorValidator)
+                           .SetValidator(systemFolderValidator)
                            .When(s => !s.Path.IsNullOrWhiteSpace());
 
             SharedValidator.RuleFor(s => s.QualityProfileId).SetValidator(profileExistsValidator);