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

remove vestigial crap from FileSystem

Browse Source
This commit is contained in:
Chris Forbes
2010-02-07 17:44:52 +13:00
parent 911fb6aa9b
commit 1d964d9301
4 changed files with 16 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
OpenRa.FileFormats/FileSystem.cs
View File

@@ -9,38 +9,10 @@ namespace OpenRa.FileFormats
public static class FileSystem public static class FileSystem
{ {
static List<IFolder> mountedFolders = new List<IFolder>(); static List<IFolder> mountedFolders = new List<IFolder>();
static List<IFolder> temporaryMounts = new List<IFolder>();
static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() ); static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
static Cache<uint, List<IFolder>> allTemporaryFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
public static void MountDefaultPackages() static void MountInner(IFolder folder)
{
FileSystem.Mount(new Folder("./"));
if( FileSystem.Exists( "main.mix" ) )
FileSystem.Mount( new Package( "main.mix" ) );
FileSystem.Mount( new Package( "redalert.mix" ) );
FileSystem.Mount( new Package( "conquer.mix" ) );
FileSystem.Mount( new Package( "hires.mix" ) );
FileSystem.Mount( new Package( "general.mix" ) );
FileSystem.Mount( new Package( "local.mix" ) );
FileSystem.Mount( new Package( "sounds.mix" ) );
FileSystem.Mount( new Package( "speech.mix" ) );
FileSystem.Mount( new Package( "allies.mix" ) );
FileSystem.Mount( new Package( "russian.mix" ) );
FileSystem.Mount( new Package( "temperat.mix" ) );
FileSystem.Mount( new Package( "snow.mix" ) );
FileSystem.Mount( new Package( "interior.mix" ) );
}
public static void MountAftermathPackages()
{
FileSystem.Mount( new Package( "expand2.mix" ) );
FileSystem.Mount( new Package( "hires1.mix" ) );
}
public static void Mount(IFolder folder)
{ {
mountedFolders.Add(folder); mountedFolders.Add(folder);
@@ -52,28 +24,15 @@ namespace OpenRa.FileFormats
} }
} }
public static void MountTemporary(IFolder folder) public static void Mount(string name)
{
mountedFolders.Add(folder);
temporaryMounts.Add(folder);
foreach( var hash in folder.AllFileHashes() )
{
var l = allTemporaryFiles[hash];
if( !l.Contains( folder ) )
l.Add( folder );
}
}
public static void MountTemporaryEx(string name)
{ {
name = name.ToLowerInvariant(); name = name.ToLowerInvariant();
var optional = name.StartsWith("~"); var optional = name.StartsWith("~");
if (optional) name = name.Substring(1); if (optional) name = name.Substring(1);
var a = name.EndsWith(".mix") var a = name.EndsWith(".mix")
? (Action)(() => FileSystem.MountTemporary(new Package(name))) ? (Action)(() => FileSystem.MountInner(new Package(name)))
: () => FileSystem.MountTemporary(new Folder(name)); : () => FileSystem.MountInner(new Folder(name));
if (optional) if (optional)
try { a(); } try { a(); }
@@ -82,12 +41,10 @@ namespace OpenRa.FileFormats
a(); a();
} }
public static void UnmountTemporaryPackages() public static void UnmountAll()
{ {
mountedFolders.RemoveAll(f => temporaryMounts.Contains(f)); mountedFolders.Clear();
temporaryMounts.Clear(); allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
allTemporaryFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
} }
static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename ) static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
@@ -105,8 +62,7 @@ namespace OpenRa.FileFormats
{ {
if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 ) if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
{ {
var ret = GetFromCache( allFiles, filename ) var ret = GetFromCache( allFiles, filename );
?? GetFromCache( allTemporaryFiles, filename );
if( ret != null ) if( ret != null )
return ret; return ret;
} }
@@ -127,8 +83,7 @@ namespace OpenRa.FileFormats
{ {
foreach( var ext in exts ) foreach( var ext in exts )
{ {
var s = GetFromCache( allFiles, filename + ext ) var s = GetFromCache( allFiles, filename + ext );
?? GetFromCache( allTemporaryFiles, filename + ext );
if( s != null ) if( s != null )
return s; return s;
} }

6
OpenRa.Game/Game.cs
View File

@@ -37,11 +37,11 @@ namespace OpenRa
public static void LoadModPackages(Manifest manifest) public static void LoadModPackages(Manifest manifest)
{ {
FileSystem.UnmountTemporaryPackages(); FileSystem.UnmountAll();
Timer.Time("reset: {0}"); Timer.Time("reset: {0}");
foreach (var dir in manifest.Folders) FileSystem.MountTemporaryEx(dir); foreach (var dir in manifest.Folders) FileSystem.Mount(dir);
foreach (var pkg in manifest.Packages) FileSystem.MountTemporaryEx(pkg); foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
Timer.Time("mount temporary packages: {0}"); Timer.Time("mount temporary packages: {0}");
} }

4
OpenRa.Game/MainWindow.cs
View File

@@ -74,11 +74,11 @@ namespace OpenRa
{ {
Game.Settings = new UserSettings(); Game.Settings = new UserSettings();
var settingsFile = settings.GetValue("settings", "settings.ini"); var settingsFile = settings.GetValue("settings", "settings.ini");
FileSystem.MountTemporary(new Folder("./")); FileSystem.Mount("./");
if (FileSystem.Exists(settingsFile)) if (FileSystem.Exists(settingsFile))
FieldLoader.Load(Game.Settings, FieldLoader.Load(Game.Settings,
new IniFile(FileSystem.Open(settingsFile)).GetSection("Settings")); new IniFile(FileSystem.Open(settingsFile)).GetSection("Settings"));
FileSystem.UnmountTemporaryPackages(); FileSystem.UnmountAll();
} }
internal void Run() internal void Run()

4
SequenceEditor/Program.cs
View File

@@ -79,8 +79,8 @@ namespace SequenceEditor
var mods = args[0].Split(','); var mods = args[0].Split(',');
var manifest = new Manifest(mods); var manifest = new Manifest(mods);
foreach (var folder in manifest.Folders) FileSystem.MountTemporaryEx(folder); foreach (var folder in manifest.Folders) FileSystem.Mount(folder);
foreach (var pkg in manifest.Packages) FileSystem.MountTemporaryEx(pkg); foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
XmlFilename = args[1]; XmlFilename = args[1];
Doc = new XmlDocument(); Doc = new XmlDocument();