Skip to content

Commit d03c567

Browse files
Update CatalogBasedVerification.cs: Add support for SPKG packages (#13)
1 parent 1050a35 commit d03c567

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

src/Applications/CbsCatVerifier/CatalogBasedVerification.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ private static bool ValidatePackageCabinet(string packageCabinet)
8282

8383
List<string> checksums = CatalogManager.ReadCatalogFile(Path.Combine(tempDirectory, "update.cat")).Where(x => x.Length == 64).ToList();
8484

85+
if (checksums.Count == 0)
86+
{
87+
checksums = CatalogManager.ReadCatalogFile(Path.Combine(tempDirectory, "content.cat")).Where(x => x.Length == 64).ToList();
88+
}
89+
8590
/*Console.WriteLine($"Checksums from catalog file: (SHA256) ({checksums.Count})");
8691
Console.WriteLine();
8792
@@ -109,7 +114,7 @@ private static bool ValidatePackageCabinet(string packageCabinet)
109114
Console.Write($"\r{GetDISMLikeProgressBar(newPercentage)}");
110115
}
111116

112-
if (file.FileName.Equals("update.cat", StringComparison.InvariantCultureIgnoreCase))
117+
if (file.FileName.Equals("update.cat", StringComparison.InvariantCultureIgnoreCase)|| file.FileName.Equals("content.cat", StringComparison.InvariantCultureIgnoreCase))
113118
{
114119
continue;
115120
}
@@ -278,6 +283,12 @@ static void ValidatePackageFolder(string packageFolder)
278283

279284
List<string> checksums = CatalogManager.ReadCatalogFile(inputCat).Where(x => x.Length == 64).ToList();
280285

286+
if (checksums.Count == 0)
287+
{
288+
inputCat = Path.Combine(packageFolder, "content.cat");
289+
checksums = CatalogManager.ReadCatalogFile(inputCat).Where(x => x.Length == 64).ToList();
290+
}
291+
281292
Console.WriteLine($"Checksums from catalog file: (SHA256) ({checksums.Count})");
282293
Console.WriteLine();
283294

@@ -292,7 +303,7 @@ static void ValidatePackageFolder(string packageFolder)
292303
{
293304
string friendlyFileName = file.Replace(packageFolder + Path.DirectorySeparatorChar, "", StringComparison.InvariantCultureIgnoreCase);
294305

295-
if (friendlyFileName.Equals("update.cat", StringComparison.InvariantCultureIgnoreCase))
306+
if (friendlyFileName.Equals("update.cat", StringComparison.InvariantCultureIgnoreCase) || friendlyFileName.Equals("content.cat", StringComparison.InvariantCultureIgnoreCase))
296307
{
297308
continue;
298309
}

0 commit comments

Comments
 (0)