exsersewo/Booru.Net
1
0
Fork 0
Code Issues Pull Requests Projects Releases 6 Wiki Activity

Compare commits

base: exsersewo:2.0.2
Branches Tags
exsersewo:master
exsersewo:2.0.5 exsersewo:2.0.4 exsersewo:2.0.3 exsersewo:2.0.2.0 exsersewo:2.0.2 exsersewo:2.0.1 exsersewo:2.0.0.0
..
compare: exsersewo:2.0.4
Branches Tags
exsersewo:master
exsersewo:2.0.5 exsersewo:2.0.4 exsersewo:2.0.3 exsersewo:2.0.2.0 exsersewo:2.0.2 exsersewo:2.0.1 exsersewo:2.0.0.0

6 Commits
2.0.2 ... 2.0.4

Author SHA1 Message Date
exsersewo
e8a1391a38 Verbump 2020-04-04 00:17:28 +01:00
exsersewo
8492bc994e Fix E621Tags 2020-04-04 00:16:18 +01:00
exsersewo
c1e7e93ed7 Fix E621 Null 2020-03-28 14:13:17 +00:00
exsersewo
ed236340cd Fix Null Refs with ImageUrl 2020-03-28 13:58:59 +00:00
exsersewo
f2d21dc411 Merge branch 'master' of https://github.com/exsersewo/Booru.Net 2020-03-28 13:14:42 +00:00
exsersewo
7266a2162d Readded DanBooruImage#Score 2020-03-28 13:13:51 +00:00
10 changed files with 132 additions and 45 deletions
Expand all files Collapse all files

4
Booru.Net.Tests/Booru.Net.Tests.csproj
View File

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

52
Booru.Net.Tests/Program.cs
View File

@@ -21,43 +21,61 @@ namespace Booru.Net.Tests
{
try
{
IEnumerable<BooruImage> posts = null;
Console.WriteLine(client);
switch(client)
string[] tags = new[] { "corona" };
switch (client)
{
case 0:
posts = await new DanbooruClient().GetImagesAsync().ConfigureAwait(false);
{
var posts = await new DanbooruClient().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.Any(x => x.Tags.Any(z=>tags.Contains(z) != null)));
}
break;
case 1:
var p = await new E621Client().GetImagesAsync().ConfigureAwait(false);
Console.WriteLine(p.Posts.All(x => x != null));
{
var p = await new E621Client().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(p.Posts.All(x => x.Tags.Any(z => z.Value.Any(y => tags.Contains(y)))));
}
break;
case 2:
posts = await new GelbooruClient().GetImagesAsync().ConfigureAwait(false);
{
var posts = await new GelbooruClient().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.Any(x => x.Tags.Any(z => tags.Contains(z) != null)));
}
break;
case 3:
posts = await new KonaChanClient().GetImagesAsync().ConfigureAwait(false);
{
var posts = await new KonaChanClient().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.Any(x => x.Tags.Any(z => tags.Contains(z) != null)));
}
break;
case 4:
posts = await new RealbooruClient().GetImagesAsync().ConfigureAwait(false);
{
var posts = await new RealbooruClient().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.Any(x => x.Tags.Any(z => tags.Contains(z) != null)));
}
break;
case 5:
posts = await new Rule34Client().GetImagesAsync().ConfigureAwait(false);
{
var posts = await new Rule34Client().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.Any(x => x.Tags.Any(z => tags.Contains(z) != null)));
}
break;
case 6:
posts = await new SafebooruClient().GetImagesAsync().ConfigureAwait(false);
{
var posts = await new SafebooruClient().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.Any(x => x.Tags.Any(z => tags.Contains(z) != null)));
}
break;
case 7:
posts = await new YandereClient().GetImagesAsync().ConfigureAwait(false);
{
var posts = await new YandereClient().GetImagesAsync(tags).ConfigureAwait(false);
Console.WriteLine(posts.Any(x => x.Tags.Any(z => tags.Contains(z) != null)));
}
break;
}
if (posts != null)
{
Console.WriteLine(posts.All(x => x != null));
}
}
catch(Exception ex)
{

8
Booru.Net/Booru.Net.csproj
View File

@@ -24,11 +24,11 @@ Yande.re</Description>
<PackageTags>booru imageboard api wrapper</PackageTags>
<PackageLicenseUrl></PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>2.0.1</Version>
<Version>2.0.4</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<AssemblyVersion>2.0.1.0</AssemblyVersion>
<FileVersion>2.0.1.0</FileVersion>
<PackageReleaseNotes>Fix a few fields not being visible on E621Image#Score</PackageReleaseNotes>
<AssemblyVersion>2.0.4.0</AssemblyVersion>
<FileVersion>2.0.4.0</FileVersion>
<PackageReleaseNotes>Fix E621 Tags</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

21
Booru.Net/Converters/TagGroupConverter.cs
View File

@@ -2,6 +2,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Booru.Net.Converters
{
@@ -16,25 +17,11 @@ namespace Booru.Net.Converters
{
var token = JToken.Load(reader);
List<Dictionary<string, List<string>>> container = new List<Dictionary<string, List<string>>>();
Dictionary<string, List<string>> container = new Dictionary<string, List<string>>();
foreach(var el in token.Children<JObject>())
foreach(JProperty el in token.Values<JProperty>())
{
Dictionary<string, List<string>> att = new Dictionary<string, List<string>>();
foreach (JProperty prop in el.Properties())
{
List<string> children = new List<string>();
foreach(var child in prop.Value.Children())
{
children.Add(child.Value<string>());
}
att.Add(prop.Name, children);
break;
}
container.Add(att);
container.Add(el.Name, el.Value.Values<string>().ToList());
}
return container;

11
Booru.Net/Models/Boards/DanBooruImage.cs
View File

@@ -4,7 +4,16 @@ using System.Collections.Generic;
namespace Booru.Net
{
public class DanbooruImage : BooruImage
{
{
[JsonProperty("score")]
public int? Score { get; set; }
[JsonProperty("file_url")]
private string FileUrl { get; set; }
public override string ImageUrl
=> FileUrl;
[JsonProperty("tag_string")]
private string TagString { get; set; }

18
Booru.Net/Models/Boards/E621Image.cs
View File

@@ -12,11 +12,25 @@ namespace Booru.Net
[JsonProperty("directory")]
public string Directory { get; set; }
[JsonProperty("file")]
public E621ImageSource File { get; set; }
[JsonProperty("preview")]
public E621ImageSource PreviewImage { get; set; }
[JsonProperty("sample")]
public E621ImageSource SampleImage { get; set; }
[JsonProperty("flags")]
public E621ImageFlags Flags { get; set; }
[JsonProperty("tags")]
[JsonConverter(typeof(TagGroupConverter))]
private List<Dictionary<string, List<string>>> PTags { get; set; }
private Dictionary<string, List<string>> PTags { get; set; }
public IReadOnlyList<Dictionary<string, List<string>>> Tags { get { return PTags.AsReadOnly(); } }
public IReadOnlyDictionary<string, List<string>> Tags { get { return PTags; } }
public override string ImageUrl => File.Url;
public override string PostUrl { get { return "https://e621.net/post/show/" + ID; } }
}

25
Booru.Net/Models/Boards/E621ImageFlags.cs Normal file
View File

@@ -0,0 +1,25 @@
using Newtonsoft.Json;
namespace Booru.Net
{
public class E621ImageFlags
{
[JsonProperty("pending")]
public bool Pending { get; private set; }
[JsonProperty("flagged")]
public bool Flagged { get; private set; }
[JsonProperty("note_locked")]
public bool NoteLocked { get; private set; }
[JsonProperty("status_locked")]
public bool StatusLocked { get; private set; }
[JsonProperty("rating_locked")]
public bool RatingLocked { get; private set; }
[JsonProperty("deleted")]
public bool Deleted { get; private set; }
}
}

28
Booru.Net/Models/Boards/E621ImageSource.cs Normal file
View File

@@ -0,0 +1,28 @@
using Newtonsoft.Json;
namespace Booru.Net
{
public class E621ImageSource
{
[JsonProperty("width")]
public int Width { get; private set; }
[JsonProperty("height")]
public int Height { get; private set; }
[JsonProperty("ext")]
public string Extension { get; private set; }
[JsonProperty("size")]
public ulong Size { get; private set; }
[JsonProperty("has")]
public bool Has { get; private set; }
[JsonProperty("md5")]
public string MD5 { get; private set; }
[JsonProperty("url")]
public string Url { get; private set; }
}
}

6
Booru.Net/Models/Boards/GelbooruImage.cs
View File

@@ -11,6 +11,12 @@ namespace Booru.Net
[JsonProperty("directory")]
public string Directory { get; set; }
[JsonProperty("file_url")]
private string FileUrl { get; set; }
public override string ImageUrl
=> FileUrl;
[JsonProperty("tags")]
private string Ptags { get; set; }

4
Booru.Net/Models/BooruImage.cs
View File

@@ -10,9 +10,9 @@ namespace Booru.Net
[JsonProperty("rating")]
private string Prating { get; set; }
public virtual string ImageUrl { get; set; }
public virtual string ImageUrl { get; private set; }
public virtual string PostUrl { get; set; }
public virtual string PostUrl { get; private set; }
public Rating Rating
{