revert info-psb extract file path change since 3.8 #138

UlyssesWu · Nov 20, 2024 · 1984648 · 1984648
1 parent f6d438d
commit 1984648
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/FreeMote.PsBuild/Properties/AssemblyInfo.cs b/FreeMote.PsBuild/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: InternalsVisibleTo("FreeMote.Editor")]
 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]
diff --git a/FreeMote.PsBuild/PsbCompiler.cs b/FreeMote.PsBuild/PsbCompiler.cs
@@ -767,6 +767,10 @@ void AddFileInfo(PsbDictionary fileInfoDic, string relativePathWithoutSuffix, lo
                         var content = LoadPsbAndContextFromJsonFile(kv.Value.Path);
                         var stream = content.Psb.ToStream();
                         var shellType = kv.Key.DefaultShellType(); //MARK: use shellType in filename, or use suffix in info?
+                        if (content.Context.TryGetValue(Context_PsbShellType, out var contextShellType))
+                        {
+                            shellType = contextShellType as string;
+                        }
                         if (!string.IsNullOrEmpty(shellType))
                         {
                             var packedStream = itemContext.PackToShell(stream, shellType); //disposed later

diff --git a/FreeMote.PsBuild/PsbDecompiler.cs b/FreeMote.PsBuild/PsbDecompiler.cs
@@ -627,9 +627,10 @@ public static void ExtractArchive(string filePath, string key, Dictionary<string
                                 if (mms != null)
                                 {
                                     //should not change file name, in order to keep repack correct :(
-                                    //relativePath = possibleFileName.Contains("/") ? possibleFileName :
-                                    //    pair.Key.Contains("/") ? Path.Combine(Path.GetDirectoryName(pair.Key), possibleFileName) :
-                                    //    possibleFileName;
+                                    //↑ reverted. If I recalled the reason, I should keep a more detailed note.
+                                    relativePath = possibleFileName.Contains("/") ? possibleFileName :
+                                        pair.Key.Contains("/") ? Path.Combine(Path.GetDirectoryName(pair.Key), possibleFileName) :
+                                        possibleFileName;
                                     finalContext = bodyContext;
                                     if (possibleFileName != possibleFileNames[0])
                                     {
@@ -754,9 +755,9 @@ public static void ExtractArchive(string filePath, string key, Dictionary<string
 
                                 if (mms != null)
                                 {
-                                    //relativePath = possibleFileName.Contains("/") ? possibleFileName :
-                                    //    pair.Key.Contains("/") ? Path.Combine(Path.GetDirectoryName(pair.Key), possibleFileName) :
-                                    //    possibleFileName;
+                                    relativePath = possibleFileName.Contains("/") ? possibleFileName :
+                                        pair.Key.Contains("/") ? Path.Combine(Path.GetDirectoryName(pair.Key), possibleFileName) :
+                                        possibleFileName;
                                     finalContext = bodyContext;
                                     if (possibleFileName != possibleFileNames[0])
                                     {

diff --git a/FreeMote.Tools.PsBuild/Properties/AssemblyInfo.cs b/FreeMote.Tools.PsBuild/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("d877dbdb-41d7-4c6f-9a46-957cecdaefa8")]
 
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]
diff --git a/FreeMote.Tools.PsbDecompile/Properties/AssemblyInfo.cs b/FreeMote.Tools.PsbDecompile/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("943fe440-32bb-4caf-a1da-5f38de7f9b92")]
 
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]