SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Blindly assume the path exists

Browse Source
This commit is contained in:
Matt Nadareski
2024-06-24 12:17:57 -04:00
parent 7c295ca2f4
commit 69b1d2f7ad
3 changed files with 37 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -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)

8
MPF.ExecutionContexts/BaseExecutionContext.cs
View File

@@ -315,14 +315,6 @@ namespace MPF.ExecutionContexts
return supported.Contains(flag);
}
/// <summary>
/// Returns whether a string is a valid drive letter
/// </summary>
/// <param name="parameter">String value to check</param>
/// <returns>True if it's a valid drive letter, false otherwise</W>
protected static bool IsValidDriveLetter(string parameter)
=> Regex.IsMatch(parameter, @"^[A-Z]:?\\?$");
/// <summary>
/// Returns whether a string is a valid bool
/// </summary>

109
MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs
View File

@@ -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;