flaresolverr support

OnlyFart · Dec 7, 2024 · 16ff9d6 · 16ff9d6
1 parent 87b37e7
commit 16ff9d6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/Core/Configs/BookGetterConfig.cs b/Core/Configs/BookGetterConfig.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Core.Extensions;
 using Core.Misc.TempFolder;
+using FlareSolverrSharp;
 using Microsoft.Extensions.Logging;
 
 namespace Core.Configs; 
@@ -97,7 +98,20 @@ private static HttpClient GetClient(Options options, CookieContainer container,
             handler.UseProxy = true;
         }
 
+        if (!string.IsNullOrWhiteSpace(options.Flare)) {
+            var chandler = new ClearanceHandler(options.Flare) {
+                MaxTimeout = options.Timeout,
+                InnerHandler = handler
+            };
+
+            var cclient = new HttpClient(chandler);
+            cclient.Timeout = TimeSpan.FromSeconds(options.Timeout);
+
+            return cclient;
+        }
+
         var client = new HttpClient(handler);
+
         client.Timeout = TimeSpan.FromSeconds(options.Timeout);
 
         return client;

diff --git a/Core/Configs/Options.cs b/Core/Configs/Options.cs
@@ -26,6 +26,9 @@ public Options(IEnumerable<string> url) {
 
     [Option("proxy", Required = false, HelpText = "Прокси в формате <host>:<port>")]
     public string Proxy { get; set; }
+
+    [Option("flare", Required = false, HelpText = "Адрес flaresolverr")]
+    public string Flare { get; set; }
 
     [Option('s', "save", Required = false, HelpText = "Директория для сохранения книги")]
     public string SavePath { get; set; }

diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -11,6 +11,7 @@
     <ItemGroup>
         <PackageReference Include="AngleSharp" Version="1.1.2" />
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
+        <PackageReference Include="FlareSolverrSharp" Version="3.0.7" />
         <PackageReference Include="HtmlAgilityPack" Version="1.11.67" />
         <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
         <PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="8.0.0" />

diff --git a/Core/Logic/Getters/MangaMammyGetter.cs b/Core/Logic/Getters/MangaMammyGetter.cs
@@ -31,7 +31,7 @@ public override async Task<Book> Get(Uri url) {
             Chapters = await FillChapters(doc, url),
             Title = doc.GetTextBySelector("h1"),
             Author = GetAuthor(doc, url),
-            Annotation = doc.QuerySelector("div.manga-excerpt").InnerHtml
+            Annotation = doc.QuerySelector("div.manga-excerpt")?.InnerHtml
         };
 
         return book;