Fixes for filename matching when archive not cached

fraganator · Jan 30, 2022 · e479588 · e479588
1 parent bba5f16
commit e479588
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,7 @@
 # Archive Cache Manager change history
+## v2.0.9 (2022-01-31)
+* Fix file priority for files in subfolder of archive when not in cache
+* Fix launching individual file from archive when not in cache
 
 ## v2.0.8 (2022-01-13)
 * Wildcard based filename matching for file priorities in archive

diff --git a/src/ArchiveCacheManager/Properties/AssemblyInfo.cs b/src/ArchiveCacheManager/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.8.0")]
-[assembly: AssemblyFileVersion("2.0.8.0")]
+[assembly: AssemblyVersion("2.0.9.0")]
+[assembly: AssemblyFileVersion("2.0.9.0")]
diff --git a/src/Core/CacheManager.cs b/src/Core/CacheManager.cs
@@ -194,7 +194,7 @@ public static string ListFileArchive(ref string stderr, ref int exitCode)
             {
                 if (Zip.GetFileList(Archive.Path, launchGameInfo.SelectedFile).Length > 0)
                 {
-                    fileList = "Path = " + Path.Combine(PathUtils.ArchiveCachePath(Archive.Path), launchGameInfo.SelectedFile);
+                    fileList = "Path = " + launchGameInfo.SelectedFile;
                     Logger.Log(string.Format("Selected individual file from archive \"{0}\".", launchGameInfo.SelectedFile));
                 }
             }

diff --git a/src/Core/Properties/AssemblyInfo.cs b/src/Core/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.8.0")]
-[assembly: AssemblyFileVersion("2.0.8.0")]
+[assembly: AssemblyVersion("2.0.9.0")]
+[assembly: AssemblyFileVersion("2.0.9.0")]
diff --git a/src/Core/Zip.cs b/src/Core/Zip.cs
@@ -95,7 +95,7 @@ public static void ListWildcard(string archivePath, string wildcard, ref string
             // {0} = archive path
             // -i! = wildcard match filename
             // {1} = wildcard to match
-            string args = string.Format("l \"{0}\" -i!{1}", archivePath, wildcard);
+            string args = string.Format("l \"{0}\" -i!\"{1}\" -r", archivePath, wildcard);
 
             run7z(args, ref stdout, ref stderr, ref exitCode);
         }

diff --git a/src/Plugin/Properties/AssemblyInfo.cs b/src/Plugin/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // 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.8.0")]
-[assembly: AssemblyFileVersion("2.0.8.0")]
+[assembly: AssemblyVersion("2.0.9.0")]
+[assembly: AssemblyFileVersion("2.0.9.0")]