Adjustment

Author: hsayed21

Class/MarkerFinder.cs

@@ -10,17 +10,18 @@ public interface IMarkerFinder
 
     public class MarkerFinder : IMarkerFinder
     {
-        private const string MsciMarker = "4D-53-43-49"; // "MSCI" marker
+        private const int MsciMarkerSize = 4;
+        private const int MsciMarker = 0x4943534D; // "MSCI" marker Little Endian
 
         public long FindMarker(FileStream fileStream)
         {
             byte[] markerBytes = new byte[4];
-            while (fileStream.Read(markerBytes, 0, 4) == 4)
+            while (fileStream.Read(markerBytes, 0, MsciMarkerSize) == 4)
             {
-                string hexValue = BitConverter.ToString(markerBytes);
-                if (hexValue == MsciMarker)
+                if (BitConverter.ToInt32(markerBytes, 0) == MsciMarker)
                 {
-                    return fileStream.Position - 4;
+                    fileStream.Seek(-MsciMarkerSize, SeekOrigin.Current);
+                    return fileStream.Position;
                 }
                 fileStream.Seek(-2, SeekOrigin.Current);
             }

Class/TapeHeaderValidator.cs

@@ -10,14 +10,16 @@ public interface ITapeHeaderValidator
 
     public class TapeHeaderValidator : ITapeHeaderValidator
     {
-        private const string TapeHeaderStart = "54-41-50-45"; // Start of tape header "TAPE"
-
+        private const int TapeHeaderSize = 4;
+        private const int TapeHeaderStart = 0x45504154; // Start of tape header "TAPE" Little Endian
         public bool Validate(FileStream fileStream)
         {
-            byte[] tapeHeaderStartBytes = new byte[4];
-            fileStream.Read(tapeHeaderStartBytes, 0, 4);
-            string hexValue = BitConverter.ToString(tapeHeaderStartBytes);
-            return hexValue == TapeHeaderStart;
+            byte[] tapeHeaderStartBytes = new byte[TapeHeaderSize];
+
+            if (fileStream.Read(tapeHeaderStartBytes, 0, TapeHeaderSize) != TapeHeaderSize)
+                return false;  // Not enough data in the file
+            
+            return BitConverter.ToInt32(tapeHeaderStartBytes, 0) == TapeHeaderStart;
         }
     }
 }

Class/VersionDeterminer.cs

@@ -5,24 +5,18 @@ namespace SQLBakVersion.Class
 {
     public interface IVersionDeterminer
     {
-        string DetermineVersion(FileStream fileStream, long versionOffset);
+        string DetermineVersion(FileStream fileStream, long MSCIOffset);
     }
 
     public class VersionDeterminer : IVersionDeterminer
     {
-        private const int BytesPerSet = 16; // Number of bytes in each set
-        private const int ByteToRetrieve = 13; // Byte number to retrieve in the 11th set
 
-        public string DetermineVersion(FileStream fileStream, long versionOffset)
+        public string DetermineVersion(FileStream fileStream, long MSCIOffset)
         {
-            const int setsToSkip = 10; // Number of sets to skip
-            long totalBytesToSkip = BytesPerSet * setsToSkip;
-            totalBytesToSkip += versionOffset; // Adjust for marker offset
-
-            fileStream.Seek(totalBytesToSkip, SeekOrigin.Begin);
-            fileStream.Seek(ByteToRetrieve - 1, SeekOrigin.Current); // Seek to the byte position
-
+            long versionOffset = MSCIOffset + 172;
             byte[] versionBytes = new byte[2];
+
+            fileStream.Seek(versionOffset, SeekOrigin.Begin);
             fileStream.Read(versionBytes, 0, 2);
             Int16 dbVersion = BitConverter.ToInt16(versionBytes, 0);