Merge branch 'develop' of https://github.com/Kareadita/Kavita into feature/comic-parser-enhancements

API.Tests/API.Tests.csproj

@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.8" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.10" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
         <PackageReference Include="NSubstitute" Version="4.2.2" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

API.Tests/Services/ArchiveServiceTests.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.IO.Compression;
 using API.Archive;
+using API.Data.Metadata;
 using API.Interfaces.Services;
 using API.Services;
 using Microsoft.Extensions.Logging;
@@ -216,8 +217,30 @@ namespace API.Tests.Services
             var archive = Path.Join(testDirectory, "file in folder.zip");
             var summaryInfo = "By all counts, Ryouta Sakamoto is a loser when he's not holed up in his room, bombing things into oblivion in his favorite online action RPG. But his very own uneventful life is blown to pieces when he's abducted and taken to an uninhabited island, where he soon learns the hard way that he's being pitted against others just like him in a explosives-riddled death match! How could this be happening? Who's putting them up to this? And why!? The name, not to mention the objective, of this very real survival game is eerily familiar to Ryouta, who has mastered its virtual counterpart-BTOOOM! Can Ryouta still come out on top when he's playing for his life!?";
 
-            Assert.Equal(summaryInfo, _archiveService.GetSummaryInfo(archive));
+            Assert.Equal(summaryInfo, _archiveService.GetComicInfo(archive).Summary);
+        }
 
+        [Fact]
+        public void CanParseComicInfo()
+        {
+            var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
+            var archive = Path.Join(testDirectory, "ComicInfo.zip");
+            var actual = _archiveService.GetComicInfo(archive);
+            var expected = new ComicInfo()
+            {
+                Publisher = "Yen Press",
+                Genre = "Manga, Movies & TV",
+                Summary =
+                    "By all counts, Ryouta Sakamoto is a loser when he's not holed up in his room, bombing things into oblivion in his favorite online action RPG. But his very own uneventful life is blown to pieces when he's abducted and taken to an uninhabited island, where he soon learns the hard way that he's being pitted against others just like him in a explosives-riddled death match! How could this be happening? Who's putting them up to this? And why!? The name, not to mention the objective, of this very real survival game is eerily familiar to Ryouta, who has mastered its virtual counterpart-BTOOOM! Can Ryouta still come out on top when he's playing for his life!?",
+                PageCount = 194,
+                LanguageISO = "en",
+                Notes = "Scraped metadata from Comixology [CMXDB450184]",
+                Series = "BTOOOM!",
+                Title = "v01",
+                Web = "https://www.comixology.com/BTOOOM/digital-comic/450184"
+            };
+
+            Assert.NotStrictEqual(expected, actual);
         }
     }
 }

API.Tests/Services/DirectoryServiceTests.cs

@@ -90,7 +90,7 @@ namespace API.Tests.Services
         }
 
         [Theory]
-        [InlineData(new string[] {"C:/Manga/"}, new string[] {"C:/Manga/Love Hina/Vol. 01.cbz"}, "C:/Manga/Love Hina")]
+        [InlineData(new [] {"C:/Manga/"}, new [] {"C:/Manga/Love Hina/Vol. 01.cbz"}, "C:/Manga/Love Hina")]
         public void FindHighestDirectoriesFromFilesTest(string[] rootDirectories, string[] folders, string expectedDirectory)
         {
             var actual = DirectoryService.FindHighestDirectoriesFromFiles(rootDirectories, folders);

API.Tests/Services/MetadataServiceTests.cs

@@ -1,13 +1,7 @@
 using System;
 using System.IO;
 using API.Entities;
-using API.Interfaces;
-using API.Interfaces.Services;
 using API.Services;
-using API.SignalR;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
-using NSubstitute;
 using Xunit;
 
 namespace API.Tests.Services