minor span extension refactoring

zencq · Sep 10, 2023 · a8f0009 · a8f0009
1 parent 12fc1d5
commit a8f0009
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/libNOM.io/Extensions/Span.cs b/libNOM.io/Extensions/Span.cs
@@ -94,6 +94,16 @@ internal static Guid GetGuid(this ReadOnlySpan<byte> self, int start = 0)
         return null;
     }
 
+    /// <summary>
+    /// Gets all bytes until the first \0 as string.
+    /// </summary>
+    /// <param name="self"></param>
+    /// <returns></returns>
+    internal static string GetSaveRenamingString(this ReadOnlySpan<byte> self)
+    {
+        return GetString(self.Slice(0, self.IndexOf((byte)(0))));
+    }
+
     /// <summary>
     /// Decodes all the bytes in UTF-8 format into a string.
     /// </summary>
@@ -150,22 +160,6 @@ internal static int ReadString(this ReadOnlySpan<byte> self, out ReadOnlySpan<ch
     }
 
     #endregion
-
-    #region typeof(uint)    
-
-    internal static string GetSaveRenamingString(this ReadOnlySpan<uint> self)
-    {
-        var bytes = self.AsBytes();
-        var index = bytes.IndexOf((byte)(0));
-
-#if NETSTANDARD2_0
-        return Encoding.UTF8.GetString(bytes.Slice(0, index).ToArray());
-#else
-        return Encoding.UTF8.GetString(bytes.Slice(0, index));
-#endif
-    }
-
-    #endregion
 }
 
 internal static class SpanExtensions

diff --git a/libNOM.io/PlatformMicrosoft.cs b/libNOM.io/PlatformMicrosoft.cs
@@ -521,8 +521,8 @@ protected override void UpdateContainerWithMetaInformation(Container container,
         {
             container.Extra = container.Extra with
             {
-                SaveName = decompressed.Slice(5, 32).GetSaveRenamingString(),
-                SaveSummary = decompressed.Slice(37, 32).GetSaveRenamingString(),
+                SaveName = disk.Slice(20, 128).GetSaveRenamingString(),
+                SaveSummary = disk.Slice(148, 128).GetSaveRenamingString(),
                 DifficultyPreset = disk[276],
             };
         }

diff --git a/libNOM.io/PlatformSteam.cs b/libNOM.io/PlatformSteam.cs
@@ -314,8 +314,8 @@ protected override void UpdateContainerWithMetaInformation(Container container,
             {
                 container.Extra = container.Extra with
                 {
-                    SaveName = decompressed.Slice(22, 32).GetSaveRenamingString(),
-                    SaveSummary = decompressed.Slice(54, 32).GetSaveRenamingString(),
+                    SaveName = disk.Slice(88, 128).GetSaveRenamingString(),
+                    SaveSummary = disk  .Slice(216, 128).GetSaveRenamingString(),
                     DifficultyPreset = disk[344],
                 };
             }

diff --git a/libNOM.io/PlatformSwitch.cs b/libNOM.io/PlatformSwitch.cs
@@ -201,8 +201,8 @@ protected override void UpdateContainerWithMetaInformation(Container container,
             {
                 container.Extra = container.Extra with
                 {
-                    SaveName = decompressed.Slice(10, 32).GetSaveRenamingString(),
-                    SaveSummary = decompressed.Slice(42, 32).GetSaveRenamingString(),
+                    SaveName = disk.Slice(40, 128).GetSaveRenamingString(),
+                    SaveSummary = disk.Slice(168, 128).GetSaveRenamingString(),
                     DifficultyPreset = disk[296],
                 };
             }