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

Fix E621 Null

Browse Source
This commit is contained in:
exsersewo
2020-03-28 14:13:17 +00:00
parent ed236340cd
commit c1e7e93ed7
6 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File 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.25.0</AssemblyVersion>
<FileVersion>2020.3.25.0</FileVersion>
<AssemblyVersion>2020.3.29.0</AssemblyVersion>
<FileVersion>2020.3.29.0</FileVersion>
</PropertyGroup>
<ItemGroup>

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

@@ -32,7 +32,7 @@ namespace Booru.Net.Tests
break;
case 1:
var p = await new E621Client().GetImagesAsync().ConfigureAwait(false);
Console.WriteLine(p.Posts.All(x => x != null));
Console.WriteLine(p.Posts.Any(x => x.ImageUrl != null));
break;
case 2:
posts = await new GelbooruClient().GetImagesAsync().ConfigureAwait(false);
@@ -56,7 +56,7 @@ namespace Booru.Net.Tests
if (posts != null)
{
Console.WriteLine(posts.All(x => x.ImageUrl != null));
Console.WriteLine(posts.Any(x => x.ImageUrl != null));
}
}
catch(Exception ex)

6
Booru.Net/Booru.Net.csproj
View File

@@ -26,9 +26,9 @@ Yande.re</Description>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>2.0.3</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<AssemblyVersion>2.0.3.0</AssemblyVersion>
<FileVersion>2.0.3.0</FileVersion>
<PackageReleaseNotes>Readded DanBooruImage#Score from Inheritence Rework</PackageReleaseNotes>
<AssemblyVersion>2020.3.0.0</AssemblyVersion>
<FileVersion>2020.3.0.0</FileVersion>
<PackageReleaseNotes>Fix some null ref issues with images</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

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

@@ -12,12 +12,26 @@ 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; }
public IReadOnlyList<Dictionary<string, List<string>>> Tags { get { return PTags.AsReadOnly(); } }
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; }
}
}