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

Split IPackage into IReadOnlyPackage and IReadWritePackage.

Browse Source
This commit is contained in:
Paul Chote
2016-01-15 22:49:12 +00:00
parent 77b0bd6067
commit f8d0b97e8d
13 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenRA.Game/FileSystem/FileSystem.cs
View File

@@ -20,15 +20,15 @@ namespace OpenRA.FileSystem
public class FileSystem
{
public readonly List<string> PackagePaths = new List<string>();
public readonly List<IPackage> MountedPackages = new List<IPackage>();
public readonly List<IReadOnlyPackage> MountedPackages = new List<IReadOnlyPackage>();
static readonly Dictionary<string, Assembly> AssemblyCache = new Dictionary<string, Assembly>();
int order;
Cache<uint, List<IPackage>> crcHashIndex = new Cache<uint, List<IPackage>>(_ => new List<IPackage>());
Cache<uint, List<IPackage>> classicHashIndex = new Cache<uint, List<IPackage>>(_ => new List<IPackage>());
Cache<uint, List<IReadOnlyPackage>> crcHashIndex = new Cache<uint, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
Cache<uint, List<IReadOnlyPackage>> classicHashIndex = new Cache<uint, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
public IPackage CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
public IReadWritePackage CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
{
if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
return new MixFile(this, filename, order, content);
@@ -50,7 +50,7 @@ namespace OpenRA.FileSystem
return new Folder(filename, order, content);
}
public IPackage OpenPackage(string filename, string annotation, int order)
public IReadOnlyPackage OpenPackage(string filename, string annotation, int order)
{
if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
{
@@ -81,7 +81,17 @@ namespace OpenRA.FileSystem
return new Folder(filename, order);
}
public void Mount(IPackage mount)
public IReadWritePackage OpenWritablePackage(string filename, int order)
{
if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
return new ZipFile(this, filename, order);
if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
return new ZipFile(this, filename, order);
return new Folder(filename, order);
}
public void Mount(IReadOnlyPackage mount)
{
if (!MountedPackages.Contains(mount))
MountedPackages.Add(mount);
@@ -105,7 +115,7 @@ namespace OpenRA.FileSystem
a();
}
void MountInner(IPackage package)
void MountInner(IReadOnlyPackage package)
{
MountedPackages.Add(package);
@@ -124,7 +134,7 @@ namespace OpenRA.FileSystem
}
}
public bool Unmount(IPackage mount)
public bool Unmount(IReadOnlyPackage mount)
{
if (MountedPackages.Contains(mount))
mount.Dispose();
@@ -139,8 +149,8 @@ namespace OpenRA.FileSystem
MountedPackages.Clear();
PackagePaths.Clear();
classicHashIndex = new Cache<uint, List<IPackage>>(_ => new List<IPackage>());
crcHashIndex = new Cache<uint, List<IPackage>>(_ => new List<IPackage>());
classicHashIndex = new Cache<uint, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
crcHashIndex = new Cache<uint, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
}
public void LoadFromManifest(Manifest manifest)
@@ -203,7 +213,7 @@ namespace OpenRA.FileSystem
}
// Ask each package individually
IPackage package;
IReadOnlyPackage package;
if (explicitPackage && !string.IsNullOrEmpty(packageName))
package = MountedPackages.Where(x => x.Name == packageName).MaxByOrDefault(x => x.Priority);
else