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

remove duplication in FileSystem.Open[WithExts]

Browse Source
This commit is contained in:
Chris Forbes
2011-12-09 22:18:28 +13:00
parent 410cad6f1e
commit 1e4f1a9f19
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.FileFormats/Filesystem/FileSystem.cs
View File

@@ -123,25 +123,7 @@ namespace OpenRA.FileFormats
return null; return null;
} }
public static Stream Open(string filename) public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
{
if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
{
var ret = GetFromCache( allFiles, filename );
if( ret != null )
return ret;
}
var folder = mountedFolders
.Where(x => x.Exists(filename))
.OrderByDescending(x => x.Priority)
.FirstOrDefault();
if (folder != null)
return folder.GetContent(filename);
throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
}
public static Stream OpenWithExts( string filename, params string[] exts ) public static Stream OpenWithExts( string filename, params string[] exts )
{ {
@@ -157,9 +139,13 @@ namespace OpenRA.FileFormats
foreach( var ext in exts ) foreach( var ext in exts )
{ {
foreach( IFolder folder in mountedFolders.OrderByDescending(x => x.Priority) ) var folder = mountedFolders
if (folder.Exists(filename + ext)) .Where(x => x.Exists(filename + ext))
return folder.GetContent( filename + ext ); .OrderByDescending(x => x.Priority)
.FirstOrDefault();
if (folder != null)
return folder.GetContent(filename + ext);
} }
throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename ); throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );