epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Platform.IsPathRelativeToSupportDirectory.

Browse Source
This commit is contained in:
Paul Chote
2020-11-20 17:56:47 +00:00
committed by abcdefg30
parent 888915b53b
commit 151cea96e9
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Map/MapCache.cs
View File

@@ -72,13 +72,10 @@ namespace OpenRA
try try
{ {
// HACK: If the path is inside the the support directory then we may need to create it // HACK: If the path is inside the the support directory then we may need to create it
if (Platform.IsPathRelativeToSupportDirectory(name)) // Assume that the path is a directory if there is not an existing file with the same name
{ var resolved = Platform.ResolvePath(name);
// Assume that the path is a directory if there is not an existing file with the same name if (resolved.StartsWith(Platform.SupportDir) && !File.Exists(resolved))
var resolved = Platform.ResolvePath(name); Directory.CreateDirectory(resolved);
if (!File.Exists(resolved))
Directory.CreateDirectory(resolved);
}
package = modData.ModFiles.OpenPackage(name); package = modData.ModFiles.OpenPackage(name);
} }
@@ -144,12 +141,9 @@ namespace OpenRA
name = name.Substring(1); name = name.Substring(1);
// Don't try to open the map directory in the support directory if it doesn't exist // Don't try to open the map directory in the support directory if it doesn't exist
if (Platform.IsPathRelativeToSupportDirectory(name)) var resolved = Platform.ResolvePath(name);
{ if (resolved.StartsWith(Platform.SupportDir) && (!Directory.Exists(resolved) || !File.Exists(resolved)))
var resolved = Platform.ResolvePath(name); continue;
if (!Directory.Exists(resolved) || !File.Exists(resolved))
continue;
}
using (var package = (IReadWritePackage)modData.ModFiles.OpenPackage(name)) using (var package = (IReadWritePackage)modData.ModFiles.OpenPackage(name))
{ {

10
OpenRA.Game/Platform.cs
View File

@@ -22,7 +22,6 @@ namespace OpenRA
public static class Platform public static class Platform
{ {
public const string SupportDirPrefix = "^";
public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } } public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } }
public static readonly Guid SessionGUID = Guid.NewGuid(); public static readonly Guid SessionGUID = Guid.NewGuid();
@@ -190,7 +189,7 @@ namespace OpenRA
path = path.TrimEnd(' ', '\t'); path = path.TrimEnd(' ', '\t');
// Paths starting with ^ are relative to the support dir // Paths starting with ^ are relative to the support dir
if (IsPathRelativeToSupportDirectory(path)) if (path.StartsWith("^", StringComparison.Ordinal))
path = SupportDir + path.Substring(1); path = SupportDir + path.Substring(1);
// Paths starting with . are relative to the game dir // Paths starting with . are relative to the game dir
@@ -213,7 +212,7 @@ namespace OpenRA
// with inconsistent drive letter case // with inconsistent drive letter case
var compare = CurrentPlatform == PlatformType.Windows ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal; var compare = CurrentPlatform == PlatformType.Windows ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
if (path.StartsWith(SupportDir, compare)) if (path.StartsWith(SupportDir, compare))
path = SupportDirPrefix + path.Substring(SupportDir.Length); path = "^" + path.Substring(SupportDir.Length);
if (path.StartsWith(GameDir, compare)) if (path.StartsWith(GameDir, compare))
path = "./" + path.Substring(GameDir.Length); path = "./" + path.Substring(GameDir.Length);
@@ -223,10 +222,5 @@ namespace OpenRA
return path; return path;
} }
public static bool IsPathRelativeToSupportDirectory(string path)
{
return path.StartsWith(SupportDirPrefix, StringComparison.Ordinal);
}
} }
} }