Better ComicInfo test coverage and benchmarks

API.Benchmark/ArchiveServiceBenchmark.cs

@@ -3,10 +3,14 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using API.Services;
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Order;
 
 namespace API.Benchmark;
 
 [StopOnFirstError]
+[MemoryDiagnoser]
+[RankColumn]
+[Orderer(SummaryOrderPolicy.FastestToSlowest)]
 [SimpleJob(launchCount: 1, warmupCount: 5, targetCount: 20)]
 public class ArchiveServiceBenchmark
 {
@@ -21,14 +25,30 @@ public ArchiveServiceBenchmark()
         _archiveService = new ArchiveService(new NullLogger<ArchiveService>(), _directoryService, _imageService);
     }
 
+    [Benchmark(Baseline = true)]
+    public void TestGetComicInfo_baseline()
+    {
+        if (_archiveService.GetComicInfo("Data/ComicInfo.zip") == null) {
+            throw new Exception("ComicInfo not found");
+        }
+    }
+
     [Benchmark]
-    public void TestGetComicInfo()
+    public void TestGetComicInfo_duplicate()
     {
         if (_archiveService.GetComicInfo("Data/ComicInfo_duplicateInfos.zip") == null) {
             throw new Exception("ComicInfo not found");
         }
     }
 
+    [Benchmark]
+    public void TestGetComicInfo_outside_root()
+    {
+        if (_archiveService.GetComicInfo("Data/ComicInfo_outside_root.zip") == null) {
+            throw new Exception("ComicInfo not found");
+        }
+    }
+
     // Benchmark to test default GetNumberOfPages from archive
     // vs a new method where I try to open the archive and return said stream
 }

API.Tests/Services/ArchiveServiceTests.cs

@@ -256,17 +256,30 @@ public void ShouldHaveComicInfo_WithAuthors()
         Assert.Equal("Junya Inoue", comicInfo.Writer);
     }
 
-    [Fact]
-    public void ShouldHaveComicInfo_TopLevelFileOnly()
+    [Theory]
+    [InlineData("ComicInfo_duplicateInfos.zip")]
+    [InlineData("ComicInfo_duplicateInfos_reversed.zip")]
+    public void ShouldHaveComicInfo_TopLevelFileOnly(string filename)
     {
         var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
-        var archive = Path.Join(testDirectory, "ComicInfo_duplicateInfos.zip");
+        var archive = Path.Join(testDirectory, filename);
 
         var comicInfo = _archiveService.GetComicInfo(archive);
         Assert.NotNull(comicInfo);
         Assert.Equal("BTOOOM!", comicInfo.Series);
     }
 
+    [Fact]
+    public void ShouldHaveComicInfo_OutsideRoot()
+    {
+        var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
+        var archive = Path.Join(testDirectory, "ComicInfo_outside_root.zip");
+
+        var comicInfo = _archiveService.GetComicInfo(archive);
+        Assert.NotNull(comicInfo);
+        Assert.Equal("BTOOOM! - Duplicate", comicInfo.Series);
+    }
+
     #endregion
 
     #region CanParseComicInfo

API/Services/ArchiveService.cs

@@ -328,7 +328,7 @@ public bool IsValidArchive(string archivePath)
         return false;
     }
 
-    private static bool BackupComicInfoArchiveEntry(string fullName, string name)
+    private static bool IsComicInfoArchiveEntry(string fullName, string name)
     {
         return !Tasks.Scanner.Parser.Parser.HasBlacklistedFolderInPath(fullName)
                && name.Equals(ComicInfoFilename, StringComparison.OrdinalIgnoreCase)
@@ -355,8 +355,8 @@ private static bool BackupComicInfoArchiveEntry(string fullName, string name)
                 {
                     using var archive = ZipFile.OpenRead(archivePath);
 
-                    var entry = archive.Entries.FirstOrDefault(x => x.FullName == ComicInfoFilename) ??
-                        archive.Entries.FirstOrDefault(x => BackupComicInfoArchiveEntry(x.FullName, x.Name));
+                    var entry = archive.Entries.FirstOrDefault(x => (x.FullName ?? x.Name) == ComicInfoFilename) ??
+                        archive.Entries.FirstOrDefault(x => IsComicInfoArchiveEntry(x.FullName, x.Name));
                     if (entry != null)
                     {
                         using var stream = entry.Open();
@@ -373,7 +373,7 @@ private static bool BackupComicInfoArchiveEntry(string fullName, string name)
                     using var archive = ArchiveFactory.Open(archivePath);
                     var entry = archive.Entries.FirstOrDefault(entry => entry.Key == ComicInfoFilename) ??
                         archive.Entries.FirstOrDefault(entry =>
-                        BackupComicInfoArchiveEntry(Path.GetDirectoryName(entry.Key), entry.Key));
+                        IsComicInfoArchiveEntry(Path.GetDirectoryName(entry.Key), entry.Key));
 
                     if (entry != null)
                     {