A collection of bugfixes and performance improvements

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "6.0.x"
 
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@v1.0.2

Windows Build Identifier/Identification/Common.cs

@@ -164,7 +164,7 @@ public static WindowsVersion GetGreaterVersion(WindowsVersion version1, WindowsV
 
                 CultureInfo provider = CultureInfo.InvariantCulture;
 
-                string format = "yyMMDD-HHmm";
+                const string format = "yyMMdd-HHmm";
 
                 DateTime date1 = DateTime.ParseExact(version1.CompileDate, format, provider);
                 DateTime date2 = DateTime.ParseExact(version2.CompileDate, format, provider);
@@ -249,6 +249,7 @@ public static void DisplayReport(WindowsImage report)
             Console.WriteLine("Architecture : " + report.Architecture);
             Console.WriteLine("BuildType    : " + report.BuildType);
             Console.WriteLine("Types        : " + typedisp);
+            Console.WriteLine("Base Sku     : " + report.BaseSku);
             Console.WriteLine("Sku          : " + report.Sku);
             Console.WriteLine("Editions     : " + editiondisp);
             Console.WriteLine("Licensing    : " + report.Licensing);

Windows Build Identifier/Identification/MediaHandler.cs

@@ -21,30 +21,27 @@ public class UnsupportedWIMException : Exception { }
 
         public class UnsupportedWIMXmlException : Exception { }
 
-        private static string ExtractWIMXml(Stream wimstream)
+        private static string ExtractWIMXml(ArchiveFile archiveFile)
         {
             try
             {
-                using (ArchiveFile archiveFile = new ArchiveFile(wimstream, SevenZipFormat.Wim))
+                if (archiveFile.Entries.Any(x => x.FileName == "[1].xml"))
                 {
-                    if (archiveFile.Entries.Any(x => x.FileName == "[1].xml"))
-                    {
-                        Entry wimXmlEntry = archiveFile.Entries.First(x => x.FileName == "[1].xml");
-
-                        string xml;
-                        using (MemoryStream memoryStream = new MemoryStream())
-                        {
-                            wimXmlEntry.Extract(memoryStream);
+                    Entry wimXmlEntry = archiveFile.Entries.First(x => x.FileName == "[1].xml");
 
-                            xml = Encoding.Unicode.GetString(memoryStream.ToArray(), 2, (int)memoryStream.Length - 2);
-                        }
-
-                        return xml;
-                    }
-                    else if (archiveFile.Entries.Any(x => x.FileName == "Windows"))
+                    string xml;
+                    using (MemoryStream memoryStream = new MemoryStream())
                     {
-                        return archiveFile.GetArchiveComment();
+                        wimXmlEntry.Extract(memoryStream);
+
+                        xml = Encoding.Unicode.GetString(memoryStream.ToArray(), 2, (int)memoryStream.Length - 2);
                     }
+
+                    return xml;
+                }
+                else if (archiveFile.Entries.Any(x => x.FileName == "Windows"))
+                {
+                    return archiveFile.GetArchiveComment();
                 }
 
                 throw new UnsupportedWIMException();
@@ -80,22 +77,26 @@ private static WindowsImageIndex[] IdentifyWindowsNTFromWIM(Stream wimstream, bo
 
             Console.WriteLine("Gathering WIM information XML file");
 
-            string xml = ExtractWIMXml(wimstream);
+
+            using ArchiveFile archiveFile = new ArchiveFile(wimstream, SevenZipFormat.Wim);
+            string xml = ExtractWIMXml(archiveFile);
 
             Console.WriteLine("Parsing WIM information XML file");
             XmlFormats.WIMXml.WIM wim = GetWIMClassFromXml(xml);
 
             Console.WriteLine($"Found {wim.IMAGE.Length} images in the wim according to the XML");
 
             Console.WriteLine("Evaluating relevant images in the WIM according to the XML");
-            int irelevantcount2 = (wim.IMAGE.Any(x => x.DESCRIPTION.Contains("winpe", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
-                (wim.IMAGE.Any(x => x.DESCRIPTION.Contains("setup", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
-                (wim.IMAGE.Any(x => x.DESCRIPTION.Contains("preinstallation", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
-                (wim.IMAGE.Any(x => x.DESCRIPTION.Contains("winre", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
-                (wim.IMAGE.Any(x => x.DESCRIPTION.Contains("recovery", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0);
+            int irelevantcount2 = (wim.IMAGE.Any(x => x.DESCRIPTION != null && x.DESCRIPTION.Contains("winpe", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
+                (wim.IMAGE.Any(x => x.DESCRIPTION != null && x.DESCRIPTION.Contains("setup", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
+                (wim.IMAGE.Any(x => x.DESCRIPTION != null && x.DESCRIPTION.Contains("preinstallation", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
+                (wim.IMAGE.Any(x => x.DESCRIPTION != null && x.DESCRIPTION.Contains("winre", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0) +
+                (wim.IMAGE.Any(x => x.DESCRIPTION != null && x.DESCRIPTION.Contains("recovery", StringComparison.InvariantCultureIgnoreCase)) ? 1 : 0);
 
             Console.WriteLine($"Found {irelevantcount2} irrelevant images in the wim according to the XML");
 
+            var provider = new WIMInstallProviderInterface(archiveFile);
+
             foreach (var image in wim.IMAGE)
             {
                 Console.WriteLine();
@@ -105,11 +106,11 @@ private static WindowsImageIndex[] IdentifyWindowsNTFromWIM(Stream wimstream, bo
                 // If what we're trying to identify isn't just a winpe, and we are accessing a winpe image
                 // skip the image
                 //
-                int irelevantcount = (image.DESCRIPTION.Contains("winpe", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
-                    (image.DESCRIPTION.Contains("setup", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
-                    (image.DESCRIPTION.Contains("preinstallation", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
-                    (image.DESCRIPTION.Contains("winre", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
-                    (image.DESCRIPTION.Contains("recovery", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0);
+                int irelevantcount = (image.DESCRIPTION != null && image.DESCRIPTION.Contains("winpe", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
+                    (image.DESCRIPTION != null && image.DESCRIPTION.Contains("setup", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
+                    (image.DESCRIPTION != null && image.DESCRIPTION.Contains("preinstallation", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
+                    (image.DESCRIPTION != null && image.DESCRIPTION.Contains("winre", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0) +
+                    (image.DESCRIPTION != null && image.DESCRIPTION.Contains("recovery", StringComparison.InvariantCultureIgnoreCase) ? 1 : 0);
 
                 Console.WriteLine($"Index contains {irelevantcount} flags indicating this is a preinstallation environment");
 
@@ -125,7 +126,6 @@ private static WindowsImageIndex[] IdentifyWindowsNTFromWIM(Stream wimstream, bo
 
                 if (index != null && wim.IMAGE[0].INDEX == "0")
                 {
-                    using ArchiveFile archiveFile = new ArchiveFile(wimstream, SevenZipFormat.Wim);
                     if (!archiveFile.Entries.Any(x => x.FileName.StartsWith("0\\")))
                     {
                         WorkaroundForWIMFormatBug = true;
@@ -140,12 +140,10 @@ private static WindowsImageIndex[] IdentifyWindowsNTFromWIM(Stream wimstream, bo
 
                 Console.WriteLine($"Index value: {index}");
 
-                var provider = new WIMInstallProviderInterface(wimstream, index);
+                provider.SetIndex(index);
 
                 var report = InstalledImage.DetectionHandler.IdentifyWindowsNT(provider);
 
-                provider.Close();
-
                 // fallback
                 if ((string.IsNullOrEmpty(report.Sku) || report.Sku == "TerminalServer") && !string.IsNullOrEmpty(image.FLAGS))
                 {
@@ -205,7 +203,7 @@ private static WindowsImageIndex[] IdentifyWindowsNTFromWIM(Stream wimstream, bo
                 results.Add(imageIndex);
             }
 
-            wimstream.Dispose();
+            provider.Close();
 
             return results.ToArray();
         }
@@ -575,7 +573,7 @@ public static FileItem[] IdentifyWindowsFromISO(string isopath, bool deep, bool
                 using FileStream isoStream = File.Open(isopath, FileMode.Open, FileAccess.Read);
 
                 VfsFileSystemFacade cd = new CDReader(isoStream, true);
-                if (cd.FileExists(@"README.TXT"))
+                if (cd.FileExists(@"README.TXT") || cd.Root.GetDirectories().Length == 0)
                 {
                     cd = new UdfReader(isoStream);
                 }
@@ -646,6 +644,7 @@ public static WindowsImageIndex[] IdentifyWindowsFromWIM(Stream wim, bool includ
                 Console.WriteLine(ex.ToString());
             }
 
+            wim.Dispose();
             return result;
         }