From 6b4617bab36087f41f06f282c86bf8057251cd21 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sat, 9 Jan 2021 14:57:31 -0600 Subject: [PATCH] Adjusted code to account for folders within directory. Now cover image always gets the first image. --- API.Tests/Services/ImageProviderTest.cs | 2 +- API/Entities/AppUserProgress.cs | 7 +++++++ API/Entities/MangaFormat.cs | 7 +++++++ API/IO/ImageProvider.cs | 7 +------ 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 API/Entities/AppUserProgress.cs create mode 100644 API/Entities/MangaFormat.cs diff --git a/API.Tests/Services/ImageProviderTest.cs b/API.Tests/Services/ImageProviderTest.cs index e7e393bfc..7395d51ec 100644 --- a/API.Tests/Services/ImageProviderTest.cs +++ b/API.Tests/Services/ImageProviderTest.cs @@ -12,7 +12,7 @@ namespace API.Tests.Services [Theory] [InlineData("v10.cbz", "v10.expected.jpg")] [InlineData("v10 - with folder.cbz", "v10 - with folder.expected.jpg")] - //[InlineData("v10 - nested folder.cbz", "v10 - nested folder.expected.jpg")] + [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"); diff --git a/API/Entities/AppUserProgress.cs b/API/Entities/AppUserProgress.cs new file mode 100644 index 000000000..d5a1cc367 --- /dev/null +++ b/API/Entities/AppUserProgress.cs @@ -0,0 +1,7 @@ +namespace API.Entities +{ + public class AppUserProgress + { + + } +} \ No newline at end of file diff --git a/API/Entities/MangaFormat.cs b/API/Entities/MangaFormat.cs new file mode 100644 index 000000000..e1a1f5df9 --- /dev/null +++ b/API/Entities/MangaFormat.cs @@ -0,0 +1,7 @@ +namespace API.Entities +{ + public enum MangaFormat + { + + } +} \ No newline at end of file diff --git a/API/IO/ImageProvider.cs b/API/IO/ImageProvider.cs index 9374ce9bf..9af4f06ca 100644 --- a/API/IO/ImageProvider.cs +++ b/API/IO/ImageProvider.cs @@ -26,18 +26,13 @@ namespace API.IO var folder = archive.Entries.SingleOrDefault(x => Path.GetFileNameWithoutExtension(x.Name).ToLower() == "folder"); - var entry = archive.Entries.OrderBy(x => x.FullName).ToList()[0]; + var entry = archive.Entries.Where(x => Path.HasExtension(x.FullName)).OrderBy(x => x.FullName).ToList()[0]; if (folder != null) { entry = folder; } - if (entry.FullName.EndsWith(Path.PathSeparator)) - { - // TODO: Implement nested directory support - } - if (createThumbnail) { try