SettingsHelper -> SharedSettings. Move GetPageString there.

ToofDerling · Dec 31, 2022 · d26d601 · d26d601
1 parent 1feca18
commit d26d601
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 28 deletions.
diff --git a/Source/AzwConverter/AzwSettings.cs b/Source/AzwConverter/AzwSettings.cs
@@ -1,13 +1,13 @@
 using CbzMage.Shared.Extensions;
-using CbzMage.Shared.Helpers;
+using CbzMage.Shared;
 
 namespace AzwConverter
 {
     public class AzwSettings
     {
         public static Settings Settings => new();
 
-        private readonly SettingsHelper _settingsHelper = new();
+        private readonly SharedSettings _settingsHelper = new();
 
         public void CreateSettings()
         {

diff --git a/Source/AzwConverter/CbzState.cs b/Source/AzwConverter/CbzState.cs
@@ -15,10 +15,5 @@ public sealed class CbzState
         public DateTime? Checked { get; set; }
 
         public CbzState? Changed { get; set; }
-
-        public string PageName()
-        {
-            return $"page-{Pages.ToString().PadLeft(4, '0')}.jpg";
-        }
     }
 }
diff --git a/Source/AzwConverter/Engine/ConvertEngine.cs b/Source/AzwConverter/Engine/ConvertEngine.cs
@@ -1,4 +1,5 @@
-using MobiMetadata;
+using CbzMage.Shared;
+using MobiMetadata;
 using System.IO.Compression;
 using System.IO.MemoryMappedFiles;
 
@@ -98,7 +99,7 @@ private async Task<CbzState> ReadAndCompressPagesAsync(ZipArchive zipArchive, Pa
             for (int i = 0, sz = sdImageRecords.ContentRecords.Count; i < sz; i++)
             {
                 state.Pages++;
-                var pageName = state.PageName();
+                var pageName = SharedSettings.GetPageString(state.Pages);
 
                 if (hdImageRecords != null)
                 {

diff --git a/.../CbzMage.Shared/Helpers/SettingsHelper.cs → Source/CbzMage.Shared/SharedSettings.cs b/.../CbzMage.Shared/Helpers/SettingsHelper.cs → Source/CbzMage.Shared/SharedSettings.cs
@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 
-namespace CbzMage.Shared.Helpers
+namespace CbzMage.Shared
 {
-    public class SettingsHelper
+    public class SharedSettings
     {
         private const string _mainSettings = "CbzMageSettings";
 
@@ -34,7 +34,7 @@ public int GetThreadCount(int settingsThreadCount)
             if (settingsThreadCount <= 0)
             {
                 var threadCountFraction = Environment.ProcessorCount * fraction;
-                
+
                 var calculatedThreadCount = Convert.ToInt32(threadCountFraction);
 
                 calculatedThreadCount = Math.Min(calculatedThreadCount, maxThreads);
@@ -45,5 +45,11 @@ public int GetThreadCount(int settingsThreadCount)
 
             return settingsThreadCount;
         }
+
+        public static string GetPageString(int pageNumber)
+        {
+            var page = pageNumber.ToString().PadLeft(4, '0');
+            return $"page-{page}.jpg";
+        }
     }
 }
diff --git a/Source/PdfConverter/PageCompressor.cs b/Source/PdfConverter/PageCompressor.cs
@@ -1,4 +1,5 @@
-using CbzMage.Shared.Buffers;
+using CbzMage.Shared;
+using CbzMage.Shared.Buffers;
 using CbzMage.Shared.Helpers;
 using CbzMage.Shared.Jobs;
 using PdfConverter.Jobs;
@@ -131,7 +132,7 @@ private void OnImagesCompressed(JobEventArgs<IEnumerable<string>> eventArgs)
 
         private bool AddCompressorJob()
         {
-            var key = _pdf.GetPageString(_nextPageNumber);
+            var key = SharedSettings.GetPageString(_nextPageNumber);
 
             var firstPage = _nextPageNumber == 1;
 
@@ -143,7 +144,7 @@ private bool AddCompressorJob()
 
                 _pageNumbers.TryDequeue(out _nextPageNumber);
 
-                key = _pdf.GetPageString(_nextPageNumber);
+                key = SharedSettings.GetPageString(_nextPageNumber);
             }
 
             if (imageList.Count > 0)

diff --git a/Source/PdfConverter/PageConverter.cs b/Source/PdfConverter/PageConverter.cs
@@ -1,4 +1,5 @@
-using CbzMage.Shared.Buffers;
+using CbzMage.Shared;
+using CbzMage.Shared.Buffers;
 using CbzMage.Shared.Jobs;
 using PdfConverter.Ghostscript;
 using PdfConverter.Jobs;
@@ -46,7 +47,7 @@ public void HandleImageData(ArrayPoolBufferWriter<byte> bufferWriter)
                 return;
             }
             var pageNumber = _pageQueue.Dequeue();
-            var page = _pdf.GetPageString(pageNumber);
+            var page = SharedSettings.GetPageString(pageNumber);
 
             var job = new ImageConverterJob(bufferWriter , _convertedPages, page, _resizeHeight);
             _converterExecutor.AddJob(job);

diff --git a/Source/PdfConverter/Pdf.cs b/Source/PdfConverter/Pdf.cs
@@ -13,12 +13,6 @@ public Pdf(string path)
 
         public int ImageCount { get; set; }
 
-        public string GetPageString(int pageNumber)
-        {
-            var page = pageNumber.ToString().PadLeft(4, '0');
-            return $"page-{page}.jpg";
-        }
-
         public static List<Pdf> List(params string[] paths)
         {
             return new List<Pdf>(paths.Select(x => new Pdf(x)));

diff --git a/Source/PdfConverter/PdfConverter.cs b/Source/PdfConverter/PdfConverter.cs
@@ -12,7 +12,7 @@ public void ConvertFileOrDirectory(string path)
         {
             var config = new PdfSettings();
             config.CreateSettings();
-    
+
             if (Settings.GhostscriptVersion != null)
             {
                 Console.WriteLine($"Ghostscript version: {Settings.GhostscriptVersion}");
@@ -75,11 +75,22 @@ private void ConvertPdf(Pdf pdf, ConverterEngine converter)
 
         private List<Pdf> InitializePdfPath(string path)
         {
-            path ??= Environment.CurrentDirectory;
+            var scanAllDirectories = false;
+            if (path.EndsWith(Settings.ScanAllDirectoriesPattern))
+            {
+                scanAllDirectories = true;
+                path = path.Replace(Settings.ScanAllDirectoriesPattern, null);
+            }
+
+            if (string.IsNullOrEmpty(path))
+            {
+                path = Environment.CurrentDirectory;
+            }
 
             if (Directory.Exists(path))
             {
-                var files = Directory.GetFiles(path, "*.pdf");
+                var files = Directory.GetFiles(path, "*.pdf",
+                    scanAllDirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
                 if (files.Length > 0)
                 {
                     return Pdf.List(files.ToArray());

diff --git a/Source/PdfConverter/PdfSettings.cs b/Source/PdfConverter/PdfSettings.cs
@@ -1,4 +1,5 @@
-using CbzMage.Shared.AppVersions;
+using CbzMage.Shared;
+using CbzMage.Shared.AppVersions;
 using CbzMage.Shared.Extensions;
 using CbzMage.Shared.Helpers;
 using System.Diagnostics;
@@ -9,7 +10,7 @@ public class PdfSettings
     {
         public static Settings Settings => new();
 
-        private readonly SettingsHelper _settingsHelper = new();
+        private readonly SharedSettings _settingsHelper = new();
 
         public void CreateSettings()
         {

diff --git a/Source/PdfConverter/Settings.cs b/Source/PdfConverter/Settings.cs
@@ -41,5 +41,7 @@ public static void SetGhostscriptVersion(Version version)
         }
 
         public static int WriteBufferSize => 262144;
+
+        public static string ScanAllDirectoriesPattern => $"{Path.DirectorySeparatorChar}**";
     }
 }