2009-04-19 18:07:22 +00:00
|
|
|
|
|
|
|
#region ================== Copyright (c) 2007 Pascal vd Heiden
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
|
|
|
|
* This program is released under GNU General Public License
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region ================== Namespaces
|
|
|
|
|
|
|
|
using System;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.IO;
|
|
|
|
using CodeImp.DoomBuilder.IO;
|
2013-04-11 11:04:16 +00:00
|
|
|
using SharpCompress.Archive; //mxd
|
|
|
|
using SharpCompress.Common; //mxd
|
|
|
|
using SharpCompress.Reader; //mxd
|
2009-04-19 18:07:22 +00:00
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
namespace CodeImp.DoomBuilder.Data
|
|
|
|
{
|
|
|
|
internal sealed class PK3Reader : PK3StructuredReader
|
|
|
|
{
|
|
|
|
#region ================== Variables
|
|
|
|
|
|
|
|
private DirectoryFilesList files;
|
2013-09-11 09:47:53 +00:00
|
|
|
private ArchiveType archiveType; //mxd
|
|
|
|
private static Dictionary<string, byte[]> sevenZipEntries; //mxd
|
2009-04-19 18:07:22 +00:00
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region ================== Constructor / Disposer
|
|
|
|
|
|
|
|
// Constructor
|
|
|
|
public PK3Reader(DataLocation dl) : base(dl)
|
|
|
|
{
|
2013-09-11 09:47:53 +00:00
|
|
|
General.WriteLogLine("Opening " + Path.GetExtension(location.location).ToUpper().Replace(".", "") + " resource '" + location.location + "'");
|
2010-10-03 16:54:38 +00:00
|
|
|
|
|
|
|
if(!File.Exists(location.location))
|
|
|
|
throw new FileNotFoundException("Could not find the file \"" + location.location + "\"", location.location);
|
2009-04-19 18:07:22 +00:00
|
|
|
|
2013-09-11 09:47:53 +00:00
|
|
|
// Make list of all files
|
|
|
|
List<DirectoryFileEntry> fileentries = new List<DirectoryFileEntry>();
|
|
|
|
|
|
|
|
//mxd
|
|
|
|
IArchive archive = ArchiveFactory.Open(location.location);
|
|
|
|
archiveType = archive.Type;
|
|
|
|
|
|
|
|
if (archive.Type == ArchiveType.SevenZip) { //random access of 7z archives works TERRIBLY slow in SharpCompress
|
2014-02-26 14:11:06 +00:00
|
|
|
sevenZipEntries = new Dictionary<string, byte[]>(StringComparer.Ordinal);
|
2013-09-11 09:47:53 +00:00
|
|
|
|
|
|
|
IReader reader = archive.ExtractAllEntries();
|
|
|
|
while (reader.MoveToNextEntry()) {
|
|
|
|
if (!reader.Entry.IsDirectory) {
|
|
|
|
MemoryStream s = new MemoryStream();
|
|
|
|
reader.WriteEntryTo(s);
|
|
|
|
sevenZipEntries.Add(reader.Entry.FilePath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), s.ToArray());
|
|
|
|
fileentries.Add(new DirectoryFileEntry(reader.Entry.FilePath));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//archive.Dispose();
|
|
|
|
//archive = null;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
foreach (IEntry entry in archive.Entries) {
|
|
|
|
if (!entry.IsDirectory)
|
|
|
|
fileentries.Add(new DirectoryFileEntry(entry.FilePath));
|
|
|
|
}
|
|
|
|
}
|
2012-07-23 21:28:23 +00:00
|
|
|
|
2012-08-14 12:47:27 +00:00
|
|
|
archive.Dispose();
|
|
|
|
archive = null;
|
|
|
|
|
2013-09-11 09:47:53 +00:00
|
|
|
// Make files list
|
|
|
|
files = new DirectoryFilesList(fileentries);
|
2009-04-19 18:07:22 +00:00
|
|
|
|
|
|
|
// Initialize without path (because we use paths relative to the PK3 file)
|
|
|
|
Initialize();
|
|
|
|
|
|
|
|
// We have no destructor
|
|
|
|
GC.SuppressFinalize(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Disposer
|
|
|
|
public override void Dispose()
|
|
|
|
{
|
|
|
|
// Not already disposed?
|
|
|
|
if(!isdisposed)
|
|
|
|
{
|
2013-09-11 09:47:53 +00:00
|
|
|
General.WriteLogLine("Closing " + Path.GetExtension(location.location).ToUpper().Replace(".", "") + " resource '" + location.location + "'");
|
|
|
|
//if(archive != null) archive.Dispose(); //mxd
|
2012-07-23 21:28:23 +00:00
|
|
|
|
2009-04-19 18:07:22 +00:00
|
|
|
// Done
|
|
|
|
base.Dispose();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region ================== Textures
|
|
|
|
|
|
|
|
// This finds and returns a patch stream
|
|
|
|
public override Stream GetPatchData(string pname)
|
|
|
|
{
|
|
|
|
// Error when suspended
|
|
|
|
if(issuspended) throw new Exception("Data reader is suspended");
|
|
|
|
|
|
|
|
// Find in any of the wad files
|
|
|
|
// Note the backward order, because the last wad's images have priority
|
|
|
|
for(int i = wads.Count - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
Stream data = wads[i].GetPatchData(pname);
|
|
|
|
if(data != null) return data;
|
|
|
|
}
|
|
|
|
|
2014-10-07 08:56:21 +00:00
|
|
|
if (General.Map.Config.MixTexturesFlats)
|
Textures Browser form: empty texture sets are no longer shown when mixed textures & flats is disabled in the current game configuration.
Textures Browser form: PK3/Directory TEXTURES images are now shown in a separate folder in the resources tree.
Fixed, Textures Browser form: fixed a logic error when trying to select initial flat when mix textures & flats was disabled in the current game configuration (this resulted in the blank textures list after opening the form).
Fixed, Textures Browser form: resources tree showed textures count even when browsing flats.
Fixed, Textures Browser form: PK3/Directory textures took precedence even when browsing flats (this means when there were a flat and a texture with the same name, a texture was displayed when browsing flats).
Fixed, Classic modes: actor's scale set in DECORATE was ignored when rendering models.
Fixed, MODELDEF parser: in some cases, several model definitions were skipped when trying to skip the current one.
Fixed, resource management: flat and sprite TEXTURES definitions were loaded only from TEXTURES files named "TEXTURES".
Fixed/added, PK3/folder resource management: patch locations for sprites defined in TEXTURES are now checked the same way as in ZDoom (previously only the "sprites" folder was checked).
Fixed/added, PK3/folder resource management: patch locations for textures defined in TEXTURES are now checked the same way as in ZDoom (previously only the "textures" folder was checked).
Fixed, PK3/folder resource management: flats defined in TEXTURES were not added to the global Flats image list.
Fixed, PK3/folder resource management: in some cases, the image search algorithm could find flats, textures, patches or sprites in incorrect folders (for example, it could find a flat in "flats_backup" folder).
2014-10-07 00:23:02 +00:00
|
|
|
{
|
2014-10-07 08:56:21 +00:00
|
|
|
//mxd. Find in directories ZDoom expects them to be
|
|
|
|
foreach (string loc in PatchLocations)
|
|
|
|
{
|
|
|
|
string filename = FindFirstFile(loc, pname, true);
|
|
|
|
if ((filename != null) && FileExists(filename))
|
|
|
|
return LoadFile(filename);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Find in patches directory
|
|
|
|
string filename = FindFirstFile(PATCHES_DIR, pname, true);
|
2013-07-29 08:50:50 +00:00
|
|
|
if((filename != null) && FileExists(filename))
|
|
|
|
return LoadFile(filename);
|
2009-04-19 18:07:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing found
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This finds and returns a textue stream
|
|
|
|
public override Stream GetTextureData(string pname)
|
|
|
|
{
|
|
|
|
// Error when suspended
|
|
|
|
if(issuspended) throw new Exception("Data reader is suspended");
|
|
|
|
|
|
|
|
// Find in any of the wad files
|
|
|
|
// Note the backward order, because the last wad's images have priority
|
|
|
|
for(int i = wads.Count - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
Stream data = wads[i].GetTextureData(pname);
|
|
|
|
if(data != null) return data;
|
|
|
|
}
|
|
|
|
|
2014-10-07 08:56:21 +00:00
|
|
|
if(General.Map.Config.MixTexturesFlats)
|
|
|
|
{
|
|
|
|
//mxd. Find in directories ZDoom expects them to be
|
|
|
|
foreach(string loc in TextureLocations)
|
|
|
|
{
|
|
|
|
string filename = FindFirstFile(loc, pname, true);
|
|
|
|
if(!string.IsNullOrEmpty(filename) && FileExists(filename))
|
|
|
|
return LoadFile(filename);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2009-04-19 18:07:22 +00:00
|
|
|
{
|
2014-10-07 08:56:21 +00:00
|
|
|
// Find in textures directory
|
|
|
|
string filename = FindFirstFile(TEXTURES_DIR, pname, true);
|
Textures Browser form: empty texture sets are no longer shown when mixed textures & flats is disabled in the current game configuration.
Textures Browser form: PK3/Directory TEXTURES images are now shown in a separate folder in the resources tree.
Fixed, Textures Browser form: fixed a logic error when trying to select initial flat when mix textures & flats was disabled in the current game configuration (this resulted in the blank textures list after opening the form).
Fixed, Textures Browser form: resources tree showed textures count even when browsing flats.
Fixed, Textures Browser form: PK3/Directory textures took precedence even when browsing flats (this means when there were a flat and a texture with the same name, a texture was displayed when browsing flats).
Fixed, Classic modes: actor's scale set in DECORATE was ignored when rendering models.
Fixed, MODELDEF parser: in some cases, several model definitions were skipped when trying to skip the current one.
Fixed, resource management: flat and sprite TEXTURES definitions were loaded only from TEXTURES files named "TEXTURES".
Fixed/added, PK3/folder resource management: patch locations for sprites defined in TEXTURES are now checked the same way as in ZDoom (previously only the "sprites" folder was checked).
Fixed/added, PK3/folder resource management: patch locations for textures defined in TEXTURES are now checked the same way as in ZDoom (previously only the "textures" folder was checked).
Fixed, PK3/folder resource management: flats defined in TEXTURES were not added to the global Flats image list.
Fixed, PK3/folder resource management: in some cases, the image search algorithm could find flats, textures, patches or sprites in incorrect folders (for example, it could find a flat in "flats_backup" folder).
2014-10-07 00:23:02 +00:00
|
|
|
if(!string.IsNullOrEmpty(filename) && FileExists(filename))
|
|
|
|
return LoadFile(filename);
|
2009-04-19 18:07:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing found
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2009-05-12 09:50:08 +00:00
|
|
|
// This finds and returns a colormap stream
|
|
|
|
public override Stream GetColormapData(string pname)
|
|
|
|
{
|
|
|
|
// Error when suspended
|
|
|
|
if(issuspended) throw new Exception("Data reader is suspended");
|
|
|
|
|
|
|
|
// Find in any of the wad files
|
|
|
|
// Note the backward order, because the last wad's images have priority
|
|
|
|
for(int i = wads.Count - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
Stream data = wads[i].GetColormapData(pname);
|
|
|
|
if(data != null) return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find in patches directory
|
|
|
|
string filename = FindFirstFile(COLORMAPS_DIR, pname, true);
|
|
|
|
if((filename != null) && FileExists(filename))
|
|
|
|
{
|
|
|
|
return LoadFile(filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing found
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2009-04-19 18:07:22 +00:00
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region ================== Sprites
|
|
|
|
|
|
|
|
// This finds and returns a sprite stream
|
|
|
|
public override Stream GetSpriteData(string pname)
|
|
|
|
{
|
|
|
|
string pfilename = pname.Replace('\\', '^');
|
|
|
|
|
|
|
|
// Error when suspended
|
|
|
|
if(issuspended) throw new Exception("Data reader is suspended");
|
|
|
|
|
|
|
|
// Find in any of the wad files
|
|
|
|
for(int i = wads.Count - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
Stream sprite = wads[i].GetSpriteData(pname);
|
|
|
|
if(sprite != null) return sprite;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find in sprites directory
|
|
|
|
string filename = FindFirstFile(SPRITES_DIR, pfilename, true);
|
|
|
|
if((filename != null) && FileExists(filename))
|
|
|
|
{
|
|
|
|
return LoadFile(filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing found
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This checks if the given sprite exists
|
|
|
|
public override bool GetSpriteExists(string pname)
|
|
|
|
{
|
|
|
|
// Error when suspended
|
|
|
|
if(issuspended) throw new Exception("Data reader is suspended");
|
|
|
|
|
2014-01-08 09:46:57 +00:00
|
|
|
string pfilename = pname.Replace('\\', '^');
|
|
|
|
|
2009-04-19 18:07:22 +00:00
|
|
|
// Find in any of the wad files
|
|
|
|
for(int i = wads.Count - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
if(wads[i].GetSpriteExists(pname)) return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find in sprites directory
|
|
|
|
string filename = FindFirstFile(SPRITES_DIR, pfilename, true);
|
|
|
|
if((filename != null) && FileExists(filename))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing found
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-01-03 10:33:45 +00:00
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region ================== Voxels (mxd)
|
|
|
|
|
2014-01-08 09:46:57 +00:00
|
|
|
//mxd. This finds and returns a voxel stream or null if no voxel was found
|
2014-01-03 10:33:45 +00:00
|
|
|
public override Stream GetVoxelData(string name) {
|
|
|
|
// Error when suspended
|
|
|
|
if(issuspended) throw new Exception("Data reader is suspended");
|
|
|
|
|
2014-01-08 09:46:57 +00:00
|
|
|
// Find in any of the wad files
|
|
|
|
for(int i = wads.Count - 1; i >= 0; i--) {
|
|
|
|
Stream voxel = wads[i].GetVoxelData(name);
|
|
|
|
if(voxel != null) return voxel;
|
2014-01-03 10:33:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
string pfilename = name.Replace('\\', '^');
|
|
|
|
|
|
|
|
// Find in sprites directory
|
|
|
|
string filename = FindFirstFile(VOXELS_DIR, pfilename, true);
|
|
|
|
if((filename != null) && FileExists(filename)) {
|
2014-01-08 09:46:57 +00:00
|
|
|
return LoadFile(filename);
|
2014-01-03 10:33:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing found
|
2014-01-08 09:46:57 +00:00
|
|
|
return null;
|
2014-01-03 10:33:45 +00:00
|
|
|
}
|
|
|
|
|
2009-04-19 18:07:22 +00:00
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region ================== Methods
|
|
|
|
|
|
|
|
// Return a short name for this data location
|
|
|
|
public override string GetTitle()
|
|
|
|
{
|
|
|
|
return Path.GetFileName(location.location);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This creates an image
|
2009-05-12 09:50:08 +00:00
|
|
|
protected override ImageData CreateImage(string name, string filename, int imagetype)
|
2009-04-19 18:07:22 +00:00
|
|
|
{
|
2009-05-12 09:50:08 +00:00
|
|
|
switch(imagetype)
|
|
|
|
{
|
|
|
|
case ImageDataFormat.DOOMFLAT:
|
|
|
|
return new PK3FileImage(this, name, filename, true);
|
|
|
|
|
|
|
|
case ImageDataFormat.DOOMPICTURE:
|
|
|
|
return new PK3FileImage(this, name, filename, false);
|
|
|
|
|
|
|
|
case ImageDataFormat.DOOMCOLORMAP:
|
|
|
|
return new ColormapImage(name);
|
|
|
|
|
|
|
|
default:
|
|
|
|
throw new ArgumentException("Invalid image format specified!");
|
|
|
|
}
|
2009-04-19 18:07:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// This returns true if the specified file exists
|
2012-07-23 21:28:23 +00:00
|
|
|
internal override bool FileExists(string filename)
|
2009-04-19 18:07:22 +00:00
|
|
|
{
|
|
|
|
return files.FileExists(filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This returns all files in a given directory
|
|
|
|
protected override string[] GetAllFiles(string path, bool subfolders)
|
|
|
|
{
|
|
|
|
return files.GetAllFiles(path, subfolders).ToArray();
|
|
|
|
}
|
2010-08-13 15:19:51 +00:00
|
|
|
|
|
|
|
// This returns all files in a given directory that have the given title
|
|
|
|
protected override string[] GetAllFilesWithTitle(string path, string title, bool subfolders)
|
|
|
|
{
|
|
|
|
return files.GetAllFilesWithTitle(path, title, subfolders).ToArray();
|
|
|
|
}
|
2012-08-05 19:18:05 +00:00
|
|
|
|
2013-09-11 09:47:53 +00:00
|
|
|
//mxd. This returns all files in a given directory which title starts with given title
|
|
|
|
protected override string[] GetAllFilesWhichTitleStartsWith(string path, string title) {
|
|
|
|
return files.GetAllFilesWhichTitleStartsWith(path, title).ToArray();
|
|
|
|
}
|
2010-08-13 15:19:51 +00:00
|
|
|
|
2009-04-19 18:07:22 +00:00
|
|
|
// This returns all files in a given directory that match the given extension
|
|
|
|
protected override string[] GetFilesWithExt(string path, string extension, bool subfolders)
|
|
|
|
{
|
|
|
|
return files.GetAllFiles(path, extension, subfolders).ToArray();
|
|
|
|
}
|
|
|
|
|
|
|
|
// This finds the first file that has the specific name, regardless of file extension
|
|
|
|
protected override string FindFirstFile(string beginswith, bool subfolders)
|
|
|
|
{
|
|
|
|
return files.GetFirstFile(beginswith, subfolders);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This finds the first file that has the specific name, regardless of file extension
|
|
|
|
protected override string FindFirstFile(string path, string beginswith, bool subfolders)
|
|
|
|
{
|
|
|
|
return files.GetFirstFile(path, beginswith, subfolders);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This finds the first file that has the specific name
|
|
|
|
protected override string FindFirstFileWithExt(string path, string beginswith, bool subfolders)
|
|
|
|
{
|
|
|
|
string title = Path.GetFileNameWithoutExtension(beginswith);
|
|
|
|
string ext = Path.GetExtension(beginswith);
|
|
|
|
if(ext.Length > 1) ext = ext.Substring(1); else ext = "";
|
|
|
|
return files.GetFirstFile(path, title, subfolders, ext);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This loads an entire file in memory and returns the stream
|
|
|
|
// NOTE: Callers are responsible for disposing the stream!
|
2013-09-11 09:47:53 +00:00
|
|
|
internal override MemoryStream LoadFile(string filename)
|
2009-04-19 18:07:22 +00:00
|
|
|
{
|
2013-09-11 09:47:53 +00:00
|
|
|
MemoryStream filedata = null;
|
|
|
|
|
|
|
|
//mxd
|
|
|
|
if (archiveType == ArchiveType.SevenZip) { //this works waaaaaay faster with 7z archive
|
|
|
|
if (sevenZipEntries.ContainsKey(filename))
|
|
|
|
filedata = new MemoryStream(sevenZipEntries[filename]);
|
|
|
|
} else {
|
2012-08-14 12:47:27 +00:00
|
|
|
IArchive archive = ArchiveFactory.Open(location.location);
|
|
|
|
|
2013-09-11 09:47:53 +00:00
|
|
|
foreach (var entry in archive.Entries) {
|
|
|
|
if (!entry.IsDirectory) {
|
|
|
|
// Is this the entry we are looking for?
|
|
|
|
string entryname = entry.FilePath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
|
|
|
|
if (string.Compare(entryname, filename, true) == 0) {
|
|
|
|
filedata = new MemoryStream();
|
|
|
|
entry.WriteTo(filedata);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-04-19 18:07:22 +00:00
|
|
|
|
|
|
|
// Nothing found?
|
2013-09-11 09:47:53 +00:00
|
|
|
if (filedata == null){
|
2013-03-18 13:52:27 +00:00
|
|
|
//mxd
|
|
|
|
General.ErrorLogger.Add(ErrorType.Error, "Cannot find the file " + filename + " in archive " + location.location + ".");
|
2013-07-30 09:25:27 +00:00
|
|
|
return new MemoryStream();
|
2009-04-19 18:07:22 +00:00
|
|
|
}
|
2013-03-18 13:52:27 +00:00
|
|
|
|
2013-09-11 09:47:53 +00:00
|
|
|
filedata.Position = 0; //mxd. rewind before use
|
|
|
|
return filedata;
|
2009-04-19 18:07:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// This creates a temp file for the speciied file and return the absolute path to the temp file
|
|
|
|
// NOTE: Callers are responsible for removing the temp file when done!
|
|
|
|
protected override string CreateTempFile(string filename)
|
|
|
|
{
|
|
|
|
// Just copy the file
|
|
|
|
string tempfile = General.MakeTempFilename(General.Map.TempPath, "wad");
|
|
|
|
MemoryStream filedata = LoadFile(filename);
|
|
|
|
File.WriteAllBytes(tempfile, filedata.ToArray());
|
|
|
|
filedata.Dispose();
|
|
|
|
return tempfile;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Public version to load a file
|
|
|
|
internal MemoryStream ExtractFile(string filename)
|
|
|
|
{
|
|
|
|
return LoadFile(filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
}
|
|
|
|
}
|