cleanup, added drag&drop

GoneUp · Jun 27, 2016 · ff295c8 · ff295c8
1 parent 01f78bc
commit ff295c8
Show file tree

Hide file tree

Showing 44 changed files with 87 additions and 191 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@
 *.gpk
 *.ogg
 
+GPK_RePack/bin/
+GPK_RePack/obj/
+
 #################
 ## Eclipse
 #################
@@ -188,7 +191,6 @@ $RECYCLE.BIN/
 # Mac crap
 .DS_Store
 
-
 #############
 ## Python
 #############
@@ -220,3 +222,4 @@ pip-log.txt
 #Mr Developer
 .mr.developer.cfg
 *.log
+
diff --git a/GPK_RePack.sln b/GPK_RePack.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPK_RePack", "GPK_RePack\GPK_RePack.csproj", "{242D4D28-DE0E-4238-85A4-9B1AE6AD6410}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A2551F8E-23C9-44DF-BBE3-B3AC95D9E226}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/GPK_RePack.sln.DotSettings.user b/GPK_RePack.sln.DotSettings.user
diff --git a/GPK_RePack.v11.suo b/GPK_RePack.v11.suo
diff --git a/GPK_RePack/.gitignore b/GPK_RePack/.gitignore
diff --git a/GPK_RePack/Forms/GUI.Designer.cs b/GPK_RePack/Forms/GUI.Designer.cs
diff --git a/GPK_RePack/Forms/GUI.cs b/GPK_RePack/Forms/GUI.cs
@@ -158,7 +158,16 @@ private void GUI_FormClosing(object sender, FormClosingEventArgs e)
         #region load/save
         private void openToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            String[] files = MiscFuncs.GenerateOpenDialog();
+            String[] files;
+            if (sender is String[])
+            {
+                files = (String[]) sender;
+            }
+            else
+            {
+                files = MiscFuncs.GenerateOpenDialog();
+            }
+
             if (files.Length == 0) return;
 
             DateTime start = DateTime.Now;
@@ -327,6 +336,23 @@ private void DisplayStatus(List<IProgress> list, string tag, DateTime start)
                 lblStatus.Text = "Ready";
             }
         }
+
+        private void treeMain_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Copy;
+        }
+
+        private void treeMain_DragDrop(object sender, DragEventArgs e)
+        {
+            string[] files = (string[]) e.Data.GetData(DataFormats.FileDrop);
+            foreach (string file in files)
+            {
+                logger.Debug("Drop input: " + file);
+            }
+
+            openToolStripMenuItem_Click(files, null);
+        }
+
         #endregion
 
         #region diplaygpk
@@ -1349,6 +1375,8 @@ private GpkArrayProperty checkArrayRow()
 
         #endregion
 
+
+
 
 
 

diff --git a/GPK_RePack/Forms/GUI.resx b/GPK_RePack/Forms/GUI.resx
@@ -161,6 +161,24 @@ Have Fun &amp; Always Backup
   <metadata name="value.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="size.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="aIndex.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="iType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="value.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>132, 17</value>
   </metadata>

diff --git a/GPK_RePack/GPK_RePack.csproj b/GPK_RePack/GPK_RePack.csproj
@@ -34,6 +34,9 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CSharpImageLibrary, Version=3.1.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\CSharpImageLibrary.3.1.6.0\lib\net45\CSharpImageLibrary.exe</HintPath>
@@ -148,6 +151,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.manifest">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>

diff --git a/GPK_RePack/GPK_RePack.csproj.user b/GPK_RePack/GPK_RePack.csproj.user
diff --git a/GPK_RePack/IO/Reader.cs b/GPK_RePack/IO/Reader.cs
@@ -36,6 +36,8 @@ public GpkPackage ReadGpk(string path)
                 logger = LogManager.GetLogger("[Reader:" + package.Filename + "]");
                 logger.Info("Reading Start");
 
+
+
                 using (BinaryReader reader = new BinaryReader(new FileStream(path, FileMode.Open, FileAccess.Read)))
                 {
                     package.OrginalSize = reader.BaseStream.Length;
@@ -46,6 +48,8 @@ public GpkPackage ReadGpk(string path)
                     ReadExports(reader, package);
                     ReadExportData(reader, package);
 
+                    logger.Info(String.Format("Remaining {0}b", reader.BaseStream.Length - reader.BaseStream.Position));
+
                     reader.Close();
                     reader.Dispose();
                 }
@@ -263,7 +267,8 @@ private void ReadExportData(BinaryReader reader, GpkPackage package)
         {
             logger.Debug("Reading ExportsData....");
 
-
+            long maxValue = 0;
+            GpkExport maxExp = null;
             foreach (GpkExport export in package.ExportList.Values)
             {
                 try
@@ -348,6 +353,12 @@ private void ReadExportData(BinaryReader reader, GpkPackage package)
                         logger.Debug(String.Format("totalRead {0} GetDataSize {1} shouldBe {2}", totalRead, oursize, shouldBe));
                     }
 
+                    if (reader.BaseStream.Position > maxValue)
+                    {
+                        maxValue = reader.BaseStream.Position;
+                        maxExp = export;
+                    }
+
                 }
                 catch (Exception ex)
                 {
@@ -356,6 +367,9 @@ private void ReadExportData(BinaryReader reader, GpkPackage package)
                 //data
                 stat.progress++;
             }
+
+            logger.Debug("MAX VALUE " + maxValue);
+            logger.Debug("MAX EXPORT " + maxExp.ObjectName);
         }
 
         public static void ParsePayload(GpkPackage package, GpkExport export)

diff --git a/GPK_RePack/bin/Debug/GPK_RePack.exe.config b/GPK_RePack/bin/Debug/GPK_RePack.exe.config
diff --git a/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.config b/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.config
diff --git a/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.manifest b/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.manifest
diff --git a/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/GPK_RePack/obj/Debug/GPK_RePack.Forms.Options.resources b/GPK_RePack/obj/Debug/GPK_RePack.Forms.Options.resources
diff --git a/GPK_RePack/obj/Debug/GPK_RePack.Properties.Resources.resources b/GPK_RePack/obj/Debug/GPK_RePack.Properties.Resources.resources
diff --git a/GPK_RePack/obj/Debug/GPK_RePack.csproj.FileListAbsolute.txt b/GPK_RePack/obj/Debug/GPK_RePack.csproj.FileListAbsolute.txt
diff --git a/GPK_RePack/obj/Debug/GPK_RePack.csproj.GenerateResource.Cache b/GPK_RePack/obj/Debug/GPK_RePack.csproj.GenerateResource.Cache
diff --git a/GPK_RePack/obj/Debug/GPK_RePack.csprojResolveAssemblyReference.cache b/GPK_RePack/obj/Debug/GPK_RePack.csprojResolveAssemblyReference.cache
diff --git a/GPK_RePack/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/GPK_RePack/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
diff --git a/GPK_RePack/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/GPK_RePack/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
diff --git a/GPK_RePack/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/GPK_RePack/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
diff --git a/GPK_RePack/obj/Debug/Terahelper.exe b/GPK_RePack/obj/Debug/Terahelper.exe
diff --git a/GPK_RePack/obj/Debug/Terahelper.pdb b/GPK_RePack/obj/Debug/Terahelper.pdb
diff --git a/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferences.cache b/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/GPK_RePack/obj/Release/GPK_RePack.Properties.Resources.resources b/GPK_RePack/obj/Release/GPK_RePack.Properties.Resources.resources
diff --git a/GPK_RePack/obj/Release/GPK_RePack.csproj.FileListAbsolute.txt b/GPK_RePack/obj/Release/GPK_RePack.csproj.FileListAbsolute.txt
diff --git a/GPK_RePack/obj/Release/GPK_RePack.csproj.GenerateResource.Cache b/GPK_RePack/obj/Release/GPK_RePack.csproj.GenerateResource.Cache
diff --git a/GPK_RePack/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/GPK_RePack/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
diff --git a/GPK_RePack/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/GPK_RePack/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
diff --git a/GPK_RePack/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/GPK_RePack/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
diff --git a/GPK_RePack/obj/Release/Terahelper.exe b/GPK_RePack/obj/Release/Terahelper.exe
diff --git a/GPK_RePack/obj/Release/Terahelper.pdb b/GPK_RePack/obj/Release/Terahelper.pdb
diff --git a/build/PCFemale_Voice03.gpk b/build/PCFemale_Voice03.gpk
diff --git a/build/PCFemale_Voice03_JP.gpk b/build/PCFemale_Voice03_JP.gpk
diff --git a/build/Terahelper.exe b/build/Terahelper.exe
diff --git a/build/Terahelper.exe.config b/build/Terahelper.exe.config
diff --git a/build/Terahelper.log b/build/Terahelper.log
diff --git a/build/Terahelper.pdb b/build/Terahelper.pdb
diff --git a/build/Terahelper.vshost.exe b/build/Terahelper.vshost.exe