Added option when extracting an archive to create a file with the arc…

…hive's file structure (addresses #19). Replaced Append file number option with prepend file number.
nickworonekin · Mar 20, 2020 · 120faba · 120faba
1 parent 6be85dc
commit 120faba
Show file tree

Hide file tree

Showing 28 changed files with 228 additions and 89 deletions.
diff --git a/PuyoTools.Modules/Archive/WriterSettings/AcxWriterSettings.resx b/PuyoTools.Modules/Archive/WriterSettings/AcxWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Archive/WriterSettings/AfsWriterSettings.resx b/PuyoTools.Modules/Archive/WriterSettings/AfsWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Archive/WriterSettings/PvmWriterSettings.resx b/PuyoTools.Modules/Archive/WriterSettings/PvmWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Archive/WriterSettings/SntWriterSettings.resx b/PuyoTools.Modules/Archive/WriterSettings/SntWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Core/ModuleSettingsControl.resx b/PuyoTools.Modules/Core/ModuleSettingsControl.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Texture/WriterSettings/GimWriterSettings.resx b/PuyoTools.Modules/Texture/WriterSettings/GimWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Texture/WriterSettings/GvrWriterSettings.resx b/PuyoTools.Modules/Texture/WriterSettings/GvrWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Texture/WriterSettings/PvrWriterSettings.resx b/PuyoTools.Modules/Texture/WriterSettings/PvrWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools.Modules/Texture/WriterSettings/SvrWriterSettings.resx b/PuyoTools.Modules/Texture/WriterSettings/SvrWriterSettings.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/PuyoTools/BitmapResources.Designer.cs b/PuyoTools/BitmapResources.Designer.cs
diff --git a/PuyoTools/BitmapResources.resx b/PuyoTools/BitmapResources.resx
@@ -125,9 +125,9 @@
     <value>Resources\CheckeredBackgroundDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CheckeredBackgroundLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\CheckeredBackgroundLight.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Resources\CheckeredBackgroundLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\Logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Resources\Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/PuyoTools/GUI/AboutPuyoTools.Designer.cs b/PuyoTools/GUI/AboutPuyoTools.Designer.cs
diff --git a/PuyoTools/GUI/ArchiveCreator.Designer.cs b/PuyoTools/GUI/ArchiveCreator.Designer.cs
diff --git a/PuyoTools/GUI/ArchiveCreator.cs b/PuyoTools/GUI/ArchiveCreator.cs
@@ -12,6 +12,7 @@
 using PuyoTools.Modules.Compression;
 
 using Ookii.Dialogs;
+using System.Linq;
 
 namespace PuyoTools.GUI
 {
@@ -29,6 +30,10 @@ public ArchiveCreator()
             addFilesButton.Click -= base.addFilesButton_Click;
             addDirectoryButton.Click -= base.addDirectoryButton_Click;
 
+            // Enable the "Add from entries.txt" button
+            addFromEntriesButton.Visible = true;
+            addFromEntriesButton.Click += addFromEntriesButton_Click;
+
             // Make the list view rows bigger
             ImageList imageList = new ImageList();
             imageList.ImageSize = new Size(1, 20);
@@ -247,6 +252,23 @@ private void listView_ClientSizeChanged(object sender, EventArgs e)
             }
         }
 
+        private void addFromEntriesButton_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog();
+            ofd.Filter = "entries.txt|entries.txt|All Files (*.*)|*.*";
+            ofd.Multiselect = true;
+            ofd.Title = "Add Files";
+
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                string directory = Path.GetDirectoryName(ofd.FileName);
+
+                AddFiles(File.ReadLines(ofd.FileName).Select(x => Path.Combine(directory, x)));
+
+                EnableRunButton();
+            }
+        }
+
         private void archiveFormatBox_SelectedIndexChanged(object sender, EventArgs e)
         {
             archiveSettingsPanel.Controls.Clear();