From 69b1d2f7adf255fd249fb7531a6b808ad0a96ae6 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 24 Jun 2024 12:17:57 -0400 Subject: [PATCH] Blindly assume the path exists --- CHANGELIST.md | 1 + MPF.ExecutionContexts/BaseExecutionContext.cs | 8 -- .../DiscImageCreator/ExecutionContext.cs | 109 ++++++------------ 3 files changed, 37 insertions(+), 81 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index 925a608b..ff60b639 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -23,6 +23,7 @@ - Load options before anything else - Dispose of stream when creating config - Try to make config safer for CLI +- Blindly assume the path exists ### 3.2.0 (2024-06-20) diff --git a/MPF.ExecutionContexts/BaseExecutionContext.cs b/MPF.ExecutionContexts/BaseExecutionContext.cs index 3c8f483f..40f56c84 100644 --- a/MPF.ExecutionContexts/BaseExecutionContext.cs +++ b/MPF.ExecutionContexts/BaseExecutionContext.cs @@ -315,14 +315,6 @@ namespace MPF.ExecutionContexts return supported.Contains(flag); } - /// - /// Returns whether a string is a valid drive letter - /// - /// String value to check - /// True if it's a valid drive letter, false otherwise - protected static bool IsValidDriveLetter(string parameter) - => Regex.IsMatch(parameter, @"^[A-Z]:?\\?$"); - /// /// Returns whether a string is a valid bool /// diff --git a/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs b/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs index 8ffebdc0..01d1e746 100644 --- a/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs +++ b/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs @@ -1074,10 +1074,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 6) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1106,10 +1104,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1128,10 +1124,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count != 2) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; break; @@ -1139,10 +1133,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1161,10 +1153,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 6) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1193,10 +1183,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1215,10 +1203,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count != 3) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1231,21 +1217,16 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count != 2) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; - + // Blindly assume the path exists + DrivePath = parts[1]; break; case CommandStrings.Eject: if (parts.Count != 2) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; break; @@ -1253,10 +1234,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count != 3) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1269,10 +1248,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1318,10 +1295,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count != 2) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; break; @@ -1329,10 +1304,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1351,10 +1324,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count != 2) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; break; @@ -1362,10 +1333,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count != 2) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; break; @@ -1384,10 +1353,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1423,10 +1390,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false; @@ -1447,10 +1412,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator if (parts.Count < 4) return false; - if (!IsValidDriveLetter(parts[1])) - return false; - else - DrivePath = parts[1]; + // Blindly assume the path exists + DrivePath = parts[1]; if (IsFlagSupported(parts[2])) return false;