Refactored archive code into a service so that I can write tests for it.

API.Tests/Services/ArchiveServiceTests.cs

@@ -0,0 +1,37 @@
+using System.IO;
+using System.IO.Compression;
+using API.Extensions;
+using API.Interfaces;
+using API.Services;
+using Microsoft.Extensions.Logging;
+using NSubstitute;
+using Xunit;
+
+namespace API.Tests.Services
+{
+    public class ArchiveServiceTests
+    {
+        private readonly IArchiveService _archiveService;
+        private readonly ILogger<ArchiveService> _logger = Substitute.For<ILogger<ArchiveService>>();
+
+        private readonly string _testDirectory =
+            Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService");
+
+        public ArchiveServiceTests()
+        {
+            _archiveService = new ArchiveService(_logger);
+        }
+
+        [Theory]
+        [InlineData("flat file.zip", false)]
+        [InlineData("file in folder in folder.zip", true)]
+        [InlineData("file in folder.zip", true)]
+        [InlineData("file in folder_alt.zip", true)]
+        public void ArchiveNeedsFlatteningTest(string archivePath, bool expected)
+        {
+            var file = Path.Join(_testDirectory, archivePath);
+            using ZipArchive archive = ZipFile.OpenRead(file);
+            Assert.Equal(expected, _archiveService.ArchiveNeedsFlattening(archive));
+        }
+    }
+}

API.Tests/Services/ScannerServiceTests.cs

@@ -12,6 +12,7 @@ namespace API.Tests.Services
         private readonly ScannerService _scannerService;
         private readonly ILogger<ScannerService> _logger = Substitute.For<ILogger<ScannerService>>();
         private readonly IUnitOfWork _unitOfWork = Substitute.For<IUnitOfWork>();
+        private readonly string _testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ScannerService");
         public ScannerServiceTests()
         {
             _scannerService = new ScannerService(_unitOfWork, _logger);
@@ -23,9 +24,8 @@ namespace API.Tests.Services
         [InlineData("v10 - nested folder.cbz", "v10 - nested folder.expected.jpg")]
         public void GetCoverImageTest(string inputFile, string expectedOutputFile)
         {
-            var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ImageProvider");
-            var expectedBytes = File.ReadAllBytes(Path.Join(testDirectory, expectedOutputFile));
-            Assert.Equal(expectedBytes, _scannerService.GetCoverImage(Path.Join(testDirectory, inputFile)));
+            var expectedBytes = File.ReadAllBytes(Path.Join(_testDirectory, expectedOutputFile));
+            Assert.Equal(expectedBytes, _scannerService.GetCoverImage(Path.Join(_testDirectory, inputFile)));
         }
     }
 }

API.Tests/Services/Test Data/ArchiveService/LICENSE.md

@@ -0,0 +1,2 @@
+Files in this test are all royalty free and can be found here:
+https://www.pexels.com/photo/snow-wood-light-art-6551949/