bugfixes

- fixed a bug where packed buffers had incorrect metadata - better handling for long extract paths - changed default uncook extension to dds
TarekJor · Jan 26, 2021 · f3e98df · f3e98df
1 parent 72da09e
commit f3e98df
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/CP77.CR2W/Modkit/Pack.cs b/CP77.CR2W/Modkit/Pack.cs
@@ -128,7 +128,7 @@ public static Archive.Archive Pack(DirectoryInfo infolder, DirectoryInfo outpath
                         ar.Table.Offsets.Add(new OffsetEntry(
                             (ulong)boffset,
                             bzsize,
-                            (uint) b.Length));
+                            bsize));
                     }
                     lastoffsetidx = (uint)ar.Table.Offsets.Count;
 

diff --git a/CP77.CR2W/Modkit/Uncook.cs b/CP77.CR2W/Modkit/Uncook.cs
@@ -33,14 +33,15 @@ public static partial class ModTools
         /// <param name="flip"></param>
         /// <returns></returns>
         public static int UncookSingle(this Archive.Archive ar, ulong hash, DirectoryInfo outDir, 
-            EUncookExtension uncookext = EUncookExtension.tga, bool flip = false)
+            EUncookExtension uncookext = EUncookExtension.dds, bool flip = false)
         {
             // using var mmf = MemoryMappedFile.CreateFromFile(Filepath, FileMode.Open);
 
             return ar.UncookSingleInner(hash, outDir, uncookext, flip);
         }
 
-        private static int UncookSingleInner(this Archive.Archive ar, ulong hash, DirectoryInfo outDir, EUncookExtension uncookext = EUncookExtension.tga, bool flip = false)
+        private static int UncookSingleInner(this Archive.Archive ar, ulong hash, DirectoryInfo outDir, 
+            EUncookExtension uncookext = EUncookExtension.dds, bool flip = false)
         {
             // checks
             if (!ar.Files.ContainsKey(hash))
@@ -114,7 +115,8 @@ private static int UncookSingleInner(this Archive.Archive ar, ulong hash, Direct
         /// <param name="uncookext"></param>
         /// <param name="flip"></param>
         /// <returns></returns>
-        public static (List<string>, int) UncookAll(this Archive.Archive ar, DirectoryInfo outDir, string pattern = "", string regex = "", EUncookExtension uncookext = EUncookExtension.tga, bool flip = false)
+        public static (List<string>, int) UncookAll(this Archive.Archive ar, DirectoryInfo outDir, string pattern = "",
+            string regex = "", EUncookExtension uncookext = EUncookExtension.dds, bool flip = false)
         {
             var logger = ServiceLocator.Default.ResolveType<ILoggerService>();
 
@@ -170,7 +172,7 @@ where matches.Count > 0
         /// 
         /// </summary>
         public static int Uncook(CR2WFile cr2w, List<byte[]> buffers, ECookedFileFormat ext, 
-            EUncookExtension uncookext = EUncookExtension.tga, bool flip = false)
+            EUncookExtension uncookext = EUncookExtension.dds, bool flip = false)
         {
             var infile = new FileInfo(cr2w.FileName);
             var uncooksuccess = false;

diff --git a/CP77.CR2W/WolvenKit.Cyberformats.csproj b/CP77.CR2W/WolvenKit.Cyberformats.csproj
@@ -11,11 +11,17 @@
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/WolvenKit/Wolven-kit</RepositoryUrl>
 		<PackageTags>wolvenkit, cyberpunk2077</PackageTags>
-		<AssemblyVersion>1.0.4.0</AssemblyVersion>
-		<FileVersion>1.0.4.0</FileVersion>
-		<Version>1.0.4</Version>
+		<AssemblyVersion>1.0.5.0</AssemblyVersion>
+		<FileVersion>1.0.5.0</FileVersion>
+		<Version>1.0.5</Version>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <Compile Remove="Resources\**" />
+	  <EmbeddedResource Remove="Resources\**" />
+	  <None Remove="Resources\**" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Catel.Core" Version="5.12.11" />
 		<PackageReference Include="DotNetHelper.FastMember.Extension" Version="2.0.0" />
@@ -28,8 +34,4 @@
 		<ProjectReference Include="..\WolvenKit.Common\WolvenKit.Common.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Resources\" />
-	</ItemGroup>
-
 </Project>
diff --git a/WolvenKit.Common/DDS/TexconvWrapper.cs b/WolvenKit.Common/DDS/TexconvWrapper.cs
@@ -124,6 +124,12 @@ public static string Convert(string outDir,
         {
             var logger = ServiceLocator.Default.ResolveType<ILoggerService>();
 
+            if (filepath.Length > 255)
+            {
+                logger.LogString($"{filepath} - Filepath exceedds 255 characters. Please move the archive to extract to a shorter path.", Logtype.Error);
+                return "";
+            }
+
             var proc = new ProcessStartInfo(textconvpath)
             {
                 WorkingDirectory = Path.GetDirectoryName(textconvpath),

diff --git a/WolvenKit.Common/WolvenKit.Common.csproj b/WolvenKit.Common/WolvenKit.Common.csproj
@@ -12,7 +12,7 @@
     <RepositoryUrl>https://github.com/WolvenKit/Wolven-kit</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>wolvenkit</PackageTags>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
   </PropertyGroup>
 
   <ItemGroup>