stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 14:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: lump saving in script editor after editing archive with SLADE.\n Fixed: checking for concurrent modification in script editor while trying to save the lump.

Browse source
This commit is contained in:
ZZYZX 2017-01-21 03:13:36 +02:00
parent a705e47fb9
commit a5a942c798
8 changed files with 164 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
Source/Core/Controls/Scripting/ScriptResourceDocumentTab.cs
View file

@ -98,33 +98,43 @@ namespace CodeImp.DoomBuilder.Controls
// Find lump, check it's hash
bool dosave = true;
DataReader reader = source.Resource;
if(reader.FileExists(source.Filename, source.LumpIndex))
{
using(MemoryStream ms = reader.LoadFile(source.Filename, source.LumpIndex))
{
if(MD5Hash.Get(ms) != hash
&& MessageBox.Show("Target lump was modified by another application. Do you still want to replace it?", "Warning", MessageBoxButtons.OKCancel)
== DialogResult.Cancel)
{
dosave = false;
}
}
}
// reload the reader
bool wasReadOnly = reader.IsReadOnly;
reader.Reload(false);
try
{
if (reader.FileExists(source.Filename, source.LumpIndex))
{
using (MemoryStream ms = reader.LoadFile(source.Filename, source.LumpIndex))
{
if (MD5Hash.Get(ms) != hash
&& MessageBox.Show("Target lump was modified by another application. Do you still want to replace it?", "Warning", MessageBoxButtons.OKCancel)
== DialogResult.Cancel)
{
dosave = false;
}
}
}
if(dosave)
{
// Store the lump data
using(MemoryStream stream = new MemoryStream(editor.GetText()))
{
if(reader.SaveFile(stream, source.Filename, source.LumpIndex))
{
// Update what must be updated
hash = MD5Hash.Get(stream);
editor.SetSavePoint();
UpdateTitle();
}
}
}
if (dosave)
{
// Store the lump data
using (MemoryStream stream = new MemoryStream(editor.GetText()))
{
if (reader.SaveFile(stream, source.Filename, source.LumpIndex))
{
// Update what must be updated
hash = MD5Hash.Get(stream);
editor.SetSavePoint();
UpdateTitle();
}
}
}
}
finally
{
reader.Reload(wasReadOnly);
}
return dosave;
}

14
Source/Core/Data/DataReader.cs
View file

@ -141,15 +141,27 @@ namespace CodeImp.DoomBuilder.Data
// This suspends use of this resource
public virtual void Suspend()
{
// [ZZ] validate
if (issuspended) throw new Exception("Tried to suspend already suspended resource!");
issuspended = true;
isreadonly = true;
}
// This resumes use of this resource
public virtual void Resume()
{
issuspended = false;
// [ZZ] validate
if (!issuspended) throw new Exception("Tried to resume already resumed resource!");
issuspended = false;
isreadonly = false;
}
// This reloads the resource (possibly as readonly).
public virtual void Reload(bool newreadonly)
{
}
#endregion
#region ================== Palette

132
Source/Core/Data/PK3Reader.cs
View file

@ -35,10 +35,10 @@ namespace CodeImp.DoomBuilder.Data
{
#region ================== Variables
private readonly DirectoryFilesList files;
private /*readonly*/ DirectoryFilesList files;
private IArchive archive; //mxd
private readonly ArchiveType archivetype; //mxd
private readonly Dictionary<string, byte[]> sevenzipentries; //mxd
private /*readonly*/ ArchiveType archivetype; //mxd
private /*readonly*/ Dictionary<string, byte[]> sevenzipentries; //mxd
private bool bathmode = true; //mxd
#endregion
@ -54,58 +54,63 @@ namespace CodeImp.DoomBuilder.Data
// Constructor
public PK3Reader(DataLocation dl, bool asreadonly) : base(dl, asreadonly)
{
General.WriteLogLine("Opening " + Path.GetExtension(location.location).ToUpper().Replace(".", "") + " resource \"" + location.location + "\"");
if(!File.Exists(location.location))
throw new FileNotFoundException("Could not find the file \"" + location.location + "\"", location.location);
// Make list of all files
List<DirectoryFileEntry> fileentries = new List<DirectoryFileEntry>();
// Create archive
archive = ArchiveFactory.Open(location.location, Options.KeepStreamsOpen);
archivetype = archive.Type;
// Random access of 7z archives works TERRIBLY slow in SharpCompress
if(archivetype == ArchiveType.SevenZip)
{
isreadonly = true; // Unsaveable...
sevenzipentries = new Dictionary<string, byte[]>(StringComparer.Ordinal);
IReader reader = archive.ExtractAllEntries();
while(reader.MoveToNextEntry())
{
if(reader.Entry.IsDirectory || !CheckInvalidPathChars(reader.Entry.Key)) continue;
MemoryStream s = new MemoryStream();
reader.WriteEntryTo(s);
sevenzipentries.Add(reader.Entry.Key.ToLowerInvariant(), s.ToArray());
fileentries.Add(new DirectoryFileEntry(reader.Entry.Key));
}
}
else
{
foreach(IArchiveEntry entry in archive.Entries)
{
if(!entry.IsDirectory && CheckInvalidPathChars(entry.Key))
fileentries.Add(new DirectoryFileEntry(entry.Key));
}
}
// Get rid of archive
archive.Dispose();
archive = null;
// Make files list
files = new DirectoryFilesList(dl.GetDisplayName(), fileentries);
// Initialize without path (because we use paths relative to the PK3 file)
Initialize();
// We have no destructor
GC.SuppressFinalize(this);
LoadFrom(dl, asreadonly);
}
private void LoadFrom(DataLocation dl, bool asreadonly)
{
General.WriteLogLine("Opening " + Path.GetExtension(location.location).ToUpper().Replace(".", "") + " resource \"" + location.location + "\"");
if (!File.Exists(location.location))
throw new FileNotFoundException("Could not find the file \"" + location.location + "\"", location.location);
// Make list of all files
List<DirectoryFileEntry> fileentries = new List<DirectoryFileEntry>();
// Create archive
archive = ArchiveFactory.Open(location.location, Options.KeepStreamsOpen);
archivetype = archive.Type;
// Random access of 7z archives works TERRIBLY slow in SharpCompress
if (archivetype == ArchiveType.SevenZip)
{
isreadonly = true; // Unsaveable...
sevenzipentries = new Dictionary<string, byte[]>(StringComparer.Ordinal);
IReader reader = archive.ExtractAllEntries();
while (reader.MoveToNextEntry())
{
if (reader.Entry.IsDirectory || !CheckInvalidPathChars(reader.Entry.Key)) continue;
MemoryStream s = new MemoryStream();
reader.WriteEntryTo(s);
sevenzipentries.Add(reader.Entry.Key.ToLowerInvariant(), s.ToArray());
fileentries.Add(new DirectoryFileEntry(reader.Entry.Key));
}
}
else
{
foreach (IArchiveEntry entry in archive.Entries)
{
if (!entry.IsDirectory && CheckInvalidPathChars(entry.Key))
fileentries.Add(new DirectoryFileEntry(entry.Key));
}
}
// Get rid of archive
archive.Dispose();
archive = null;
// Make files list
files = new DirectoryFilesList(dl.GetDisplayName(), fileentries);
// 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()
{
@ -149,12 +154,25 @@ namespace CodeImp.DoomBuilder.Data
}
}
#endregion
#endregion
#region ================== Textures
#region ================== Management
// This finds and returns a patch stream
public override Stream GetPatchData(string pname, bool longname, ref string patchlocation)
// [ZZ]
// This reloads the resource
public override void Reload(bool newreadonly)
{
if (archive != null)
archive.Dispose();
LoadFrom(location, newreadonly);
}
#endregion
#region ================== Textures
// This finds and returns a patch stream
public override Stream GetPatchData(string pname, bool longname, ref string patchlocation)
{
// Error when suspended
if(issuspended) throw new Exception("Data reader is suspended");

18
Source/Core/Data/PK3StructuredReader.cs
View file

@ -72,8 +72,10 @@ namespace CodeImp.DoomBuilder.Data
// Call this to initialize this class
protected virtual void Initialize()
{
// Load all WAD files in the root as WAD resources
string[] wadfiles = GetWadFiles();
// [ZZ] we can have wad files already. dispose if any.
if (wads != null) foreach (WADReader wr in wads) wr.Dispose();
// Load all WAD files in the root as WAD resources
string[] wadfiles = GetWadFiles();
wads = new List<WADReader>(wadfiles.Length);
foreach(string w in wadfiles)
{
@ -114,13 +116,13 @@ namespace CodeImp.DoomBuilder.Data
foreach(WADReader wr in wads) wr.Resume();
base.Resume();
}
#endregion
#region ================== Palette
// This loads the PLAYPAL palette
public override Playpal LoadPalette()
#endregion
#region ================== Palette
// This loads the PLAYPAL palette
public override Playpal LoadPalette()
{
// Error when suspended
if(issuspended) throw new Exception("Data reader is suspended");

33
Source/Core/Data/WADReader.cs
View file

@ -211,19 +211,28 @@ namespace CodeImp.DoomBuilder.Data
public override void Suspend()
{
file.Dispose();
file = null;
base.Suspend();
}
// This resumes use of this resource
public override void Resume()
{
file = new WAD(location.location, true);
is_iwad = file.IsIWAD;
Reload(true);
base.Resume();
}
// This fills a ranges list
private void FindRanges(List<LumpRange> ranges, IDictionary rangeinfos, string rangename, string elementname)
// This reloads the resource
public override void Reload(bool newreadonly)
{
if (file != null) file.Dispose();
file = new WAD(location.location, newreadonly);
is_iwad = file.IsIWAD;
base.Reload(newreadonly);
}
// This fills a ranges list
private void FindRanges(List<LumpRange> ranges, IDictionary rangeinfos, string rangename, string elementname)
{
Dictionary<LumpRange, KeyValuePair<string, string>> failedranges = new Dictionary<LumpRange, KeyValuePair<string, string>>(); //mxd
Dictionary<int, bool> successfulrangestarts = new Dictionary<int, bool>(); //mxd
@ -1169,16 +1178,16 @@ namespace CodeImp.DoomBuilder.Data
if(isreadonly || lumpindex < 0 || file.Lumps.Count <= lumpindex || file.Lumps[lumpindex].Name != lumpname.ToUpperInvariant())
return false;
// Remove the lump
file.RemoveAt(lumpindex);
// Remove the lump
file.RemoveAt(lumpindex);
// Insert new lump
Lump l = file.Insert(lumpname, lumpindex, (int)lumpdata.Length);
l.Stream.Seek(0, SeekOrigin.Begin);
lumpdata.WriteTo(l.Stream);
// Insert new lump
Lump l = file.Insert(lumpname, lumpindex, (int)lumpdata.Length);
l.Stream.Seek(0, SeekOrigin.Begin);
lumpdata.WriteTo(l.Stream);
// Update WAD file
file.WriteHeaders();
// Update WAD file
file.WriteHeaders();
return true;
}

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2837")]
[assembly: AssemblyVersion("2.3.0.2839")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("30a5edf")]
[assembly: AssemblyHash("a705e47")]

9
Source/Core/Windows/OpenMapOptionsForm.cs
View file

@ -211,9 +211,12 @@ namespace CodeImp.DoomBuilder.Windows
}
}
}
//mxd. Bail out if still no dice...
if(config.SelectedIndex == -1 || mapslist.Items.Count == 0)
// [ZZ] dispose of wadfile
wadfile.Dispose();
//mxd. Bail out if still no dice...
if (config.SelectedIndex == -1 || mapslist.Items.Count == 0)
{
General.ShowWarningMessage("Unable to find maps using any game configuration.\nDoes this wad contain any maps at all?..", MessageBoxButtons.OK);
cancel_Click(this, EventArgs.Empty);

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2837")]
[assembly: AssemblyVersion("2.3.0.2839")]
[assembly: NeutralResourcesLanguageAttribute("en")]