Replaced --verbose logging option with --log-level option, file logging is now logging at the same level as console logs, file logging is now controlled via --log-save option, replaced CookieContainer with CookieCollection, downgraded PuppeteerSharp back to 6.2.0, updated UniversalDownloaderPlatform (HttpCookieClient)

Author: AlexCSDev

PatreonDownloader.App/Enums/LogLevel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PatreonDownloader.App.Enums
+{
+    internal enum LogLevel
+    {
+        Default,
+        Debug,
+        Trace
+    }
+}

PatreonDownloader.App/Models/CommandLineOptions.cs

@@ -1,4 +1,5 @@
 using CommandLine;
+using PatreonDownloader.App.Enums;
 using UniversalDownloaderPlatform.Common.Enums;
 
 namespace PatreonDownloader.App.Models
@@ -20,8 +21,8 @@ class CommandLineOptions
         [Option("download-directory", Required = false, HelpText = "Directory to save all downloaded files in, default: #AppDirectory#/downloads/#CreatorName#.")]
         public string DownloadDirectory { get; set; }
 
-        [Option("verbose", Required = false, HelpText = "Enable verbose (debug) logging", Default = false)]
-        public bool Verbose { get; set; }
+        [Option("log-level", Required = false, HelpText = "Logging level. Possible options: Default, Debug, Trace. Affects both console and file logging.", Default = LogLevel.Default)]
+        public LogLevel LogLevel { get; set; }
 
         [Option("overwrite-files", Required = false, HelpText = "Overwrite already existing files (recommended if creator might have files multiple files with the same filename or makes changes to already existing posts)", Default = false)]
         public bool OverwriteFiles { get; set; }

PatreonDownloader.App/NlogManager.cs

@@ -9,7 +9,7 @@ namespace PatreonDownloader.App
 {
     internal static class NLogManager
     {
-        public static void ReconfigureNLog(bool debug = false)
+        public static void ReconfigureNLog(Enums.LogLevel logLevel = Enums.LogLevel.Default)
         {
             LoggingConfiguration configuration = new LoggingConfiguration();
             ColoredConsoleTarget consoleTarget = new ColoredConsoleTarget("console")
@@ -25,9 +25,21 @@ public static void ReconfigureNLog(bool debug = false)
             };
             configuration.AddTarget(fileTarget);
 
-            configuration.AddRule(debug ? LogLevel.Debug : LogLevel.Info, LogLevel.Fatal, consoleTarget, debug ? "*" : "PatreonDownloader.App.*");
+            LogLevel nlogLogLevel = LogLevel.Info;
+            switch (logLevel)
+            {
+                case Enums.LogLevel.Debug:
+                    nlogLogLevel = LogLevel.Debug;
+                    break;
+                case Enums.LogLevel.Trace:
+                    nlogLogLevel = LogLevel.Trace;
+                    break;
+            }
+
+            configuration.AddRule(nlogLogLevel, LogLevel.Fatal, consoleTarget, nlogLogLevel != LogLevel.Info ? "*" : "PatreonDownloader.App.*");
+            configuration.AddRule(nlogLogLevel, LogLevel.Fatal, fileTarget, nlogLogLevel != LogLevel.Info ? "*" : "PatreonDownloader.App.*");
             //configuration.AddRule(debug ? LogLevel.Debug : LogLevel.Info, LogLevel.Fatal, consoleTarget, debug ? "*" : "PatreonDownloader.PuppeteerEngine.*");
-            configuration.AddRuleForAllLevels(fileTarget);
+            //configuration.AddRuleForAllLevels(fileTarget);
 
             LogManager.Configuration = configuration;
         }

PatreonDownloader.App/Program.cs

@@ -57,7 +57,7 @@ static async Task Main(string[] args)
             CommandLineOptions commandLineOptions = null;
             parserResult.WithParsed(options =>
             {
-                NLogManager.ReconfigureNLog(options.Verbose);
+                NLogManager.ReconfigureNLog(options.LogLevel);
                 commandLineOptions = options;
             });
 

PatreonDownloader.Common/Interfaces/ICaptchaSolver.cs

@@ -9,6 +9,6 @@ namespace PatreonDownloader.Common.Interfaces
 {
     public interface ICaptchaSolver
     {
-        Task<CookieContainer> SolveCaptcha(string url);
+        Task<CookieCollection> SolveCaptcha(string url);
     }
 }

PatreonDownloader.Implementation/PatreonWebDownloader.cs

@@ -88,14 +88,14 @@ private async Task<bool> SolveCaptchaAndUpdateCookies(string url)
             _logger.Warn("Captcha has been triggered, the browser window will be opened now. Please solve the captcha there.");
 
             PuppeteerCaptchaSolver captchaSolver = new PuppeteerCaptchaSolver(_proxyServerAddress);
-            CookieContainer cookies = await captchaSolver.SolveCaptcha(url);
+            CookieCollection cookieCollection = await captchaSolver.SolveCaptcha(url);
             captchaSolver.Dispose();
             captchaSolver = null;
 
-            if (cookies == null)
+            if (cookieCollection == null)
                 return false;
 
-            UpdateCookies(cookies);
+            UpdateCookies(cookieCollection);
 
             return true;
         }

PatreonDownloader.PuppeteerEngine/PatreonDownloader.PuppeteerEngine.csproj

@@ -9,7 +9,7 @@
     <PackageReference Include="Ninject" Version="3.3.6" />
     <PackageReference Include="ninject.extensions.conventions" Version="3.3.0" />
     <PackageReference Include="NLog" Version="5.0.0" />
-    <PackageReference Include="PuppeteerSharp" Version="7.0.0" />
+    <PackageReference Include="PuppeteerSharp" Version="6.2.0" />
   </ItemGroup>
 
   <ItemGroup>

PatreonDownloader.PuppeteerEngine/PuppeteerCaptchaSolver.cs

@@ -36,12 +36,11 @@ private async Task<IWebBrowser> RestartBrowser(bool headless)
             return await _puppeteerEngine.GetBrowser();
         }
 
-        public async Task<CookieContainer> SolveCaptcha(string url)
+        public async Task<CookieCollection> SolveCaptcha(string url)
         {
             try
             {
-                CookieContainer cookieContainer = new CookieContainer();
-
+                CookieCollection cookieCollection = new CookieCollection();
 
                 _logger.Debug("Calling captcha check");
                 try
@@ -69,7 +68,7 @@ public async Task<CookieContainer> SolveCaptcha(string url)
                     {
                         _logger.Debug($"Adding cookie: {browserCookie.Name}");
                         Cookie cookie = new Cookie(browserCookie.Name, browserCookie.Value, browserCookie.Path, browserCookie.Domain);
-                        cookieContainer.Add(cookie);
+                        cookieCollection.Add(cookie);
                     }
                 }
                 else
@@ -80,7 +79,7 @@ public async Task<CookieContainer> SolveCaptcha(string url)
 
                 await page.CloseAsync();
 
-                return cookieContainer;
+                return cookieCollection;
             }
             catch (TimeoutException ex)
             {

PatreonDownloader.PuppeteerEngine/PuppeteerEngine.cs

@@ -134,7 +134,7 @@ private async Task<IWebBrowser> StartLocalBrowser()
                 _logger.Debug("Launching browser");
 
                 List<string> browserArguments = new List<string>();
-                browserArguments.Add("--user-agent=\"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4889.0 Safari/537.36\"");
+                browserArguments.Add("--user-agent=\"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.0 Safari/537.36\"");
 
                 if(!string.IsNullOrWhiteSpace(_proxyServerAddress)) 
                     browserArguments.Add($"--proxy-server=\"{_proxyServerAddress}\"");