Fixes: compression and spaces

5 files changed, 15 insertions, 9 deletions

diff --git a/Apps/NesMiniApplication.cs b/Apps/NesMiniApplication.cs
index a45d43e1..8c6983be 100644
--- a/Apps/NesMiniApplication.cs
+++ b/Apps/NesMiniApplication.cs
@@ -658,15 +658,15 @@ namespace com.clusterrr.hakchi_gui
         {

             if (!Directory.Exists(GamePath)) return new string[0];

             var result = new List<string>();

-            var exec = Regex.Replace(Command, "['/\\\"]", " ") + " ";

+            var exec = Regex.Replace(Command, "[/\\\"]", " ") + " ";

             var files = Directory.GetFiles(GamePath, "*.*", SearchOption.TopDirectoryOnly);

             foreach (var file in files)

             {

-                if (System.IO.Path.GetExtension(file).ToLower() == ".7z")

+                if (Path.GetExtension(file).ToLower() == ".7z")

                     continue;

-                if (System.IO.Path.GetExtension(file).ToLower() == ".zip")

+                if (Path.GetExtension(file).ToLower() == ".zip")

                     continue;

-                if (exec.Contains(" " + System.IO.Path.GetFileName(file) + " "))

+                if (exec.Contains(" " + Path.GetFileName(file) + " "))

                     result.Add(file);

             }

             return result.ToArray();

@@ -676,7 +676,7 @@ namespace com.clusterrr.hakchi_gui
         {

             if (!Directory.Exists(GamePath)) return new string[0];

             var result = new List<string>();

-            var exec = Regex.Replace(Command, "['/\\\"]", " ") + " ";

+            var exec = Regex.Replace(Command, "[/\\\"]", " ") + " ";

             var files = Directory.GetFiles(GamePath, "*.7z", SearchOption.TopDirectoryOnly);

             foreach (var file in files)

             {

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index ed5060f5..bd275b30 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using System.Resources;
 // You can specify all the values or you can default the Build and Revision Numbers 

 // by using the '*' as shown below:

 // [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("2.0.21.56")]

-[assembly: AssemblyFileVersion("2.0.21.56")]

+[assembly: AssemblyVersion("2.0.21.57")]

+[assembly: AssemblyFileVersion("2.0.21.57")]

 [assembly: NeutralResourcesLanguageAttribute("en-US")]

diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj
index a1e10353..26551a41 100644
--- a/hakchi_gui.csproj
+++ b/hakchi_gui.csproj
@@ -31,8 +31,8 @@
     <PublisherName>Alexey %27Cluster%27 Avdyukhin</PublisherName>

     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>

     <WebPage>index.html</WebPage>

-    <ApplicationRevision>56</ApplicationRevision>

-    <ApplicationVersion>2.0.21.56</ApplicationVersion>

+    <ApplicationRevision>57</ApplicationRevision>

+    <ApplicationVersion>2.0.21.57</ApplicationVersion>

     <UseApplicationTrust>false</UseApplicationTrust>

     <CreateDesktopShortcut>true</CreateDesktopShortcut>

     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr b/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
index 0c76842f..c7cfb5b7 100755
--- a/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
+++ b/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
@@ -21,6 +21,9 @@ while [ $# -gt 0 ] ; do
       cd "$tmppath"
       tiny7zx x "$filename"
       filename="$tmppath/$(ls)"
+      filename_str=${filename// /_}
+      mv "$filename" "$filename_str"
+      filename=$filename_str
     fi
     options="-rom $filename"
     shift
diff --git a/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr b/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr
index 5160d727..6316ddf4 100755
--- a/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr
+++ b/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr
@@ -17,6 +17,9 @@ if [ "$extension" == "7z" ]; then
   cd "$tmppath"
   tiny7zx x "$filename"
   filename="$tmppath/$(ls)"
+  filename_str=${filename// /_}
+  mv "$filename" "$filename_str"
+  filename=$filename_str
 fi
 if [ "$extension" == "gz" ]; then
   rm -rf "$tmppath"