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

allow to specify the folder directly in the virtual file system

Browse Source 
using folder:file syntax
This commit is contained in:
Matthias Mailänder
2015-07-26 17:26:03 +02:00
parent fb5db60d9d
commit 245d7904fe
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenRA.Game/FileSystem/GlobalFileSystem.cs
View File

@@ -185,10 +185,23 @@ namespace OpenRA.FileSystem
return s; return s;
} }
public static bool TryOpen(string filename, out Stream s) public static bool TryOpen(string name, out Stream s)
{ {
// Check the cache for a quick lookup var filename = name;
if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1) var foldername = string.Empty;
// Used for faction specific packages; rule out false positive on Windows C:\ drive notation
var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
if (explicitFolder)
{
var divide = name.Split(':');
foldername = divide.First();
filename = divide.Last();
}
// Check the cache for a quick lookup if the folder name is unknown
// TODO: This disables caching for explicit folder requests
if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1 && !explicitFolder)
{ {
s = GetFromCache(PackageHashType.Classic, filename); s = GetFromCache(PackageHashType.Classic, filename);
if (s != null) if (s != null)
@@ -200,9 +213,11 @@ namespace OpenRA.FileSystem
} }
// Ask each package individually // Ask each package individually
var folder = MountedFolders IFolder folder;
.Where(x => x.Exists(filename)) if (explicitFolder && !string.IsNullOrEmpty(foldername))
.MaxByOrDefault(x => x.Priority); folder = MountedFolders.Where(x => x.Name == foldername).MaxByOrDefault(x => x.Priority);
else
folder = MountedFolders.Where(x => x.Exists(filename)).MaxByOrDefault(x => x.Priority);
if (folder != null) if (folder != null)
{ {
@@ -214,7 +229,19 @@ namespace OpenRA.FileSystem
return false; return false;
} }
public static bool Exists(string filename) { return MountedFolders.Any(f => f.Exists(filename)); } public static bool Exists(string name)
{
var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
if (explicitFolder)
{
var divide = name.Split(':');
var foldername = divide.First();
var filename = divide.Last();
return MountedFolders.Where(n => n.Name == foldername).Any(f => f.Exists(filename));
}
else
return MountedFolders.Any(f => f.Exists(name));
}
static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>(); static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();