New: Command line arguments for Custom Scripts are no longer supported

src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Processes;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Tv;
@@ -133,22 +134,33 @@ namespace NzbDrone.Core.Notifications.CustomScript
                 failures.Add(new NzbDroneValidationFailure("Path", "File does not exist"));
             }
 
-            try
+            foreach (var systemFolder in SystemFolders.GetSystemFolders())
             {
-                var environmentVariables = new StringDictionary();
-                environmentVariables.Add("Sonarr_EventType", "Test");
-
-                var processOutput = ExecuteScript(environmentVariables);
-
-                if (processOutput.ExitCode != 0)
+                if (systemFolder.IsParentPath(Settings.Path))
                 {
-                    failures.Add(new NzbDroneValidationFailure(string.Empty, $"Script exited with code: {processOutput.ExitCode}"));
+                    failures.Add(new NzbDroneValidationFailure("Path", $"Must not be a descendant of '{systemFolder}'"));
                 }
             }
-            catch (Exception ex)
+
+            if (failures.Empty())
             {
-                _logger.Error(ex);
-                failures.Add(new NzbDroneValidationFailure(string.Empty, ex.Message));
+                try
+                {
+                    var environmentVariables = new StringDictionary();
+                    environmentVariables.Add("Sonarr_EventType", "Test");
+
+                    var processOutput = ExecuteScript(environmentVariables);
+
+                    if (processOutput.ExitCode != 0)
+                    {
+                        failures.Add(new NzbDroneValidationFailure(string.Empty, $"Script exited with code: {processOutput.ExitCode}"));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error(ex);
+                    failures.Add(new NzbDroneValidationFailure(string.Empty, ex.Message));
+                }
             }
 
             return new ValidationResult(failures);
@@ -165,5 +177,10 @@ namespace NzbDrone.Core.Notifications.CustomScript
 
             return processOutput;
         }
+
+        private bool ValidatePathParent(string possibleParent, string path)
+        {
+            return possibleParent.IsParentPath(path);
+        }
     }
 }

src/NzbDrone.Core/Notifications/CustomScript/CustomScriptSettings.cs

@@ -11,6 +11,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
         public CustomScriptSettingsValidator()
         {
             RuleFor(c => c.Path).IsValidPath();
+            RuleFor(c => c.Arguments).Empty().WithMessage("Arguments are no longer supported for custom scripts");
         }
     }
 
@@ -21,7 +22,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
         [FieldDefinition(0, Label = "Path", Type = FieldType.FilePath)]
         public string Path { get; set; }
 
-        [FieldDefinition(1, Label = "Arguments", HelpText = "Arguments to pass to the script")]
+        [FieldDefinition(1, Label = "Arguments", HelpText = "Arguments to pass to the script", Hidden = HiddenType.HiddenIfNotSet)]
         public string Arguments { get; set; }
 
         public NzbDroneValidationResult Validate()