Update

jerry08 · Oct 4, 2024 · a0fba63 · a0fba63
1 parent 5279efa
commit a0fba63
Show file tree

Hide file tree

Showing 10 changed files with 136 additions and 21 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>1.4.3</Version>
+    <Version>1.4.4</Version>
     <Company>Berry</Company>
     <Copyright>Copyright (C) Jerry Berry</Copyright>
     <LangVersion>latest</LangVersion>

diff --git a/Juro.Core/Juro.Core.csproj b/Juro.Core/Juro.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 

diff --git a/Juro.Extractors/Juro.Extractors.csproj b/Juro.Extractors/Juro.Extractors.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 

diff --git a/Juro.Providers.Adult/Juro.Providers.Adult.csproj b/Juro.Providers.Adult/Juro.Providers.Adult.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 

diff --git a/Juro.Providers/Juro.Providers.csproj b/Juro.Providers/Juro.Providers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net8.0</TargetFrameworks>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <IsPackable>true</IsPackable>
   </PropertyGroup>

diff --git a/Juro.WebApi/Controllers/Anime/AnimeController.cs b/Juro.WebApi/Controllers/Anime/AnimeController.cs
@@ -0,0 +1,10 @@
+using Juro.Providers.Anime;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Juro.WebApi.Controllers.Anime;
+
+[ApiController]
+[Route("api/[controller]")]
+public class AnimeController(Gogoanime provider) : GogoanimeController(provider)
+{
+}
diff --git a/Juro.WebApi/Controllers/Manga/MangaController.cs b/Juro.WebApi/Controllers/Manga/MangaController.cs
@@ -0,0 +1,10 @@
+using Juro.Providers.Manga;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Juro.WebApi.Controllers.Manga;
+
+[ApiController]
+[Route("api/[controller]")]
+public class MangaController(Mangadex provider) : MangadexController(provider)
+{
+}
diff --git a/Juro/Clients/AnimeApiClient.cs b/Juro/Clients/AnimeApiClient.cs
@@ -21,7 +21,7 @@ public class AnimeApiClient(string baseUrl, IHttpClientFactory httpClientFactory
 
     public string BaseUrl { get; set; } = baseUrl;
 
-    public string ProviderKey { get; set; } = "Gogoanime";
+    public string ProviderKey { get; set; } = "Anime";
 
     /// <summary>
     /// Initializes an instance of <see cref="AnimeApiClient"/>.
@@ -36,30 +36,17 @@ public AnimeApiClient(string baseUrl)
         : this(baseUrl, Http.ClientProvider) { }
 
     public async ValueTask<List<Provider>> GetProvidersAsync(
-        ProviderType type,
         CancellationToken cancellationToken = default
     )
     {
         var response = await _http.ExecuteAsync(
-            $"{BaseUrl}/Providers?type={type}",
+            $"{BaseUrl}/Providers?type={(int)ProviderType.Anime}",
             cancellationToken: cancellationToken
         );
 
         return JsonSerializer.Deserialize<List<Provider>>(response, _options)!;
     }
 
-    public async ValueTask<Provider> GetDefaultProviderAsync(
-        CancellationToken cancellationToken = default
-    )
-    {
-        var response = await _http.ExecuteAsync(
-            $"{BaseUrl}/Providers",
-            cancellationToken: cancellationToken
-        );
-
-        return JsonSerializer.Deserialize<Provider>(response, _options)!;
-    }
-
     public async ValueTask<IAnimeInfo> GetAsync(
         string id,
         CancellationToken cancellationToken = default

diff --git a/Juro/Clients/MangaApiClient.cs b/Juro/Clients/MangaApiClient.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using System.Threading;
+using System.Threading.Tasks;
+using Juro.Core;
+using Juro.Core.Models;
+using Juro.Core.Models.Manga;
+using Juro.Core.Utils;
+using Juro.Core.Utils.Extensions;
+
+namespace Juro.Clients;
+
+public class MangaApiClient(string baseUrl, IHttpClientFactory httpClientFactory)
+{
+    private readonly HttpClient _http = httpClientFactory.CreateClient();
+    private readonly JsonSerializerOptions _options =
+        new()
+        {
+            PropertyNameCaseInsensitive = true,
+            TypeInfoResolver = new DefaultJsonTypeInfoResolver
+            {
+                Modifiers =
+                {
+                    static typeInfo =>
+                    {
+                        if (typeInfo.Type == typeof(IMangaInfo))
+                            typeInfo.CreateObject = () => new MangaInfo();
+                        else if (typeInfo.Type == typeof(IMangaResult))
+                            typeInfo.CreateObject = () => new MangaResult();
+                        else if (typeInfo.Type == typeof(IMangaChapter))
+                            typeInfo.CreateObject = () => new MangaChapter();
+                        else if (typeInfo.Type == typeof(IMangaChapterPage))
+                            typeInfo.CreateObject = () => new MangaChapterPage();
+                    },
+                },
+            },
+        };
+
+    public string BaseUrl { get; set; } = baseUrl;
+
+    public string ProviderKey { get; set; } = "MangaPill";
+
+    /// <summary>
+    /// Initializes an instance of <see cref="MangaApiClient"/>.
+    /// </summary>
+    public MangaApiClient(string baseUrl, Func<HttpClient> httpClientProvider)
+        : this(baseUrl, new HttpClientFactory(httpClientProvider)) { }
+
+    /// <summary>
+    /// Initializes an instance of <see cref="MangaApiClient"/>.
+    /// </summary>
+    public MangaApiClient(string baseUrl)
+        : this(baseUrl, Http.ClientProvider) { }
+
+    public async ValueTask<List<Provider>> GetProvidersAsync(
+        CancellationToken cancellationToken = default
+    )
+    {
+        var response = await _http.ExecuteAsync(
+            $"{BaseUrl}/Providers?type={(int)ProviderType.Manga}",
+            cancellationToken: cancellationToken
+        );
+
+        return JsonSerializer.Deserialize<List<Provider>>(response, _options)!;
+    }
+
+    public async ValueTask<IMangaInfo> GetAsync(
+        string id,
+        CancellationToken cancellationToken = default
+    )
+    {
+        var response = await _http.ExecuteAsync(
+            $"{BaseUrl}/{ProviderKey}/{Uri.EscapeDataString(id)}",
+            cancellationToken: cancellationToken
+        );
+
+        return JsonSerializer.Deserialize<IMangaInfo>(response, _options)!;
+    }
+
+    public async ValueTask<List<IMangaResult>> SearchAsync(
+        string query,
+        CancellationToken cancellationToken = default
+    )
+    {
+        var response = await _http.ExecuteAsync(
+            $"{BaseUrl}/{ProviderKey}/Search?q={Uri.EscapeDataString(query)}",
+            cancellationToken: cancellationToken
+        );
+
+        return JsonSerializer.Deserialize<List<IMangaResult>>(response, _options) ?? [];
+    }
+
+    public async ValueTask<List<IMangaChapterPage>> GetChapterPagesAsync(
+        string id,
+        CancellationToken cancellationToken = default
+    )
+    {
+        var response = await _http.ExecuteAsync(
+            $"{BaseUrl}/{ProviderKey}/ChapterPages/{Uri.EscapeDataString(id)}",
+            cancellationToken: cancellationToken
+        );
+
+        return JsonSerializer.Deserialize<List<IMangaChapterPage>>(response, _options) ?? [];
+    }
+}
diff --git a/Juro/Juro.csproj b/Juro/Juro.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>