Compare commits

..

No commits in common. 'master' and '2.0.4' have entirely different histories.

  1. 4
      Booru.Net.Tests/Booru.Net.Tests.csproj
  2. 6
      Booru.Net.Tests/Program.cs
  3. 9
      Booru.Net/Booru.Net.csproj
  4. 33
      Booru.Net/Clients/DanbooruClient.cs
  5. 39
      Booru.Net/Clients/E621Client.cs
  6. 33
      Booru.Net/Clients/GelbooruClient.cs
  7. 33
      Booru.Net/Clients/KonaChanClient.cs
  8. 37
      Booru.Net/Clients/RealbooruClient.cs
  9. 33
      Booru.Net/Clients/Rule34Client.cs
  10. 33
      Booru.Net/Clients/SafeBooruClient.cs
  11. 33
      Booru.Net/Clients/YandereClient.cs
  12. 13
      Booru.Net/Interfaces/IIndexBooruClient.cs
  13. 13
      Booru.Net/Interfaces/IPHPBooruClient.cs
  14. 13
      Booru.Net/Interfaces/IPostBooruClient.cs
  15. 13
      Booru.Net/Interfaces/IPostsBooruClient.cs
  16. 13
      Booru.Net/Interfaces/IPostsWrappedBooruClient.cs

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<AssemblyVersion>2020.4.28.0</AssemblyVersion> <AssemblyVersion>2020.4.10.0</AssemblyVersion>
<FileVersion>2020.4.28.0</FileVersion> <FileVersion>2020.4.10.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

@ -23,7 +23,7 @@ namespace Booru.Net.Tests
{ {
Console.WriteLine(client); Console.WriteLine(client);
List<string> tags = new List<string>{ "corona", "-cum" }; string[] tags = new[] { "corona" };
switch (client) switch (client)
{ {
@ -35,8 +35,8 @@ namespace Booru.Net.Tests
break; break;
case 1: case 1:
{ {
var posts = await new E621Client().GetImagesAsync(tags).ConfigureAwait(false); var p = await new E621Client().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.All(x => x.Tags.Any(z => z.Value.Any(y => tags.Contains(y))))); Console.WriteLine(p.Posts.All(x => x.Tags.Any(z => z.Value.Any(y => tags.Contains(y)))));
} }
break; break;
case 2: case 2:

@ -24,11 +24,11 @@ Yande.re</Description>
<PackageTags>booru imageboard api wrapper</PackageTags> <PackageTags>booru imageboard api wrapper</PackageTags>
<PackageLicenseUrl></PackageLicenseUrl> <PackageLicenseUrl></PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>2.0.5</Version> <Version>2.0.4</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<AssemblyVersion>2.0.5.0</AssemblyVersion> <AssemblyVersion>2.0.4.0</AssemblyVersion>
<FileVersion>2.0.5.0</FileVersion> <FileVersion>2.0.4.0</FileVersion>
<PackageReleaseNotes>Tags now work</PackageReleaseNotes> <PackageReleaseNotes>Fix E621 Tags</PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@ -46,6 +46,7 @@ Yande.re</Description>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="RestEase" Version="1.4.10" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup> </ItemGroup>

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,43 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class DanbooruClient : IDisposable public class DanbooruClient : IPostsBooruClient<DanbooruImage>, IDisposable
{ {
private readonly HttpClient _api; IPostsBooruClient<DanbooruImage> _api;
private readonly JsonSerializerSettings settings;
public DanbooruClient() public DanbooruClient()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://danbooru.donmai.us/") BaseAddress = new Uri("https://danbooru.donmai.us/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
_api = new RestClient(httpClient)
{
JsonSerializerSettings = settings
}.For<IPostsBooruClient<DanbooruImage>>();
} }
public Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(IEnumerable<string> tags) public Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(params string[] tags) public Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public async Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"posts.json?tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
return JsonConvert.DeserializeObject<IReadOnlyList<DanbooruImage>>(content, settings);
}
public void Dispose() public void Dispose()
{ {

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,45 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class E621Client : IDisposable public class E621Client : IPostsWrappedBooruClient<WrappedPosts<E621Image>>, IDisposable
{ {
private readonly HttpClient _api; IPostsWrappedBooruClient<WrappedPosts<E621Image>> _api;
private readonly JsonSerializerSettings settings;
public E621Client() public E621Client()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://e621.net/") BaseAddress = new Uri("https://e621.net/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
}
public Task<IReadOnlyList<E621Image>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags));
public Task<IReadOnlyList<E621Image>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags));
public async Task<IReadOnlyList<E621Image>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"posts.json?tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode) _api = new RestClient(httpClient)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\""); {
JsonSerializerSettings = settings
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false); }.For<IPostsWrappedBooruClient<WrappedPosts<E621Image>>>();
}
var posts = JsonConvert.DeserializeObject<WrappedPosts<E621Image>>(content, settings); public Task<WrappedPosts<E621Image>> GetImagesAsync(IEnumerable<string> tags)
=> _api.GetImagesAsync(tags);
return posts.Posts; public Task<WrappedPosts<E621Image>> GetImagesAsync(params string[] tags)
} => _api.GetImagesAsync(tags);
public void Dispose() public void Dispose()
{ {

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,43 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class GelbooruClient : IDisposable public class GelbooruClient : IPHPBooruClient<GelbooruImage>, IDisposable
{ {
private readonly HttpClient _api; IPHPBooruClient<GelbooruImage> _api;
private readonly JsonSerializerSettings settings;
public GelbooruClient() public GelbooruClient()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://gelbooru.com/") BaseAddress = new Uri("https://gelbooru.com/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
_api = new RestClient(httpClient)
{
JsonSerializerSettings = settings
}.For<IPHPBooruClient<GelbooruImage>>();
} }
public Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(IEnumerable<string> tags) public Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(params string[] tags) public Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public async Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
return JsonConvert.DeserializeObject<IReadOnlyList<GelbooruImage>>(content, settings);
}
public void Dispose() public void Dispose()
{ {

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,43 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class KonaChanClient : IDisposable public class KonaChanClient : IPostBooruClient<KonaChanImage>, IDisposable
{ {
private readonly HttpClient _api; IPostBooruClient<KonaChanImage> _api;
private readonly JsonSerializerSettings settings;
public KonaChanClient() public KonaChanClient()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://konachan.com/") BaseAddress = new Uri("https://konachan.com/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
_api = new RestClient(httpClient)
{
JsonSerializerSettings = settings
}.For<IPostBooruClient<KonaChanImage>>();
} }
public Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(IEnumerable<string> tags) public Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(params string[] tags) public Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public async Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"post.json?tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
return JsonConvert.DeserializeObject<IReadOnlyList<KonaChanImage>>(content, settings);
}
public void Dispose() public void Dispose()
{ {

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,43 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class RealbooruClient : IDisposable public class RealbooruClient : IPHPBooruClient<RealbooruImage>, IDisposable
{ {
HttpClient _api; IPHPBooruClient<RealbooruImage> _api;
JsonSerializerSettings settings;
public RealbooruClient() public RealbooruClient()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://realbooru.com/") BaseAddress = new Uri("https://realbooru.com/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
}
public Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags));
public Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags));
public async Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode) _api = new RestClient(httpClient)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\""); {
JsonSerializerSettings = settings
}.For<IPHPBooruClient<RealbooruImage>>();
}
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false); public async Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(IEnumerable<string> tags)
=> await _api.GetImagesAsync(tags).ConfigureAwait(false);
return JsonConvert.DeserializeObject<IReadOnlyList<RealbooruImage>>(content, settings); public async Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(params string[] tags)
} => await _api.GetImagesAsync(tags).ConfigureAwait(false);
public void Dispose() public void Dispose()
{ {

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,43 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class Rule34Client : IDisposable public class Rule34Client : IPHPBooruClient<Rule34Image>, IDisposable
{ {
private readonly HttpClient _api; IPHPBooruClient<Rule34Image> _api;
private readonly JsonSerializerSettings settings;
public Rule34Client() public Rule34Client()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://rule34.xxx/") BaseAddress = new Uri("https://rule34.xxx/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
_api = new RestClient(httpClient)
{
JsonSerializerSettings = settings
}.For<IPHPBooruClient<Rule34Image>>();
} }
public Task<IReadOnlyList<Rule34Image>> GetImagesAsync(IEnumerable<string> tags) public Task<IReadOnlyList<Rule34Image>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public Task<IReadOnlyList<Rule34Image>> GetImagesAsync(params string[] tags) public Task<IReadOnlyList<Rule34Image>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public async Task<IReadOnlyList<Rule34Image>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
return JsonConvert.DeserializeObject<IReadOnlyList<Rule34Image>>(content, settings);
}
public void Dispose() public void Dispose()
{ {

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,43 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class SafebooruClient : IDisposable public class SafebooruClient : IPHPBooruClient<SafebooruImage>, IDisposable
{ {
private readonly HttpClient _api; IPHPBooruClient<SafebooruImage> _api;
private readonly JsonSerializerSettings settings;
public SafebooruClient() public SafebooruClient()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://safebooru.org/") BaseAddress = new Uri("https://safebooru.org/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
_api = new RestClient(httpClient)
{
JsonSerializerSettings = settings
}.For<IPHPBooruClient<SafebooruImage>>();
} }
public Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(IEnumerable<string> tags) public Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(params string[] tags) public Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public async Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
return JsonConvert.DeserializeObject<IReadOnlyList<SafebooruImage>>(content, settings);
}
public void Dispose() public void Dispose()
{ {

@ -1,4 +1,5 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using RestEase;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
@ -6,43 +7,35 @@ using System.Threading.Tasks;
namespace Booru.Net namespace Booru.Net
{ {
public class YandereClient : IDisposable public class YandereClient : IPostBooruClient<YandereImage>, IDisposable
{ {
private readonly HttpClient _api; IPostBooruClient<YandereImage> _api;
private readonly JsonSerializerSettings settings;
public YandereClient() public YandereClient()
{ {
_api = new HttpClient var httpClient = new HttpClient
{ {
BaseAddress = new Uri("https://yande.re/") BaseAddress = new Uri("https://yande.re/")
}; };
_api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)"); httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
{ {
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}; };
_api = new RestClient(httpClient)
{
JsonSerializerSettings = settings
}.For<IPostBooruClient<YandereImage>>();
} }
public Task<IReadOnlyList<YandereImage>> GetImagesAsync(IEnumerable<string> tags) public Task<IReadOnlyList<YandereImage>> GetImagesAsync(IEnumerable<string> tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public Task<IReadOnlyList<YandereImage>> GetImagesAsync(params string[] tags) public Task<IReadOnlyList<YandereImage>> GetImagesAsync(params string[] tags)
=> GetImagesAsync(string.Join("%20", tags)); => _api.GetImagesAsync(tags);
public async Task<IReadOnlyList<YandereImage>> GetImagesAsync(string tags)
{
var get = await _api.GetAsync($"post.json?tags={tags}").ConfigureAwait(false);
if (!get.IsSuccessStatusCode)
throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
return JsonConvert.DeserializeObject<IReadOnlyList<YandereImage>>(content, settings);
}
public void Dispose() public void Dispose()
{ {

@ -0,0 +1,13 @@
using RestEase;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Booru.Net
{
public interface IIndexBooruClient<T> : IDisposable
{
[Get("index.json")]
public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
}
}

@ -0,0 +1,13 @@
using RestEase;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Booru.Net
{
public interface IPHPBooruClient<T> : IDisposable
{
[Get("index.php?page=dapi&s=post&q=index&json=1")]
public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
}
}

@ -0,0 +1,13 @@
using RestEase;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Booru.Net
{
public interface IPostBooruClient<T> : IDisposable
{
[Get("post.json")]
public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
}
}

@ -0,0 +1,13 @@
using RestEase;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Booru.Net
{
public interface IPostsBooruClient<T> : IDisposable
{
[Get("posts.json")]
public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
}
}

@ -0,0 +1,13 @@
using RestEase;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Booru.Net
{
public interface IPostsWrappedBooruClient<T> : IDisposable
{
[Get("posts.json")]
public Task<T> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
}
}
Loading…
Cancel
Save