Seth/VRCEnhanced
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to queue feature: add from file.

Browse Source
This commit is contained in:
Ryan Sammon
2013-06-14 23:30:33 -04:00
parent 3d9dbb36e7
commit a4f74b72ba
3 changed files with 90 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Vinesauce ROM Corruptor/MainForm.Designer.cs
Generated
+17 -3
View File
@@ -141,6 +141,7 @@ namespace Vinesauce_ROM_Corruptor
this.checkBox_QueueEnable = new System.Windows.Forms.CheckBox();
this.button_QueueManage = new System.Windows.Forms.Button();
this.button_QueueAdd = new System.Windows.Forms.Button();
this.button_QueueAddFromFile = new System.Windows.Forms.Button();
this.groupBox_FileSelection.SuspendLayout();
this.groupBox_EmulatorSelection.SuspendLayout();
this.groupBox_TextReplace.SuspendLayout();
@@ -1161,6 +1162,7 @@ namespace Vinesauce_ROM_Corruptor
//
// groupBox_Queue
//
this.groupBox_Queue.Controls.Add(this.button_QueueAddFromFile);
this.groupBox_Queue.Controls.Add(this.button_QueueHelp);
this.groupBox_Queue.Controls.Add(this.checkBox_QueueEnable);
this.groupBox_Queue.Controls.Add(this.button_QueueManage);
@@ -1176,7 +1178,7 @@ namespace Vinesauce_ROM_Corruptor
// button_QueueHelp
//
this.button_QueueHelp.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button_QueueHelp.Location = new System.Drawing.Point(236, 16);
this.button_QueueHelp.Location = new System.Drawing.Point(293, 16);
this.button_QueueHelp.Name = "button_QueueHelp";
this.button_QueueHelp.Size = new System.Drawing.Size(26, 23);
this.button_QueueHelp.TabIndex = 45;
@@ -1198,7 +1200,7 @@ namespace Vinesauce_ROM_Corruptor
// button_QueueManage
//
this.button_QueueManage.Enabled = false;
this.button_QueueManage.Location = new System.Drawing.Point(155, 16);
this.button_QueueManage.Location = new System.Drawing.Point(212, 16);
this.button_QueueManage.Name = "button_QueueManage";
this.button_QueueManage.Size = new System.Drawing.Size(75, 23);
this.button_QueueManage.TabIndex = 1;
@@ -1211,12 +1213,23 @@ namespace Vinesauce_ROM_Corruptor
this.button_QueueAdd.Enabled = false;
this.button_QueueAdd.Location = new System.Drawing.Point(74, 16);
this.button_QueueAdd.Name = "button_QueueAdd";
this.button_QueueAdd.Size = new System.Drawing.Size(75, 23);
this.button_QueueAdd.Size = new System.Drawing.Size(37, 23);
this.button_QueueAdd.TabIndex = 0;
this.button_QueueAdd.Text = "Add";
this.button_QueueAdd.UseVisualStyleBackColor = true;
this.button_QueueAdd.Click += new System.EventHandler(this.button_QueueAdd_Click);
//
// button_QueueAddFromFile
//
this.button_QueueAddFromFile.Enabled = false;
this.button_QueueAddFromFile.Location = new System.Drawing.Point(117, 16);
this.button_QueueAddFromFile.Name = "button_QueueAddFromFile";
this.button_QueueAddFromFile.Size = new System.Drawing.Size(89, 23);
this.button_QueueAddFromFile.TabIndex = 46;
this.button_QueueAddFromFile.Text = "Add from File";
this.button_QueueAddFromFile.UseVisualStyleBackColor = true;
this.button_QueueAddFromFile.Click += new System.EventHandler(this.button_QueueAddFromFile_Click);
//
// MainForm
//
this.AcceptButton = this.button_Run;
@@ -1359,6 +1372,7 @@ namespace Vinesauce_ROM_Corruptor
private System.Windows.Forms.CheckBox checkBox_QueueEnable;
private System.Windows.Forms.Button button_QueueManage;
private System.Windows.Forms.Button button_QueueAdd;
private System.Windows.Forms.Button button_QueueAddFromFile;
}
}
src/Vinesauce ROM Corruptor/MainForm.cs
+72 -7
View File
@@ -275,12 +275,12 @@ namespace Vinesauce_ROM_Corruptor
{
MessageBox.Show("Previous error encountered corrupting using \"" + Entry[0] + "\" corruption settings in queue.",
"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
StringToCorruptionSettings(Enumerable.Last(QueueForm.CorruptionQueue)[1]);
StringToCorruptionSettings(QueueForm.CorruptionQueue[QueueForm.CorruptionQueue.Count - 1][1]);
QueueForm.CorruptionQueue.RemoveAt(QueueForm.CorruptionQueue.Count - 1);
return;
}
}
StringToCorruptionSettings(Enumerable.Last(QueueForm.CorruptionQueue)[1]);
StringToCorruptionSettings(QueueForm.CorruptionQueue[QueueForm.CorruptionQueue.Count - 1][1]);
QueueForm.CorruptionQueue.RemoveAt(QueueForm.CorruptionQueue.Count - 1);
}
else
@@ -914,7 +914,8 @@ namespace Vinesauce_ROM_Corruptor
// Load the settings.
StringToFileSettings(text);
StringToCorruptionSettings(text);
StringToQueueSettings(text);
QueueForm.CorruptionQueue.Clear();
StringToQueueSettings(text, "");
EnforceAutoEnd();
}
catch
@@ -940,7 +941,8 @@ namespace Vinesauce_ROM_Corruptor
string text = File.ReadAllText(fDialog.FileName);
StringToFileSettings(text);
StringToCorruptionSettings(text);
StringToQueueSettings(text);
QueueForm.CorruptionQueue.Clear();
StringToQueueSettings(text, "");
EnforceAutoEnd();
}
catch
@@ -1322,7 +1324,7 @@ namespace Vinesauce_ROM_Corruptor
}
}
public void StringToQueueSettings(string text)
public void StringToQueueSettings(string text, string filename)
{
Match m = Regex.Match(text, "(?<=checkBox_QueueEnable\\.Checked=).*?(?=\r)");
if (m.Success)
@@ -1337,7 +1339,6 @@ namespace Vinesauce_ROM_Corruptor
}
}
QueueForm.CorruptionQueue.Clear();
MatchCollection entries = Regex.Matches(text, "(?<=Queue_Entry_Start\r\n).*?(?=Queue_Entry_End\r\n)", RegexOptions.Singleline);
foreach (Match entry in entries)
{
@@ -1349,7 +1350,15 @@ namespace Vinesauce_ROM_Corruptor
{
id = m.Groups[0].Value;
}
QueueForm.CorruptionQueue.Add(new string[] { id, entry.Groups[0].Value });
if (filename == "")
{
QueueForm.CorruptionQueue.Add(new string[] { id, entry.Groups[0].Value });
}
else
{
QueueForm.CorruptionQueue.Add(new string[] { filename + ":" + id, entry.Groups[0].Value });
}
}
}
}
@@ -1512,6 +1521,7 @@ namespace Vinesauce_ROM_Corruptor
button_Run.Focus();
MessageBox.Show("Checking this box enables queue mode, which allows for multiple corruptions to be executed on the file sequentially. This allows corruption of multiple byte ranges among other things. "
+ "When the \"Add\" button is clicked, the current corruption settings will be saved to the queue and you will be asked for an identifier for these settings. "
+ "When the \"Add from File\" button is clicked, you will be asked to select a file containing corruption settings. All sets of corruption settings in this file will be added to the queue. "
+ "When the \"Manage\" button is clicked a new window will appear which will allow you to move corruption settings up and down in the queue, remove corruption settings from the queue, "
+ "or overwrite the current settings with a set of queued settings. The corruption settings at the top of the queue list will be executed first, and the current corruption settings will be executed last. "
+ "For example, one item in the queue means the ROM is corrupted twice, first using the queued settings and then using the current settings."
@@ -1533,6 +1543,7 @@ namespace Vinesauce_ROM_Corruptor
private void checkBox_QueueEnable_CheckedChanged(object sender, EventArgs e)
{
button_QueueAdd.Enabled = checkBox_QueueEnable.Checked;
button_QueueAddFromFile.Enabled = checkBox_QueueEnable.Checked;
button_QueueManage.Enabled = checkBox_QueueEnable.Checked;
}
@@ -1649,5 +1660,59 @@ namespace Vinesauce_ROM_Corruptor
return ROM;
}
private void button_QueueAddFromFile_Click(object sender, EventArgs e)
{
OpenFileDialog fDialog = new OpenFileDialog();
fDialog.Title = "Select Corruption Settings to Add to Queue";
fDialog.Filter = "Text Documents (*.txt)|*.txt";
fDialog.CheckFileExists = true;
fDialog.CheckPathExists = true;
fDialog.InitialDirectory = SettingSaveDirectory;
if (fDialog.ShowDialog() == DialogResult.OK)
{
try
{
// Load the text from the file.
string text = File.ReadAllText(fDialog.FileName);
// Get the file name.
string filename = Path.GetFileNameWithoutExtension(fDialog.FileName);
// Read in the queue entries.
StringToQueueSettings(text, filename);
// Save the current settings to the queue.
QueueForm.CorruptionQueue.Add(new string[] { "Current", CorruptionSettingsToString() });
// Read in the main settings.
StringToCorruptionSettings(text);
// Save the main settings to the queue.
QueueForm.CorruptionQueue.Add(new string[] { filename, CorruptionSettingsToString() });
// Restore the current settings.
StringToCorruptionSettings(QueueForm.CorruptionQueue[QueueForm.CorruptionQueue.Count - 2][1]);
// Remove the current settings from the queue.
QueueForm.CorruptionQueue.RemoveAt(QueueForm.CorruptionQueue.Count - 2);
}
catch
{
MessageBox.Show("Error loading corruption settings.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
try
{
SettingSaveDirectory = Path.GetDirectoryName(fDialog.FileName);
}
catch
{
SettingSaveDirectory = "";
}
}
}
}
}
src/Vinesauce ROM Corruptor/QueueForm.Designer.cs
Generated
+1
View File
@@ -146,6 +146,7 @@ namespace Vinesauce_ROM_Corruptor
this.Controls.Add(this.button_Down);
this.Controls.Add(this.button_Up);
this.Controls.Add(this.listView_Queue);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "QueueForm";
this.Text = "Manage Queue";