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

Merge pull request #10490 from penev92/packages

Browse Source 
Some renaming from "folder" to "package"
This commit is contained in:
Paul Chote
2016-01-15 22:40:02 +00:00
parent 8ebee425ab e3f5697f7e
commit 24570f0bdf
14 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/FileSystem/BagFile.cs
View File

@@ -19,7 +19,7 @@ using OpenRA.Primitives;
namespace OpenRA.FileSystem
{
public sealed class BagFile : IFolder
public sealed class BagFile : IPackage
{
static readonly uint[] Nothing = { };

2
OpenRA.Game/FileSystem/BigFile.cs
View File

@@ -15,7 +15,7 @@ using System.Linq;
namespace OpenRA.FileSystem
{
public sealed class BigFile : IFolder
public sealed class BigFile : IPackage
{
public string Name { get; private set; }
public int Priority { get; private set; }

2
OpenRA.Game/FileSystem/D2kSoundResources.cs
View File

@@ -14,7 +14,7 @@ using System.IO;
namespace OpenRA.FileSystem
{
public sealed class D2kSoundResources : IFolder
public sealed class D2kSoundResources : IPackage
{
readonly Stream s;

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

@@ -19,16 +19,16 @@ namespace OpenRA.FileSystem
{
public class FileSystem
{
public readonly List<string> FolderPaths = new List<string>();
public readonly List<IFolder> MountedFolders = new List<IFolder>();
public readonly List<string> PackagePaths = new List<string>();
public readonly List<IPackage> MountedPackages = new List<IPackage>();
static readonly Dictionary<string, Assembly> AssemblyCache = new Dictionary<string, Assembly>();
int order;
Cache<uint, List<IFolder>> crcHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
Cache<uint, List<IFolder>> classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
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>());
public IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
public IPackage 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 IFolder OpenPackage(string filename, string annotation, int order)
public IPackage OpenPackage(string filename, string annotation, int order)
{
if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
{
@@ -81,10 +81,10 @@ namespace OpenRA.FileSystem
return new Folder(filename, order);
}
public void Mount(IFolder mount)
public void Mount(IPackage mount)
{
if (!MountedFolders.Contains(mount))
MountedFolders.Add(mount);
if (!MountedPackages.Contains(mount))
MountedPackages.Add(mount);
}
public void Mount(string name, string annotation = null)
@@ -95,7 +95,7 @@ namespace OpenRA.FileSystem
name = Platform.ResolvePath(name);
FolderPaths.Add(name);
PackagePaths.Add(name);
Action a = () => MountInner(OpenPackage(name, annotation, order++));
if (optional)
@@ -105,42 +105,42 @@ namespace OpenRA.FileSystem
a();
}
void MountInner(IFolder folder)
void MountInner(IPackage package)
{
MountedFolders.Add(folder);
MountedPackages.Add(package);
foreach (var hash in folder.ClassicHashes())
foreach (var hash in package.ClassicHashes())
{
var folderList = classicHashIndex[hash];
if (!folderList.Contains(folder))
folderList.Add(folder);
var packageList = classicHashIndex[hash];
if (!packageList.Contains(package))
packageList.Add(package);
}
foreach (var hash in folder.CrcHashes())
foreach (var hash in package.CrcHashes())
{
var folderList = crcHashIndex[hash];
if (!folderList.Contains(folder))
folderList.Add(folder);
var packageList = crcHashIndex[hash];
if (!packageList.Contains(package))
packageList.Add(package);
}
}
public bool Unmount(IFolder mount)
public bool Unmount(IPackage mount)
{
if (MountedFolders.Contains(mount))
if (MountedPackages.Contains(mount))
mount.Dispose();
return MountedFolders.RemoveAll(f => f == mount) > 0;
return MountedPackages.RemoveAll(f => f == mount) > 0;
}
public void UnmountAll()
{
foreach (var folder in MountedFolders)
folder.Dispose();
foreach (var package in MountedPackages)
package.Dispose();
MountedFolders.Clear();
FolderPaths.Clear();
classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
crcHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
MountedPackages.Clear();
PackagePaths.Clear();
classicHashIndex = new Cache<uint, List<IPackage>>(_ => new List<IPackage>());
crcHashIndex = new Cache<uint, List<IPackage>>(_ => new List<IPackage>());
}
public void LoadFromManifest(Manifest manifest)
@@ -156,12 +156,12 @@ namespace OpenRA.FileSystem
Stream GetFromCache(PackageHashType type, string filename)
{
var index = type == PackageHashType.CRC32 ? crcHashIndex : classicHashIndex;
var folder = index[PackageEntry.HashFilename(filename, type)]
var package = index[PackageEntry.HashFilename(filename, type)]
.Where(x => x.Exists(filename))
.MinByOrDefault(x => x.Priority);
if (folder != null)
return folder.GetContent(filename);
if (package != null)
return package.GetContent(filename);
return null;
}
@@ -178,20 +178,20 @@ namespace OpenRA.FileSystem
public bool TryOpen(string name, out Stream s)
{
var filename = name;
var foldername = string.Empty;
var packageName = 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 explicitPackage = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
if (explicitPackage)
{
var divide = name.Split(':');
foldername = divide.First();
packageName = 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)
// Check the cache for a quick lookup if the package name is unknown
// TODO: This disables caching for explicit package requests
if (filename.IndexOfAny(new[] { '/', '\\' }) == -1 && !explicitPackage)
{
s = GetFromCache(PackageHashType.Classic, filename);
if (s != null)
@@ -203,15 +203,15 @@ namespace OpenRA.FileSystem
}
// Ask each package individually
IFolder folder;
if (explicitFolder && !string.IsNullOrEmpty(foldername))
folder = MountedFolders.Where(x => x.Name == foldername).MaxByOrDefault(x => x.Priority);
IPackage package;
if (explicitPackage && !string.IsNullOrEmpty(packageName))
package = MountedPackages.Where(x => x.Name == packageName).MaxByOrDefault(x => x.Priority);
else
folder = MountedFolders.Where(x => x.Exists(filename)).MaxByOrDefault(x => x.Priority);
package = MountedPackages.Where(x => x.Exists(filename)).MaxByOrDefault(x => x.Priority);
if (folder != null)
if (package != null)
{
s = folder.GetContent(filename);
s = package.GetContent(filename);
return true;
}
@@ -221,16 +221,16 @@ namespace OpenRA.FileSystem
public bool Exists(string name)
{
var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
if (explicitFolder)
var explicitPackage = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
if (explicitPackage)
{
var divide = name.Split(':');
var foldername = divide.First();
var packageName = divide.First();
var filename = divide.Last();
return MountedFolders.Where(n => n.Name == foldername).Any(f => f.Exists(filename));
return MountedPackages.Where(n => n.Name == packageName).Any(f => f.Exists(filename));
}
else
return MountedFolders.Any(f => f.Exists(name));
return MountedPackages.Any(f => f.Exists(name));
}
public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)

2
OpenRA.Game/FileSystem/Folder.cs
View File

@@ -13,7 +13,7 @@ using System.IO;
namespace OpenRA.FileSystem
{
public sealed class Folder : IFolder
public sealed class Folder : IPackage
{
readonly string path;
readonly int priority;

2
OpenRA.Game/FileSystem/IFolder.cs → OpenRA.Game/FileSystem/IPackage.cs
View File

@@ -14,7 +14,7 @@ using System.IO;
namespace OpenRA.FileSystem
{
public interface IFolder : IDisposable
public interface IPackage : IDisposable
{
Stream GetContent(string filename);
bool Exists(string filename);

2
OpenRA.Game/FileSystem/InstallShieldCABExtractor.cs
View File

@@ -17,7 +17,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression;
namespace OpenRA.FileSystem
{
public sealed class InstallShieldCABExtractor : IFolder
public sealed class InstallShieldCABExtractor : IPackage
{
const uint FileSplit = 0x1;
const uint FileObfuscated = 0x2;

2
OpenRA.Game/FileSystem/InstallShieldPackage.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.FileFormats;
namespace OpenRA.FileSystem
{
public sealed class InstallShieldPackage : IFolder
public sealed class InstallShieldPackage : IPackage
{
readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
readonly List<string> filenames;

2
OpenRA.Game/FileSystem/MixFile.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Primitives;
namespace OpenRA.FileSystem
{
public sealed class MixFile : IFolder
public sealed class MixFile : IPackage
{
readonly Dictionary<uint, PackageEntry> index;
readonly long dataStart;

2
OpenRA.Game/FileSystem/Pak.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.FileSystem
public string Filename;
}
public sealed class PakFile : IFolder
public sealed class PakFile : IPackage
{
readonly string filename;
readonly int priority;

2
OpenRA.Game/FileSystem/ZipFile.cs
View File

@@ -17,7 +17,7 @@ using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
namespace OpenRA.FileSystem
{
public sealed class ZipFile : IFolder
public sealed class ZipFile : IPackage
{
readonly string filename;
readonly int priority;

2
OpenRA.Game/Map/Map.cs
View File

@@ -157,7 +157,7 @@ namespace OpenRA
[FieldLoader.Ignore] public readonly WVec[] SubCellOffsets;
public readonly SubCell DefaultSubCell;
public readonly SubCell LastSubCell;
[FieldLoader.Ignore] public IFolder Container;
[FieldLoader.Ignore] public IPackage Container;
public string Path { get; private set; }
// Yaml map data

2
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -96,7 +96,7 @@
<Compile Include="CacheStorage.cs" />
<Compile Include="FileFormats\VocLoader.cs" />
<Compile Include="FileSystem\IdxEntry.cs" />
<Compile Include="FileSystem\IFolder.cs" />
<Compile Include="FileSystem\IPackage.cs" />
<Compile Include="LogProxy.cs" />
<Compile Include="FileFormats\IdxReader.cs" />
<Compile Include="FileSystem\BagFile.cs" />

10
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
ScrollPanelWidget assetList;
ScrollItemWidget template;
IFolder assetSource = null;
IPackage assetSource = null;
List<string> availableShps = new List<string>();
bool animateFrames = false;
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.world = world;
panel = widget;
assetSource = Game.ModData.ModFiles.MountedFolders.First();
assetSource = Game.ModData.ModFiles.MountedPackages.First();
var ticker = panel.GetOrNull<LogicTickerWidget>("ANIMATION_TICKER");
if (ticker != null)
@@ -334,7 +334,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
bool ShowSourceDropdown(DropDownButtonWidget dropdown)
{
Func<IFolder, ScrollItemWidget, ScrollItemWidget> setupItem = (source, itemTemplate) =>
Func<IPackage, ScrollItemWidget, ScrollItemWidget> setupItem = (source, itemTemplate) =>
{
var item = ScrollItemWidget.Setup(itemTemplate,
() => assetSource == source,
@@ -344,8 +344,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
};
// TODO: Re-enable "All Packages" once list generation is done in a background thread
// var sources = new[] { (IFolder)null }.Concat(GlobalFileSystem.MountedFolders);
var sources = Game.ModData.ModFiles.MountedFolders;
// var sources = new[] { (IPackage)null }.Concat(GlobalFileSystem.MountedFolders);
var sources = Game.ModData.ModFiles.MountedPackages;
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, sources, setupItem);
return true;
}