Skip to content

Commit

Permalink
merge: Branch 'devel'.
Browse files Browse the repository at this point in the history
  • Loading branch information
Starciad committed Jan 31, 2024
2 parents 5a1b2b7 + 8eea79e commit 6643f92
Show file tree
Hide file tree
Showing 36 changed files with 904 additions and 357 deletions.
187 changes: 187 additions & 0 deletions src/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
root = true

[*.cs]

indent_size = 4
indent_style = space
tab_width = 4

end_of_line = crlf
insert_final_newline = false

dotnet_separate_import_directive_groups = true
dotnet_sort_system_directives_first = false
file_header_template = unset

dotnet_style_qualification_for_event = true
dotnet_style_qualification_for_field = true
dotnet_style_qualification_for_method = false
dotnet_style_qualification_for_property = true

dotnet_style_predefined_type_for_locals_parameters_members = true
dotnet_style_predefined_type_for_member_access = true

dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_operators = always_for_clarity
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity

dotnet_style_require_accessibility_modifiers = for_non_interface_members

dotnet_style_coalesce_expression = true
dotnet_style_collection_initializer = true
dotnet_style_explicit_tuple_names = true
dotnet_style_namespace_match_folder = true
dotnet_style_null_propagation = true
dotnet_style_object_initializer = true
dotnet_style_operator_placement_when_wrapping = beginning_of_line
dotnet_style_prefer_auto_properties = false
dotnet_style_prefer_compound_assignment = true
dotnet_style_prefer_conditional_expression_over_assignment = true
dotnet_style_prefer_conditional_expression_over_return = true
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
dotnet_style_prefer_inferred_anonymous_type_member_names = true
dotnet_style_prefer_inferred_tuple_names = true
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
dotnet_style_prefer_simplified_boolean_expressions = true
dotnet_style_prefer_simplified_interpolation = true

dotnet_style_readonly_field = true

dotnet_code_quality_unused_parameters = all

dotnet_remove_unnecessary_suppression_exclusions = none

dotnet_style_allow_multiple_blank_lines_experimental = false
dotnet_style_allow_statement_immediately_after_block_experimental = false

csharp_style_var_elsewhere = false
csharp_style_var_for_built_in_types = false
csharp_style_var_when_type_is_apparent = false

csharp_style_expression_bodied_accessors = true
csharp_style_expression_bodied_constructors = false
csharp_style_expression_bodied_indexers = true
csharp_style_expression_bodied_lambdas = false
csharp_style_expression_bodied_local_functions = false
csharp_style_expression_bodied_methods = false
csharp_style_expression_bodied_operators = false
csharp_style_expression_bodied_properties = true

csharp_style_pattern_matching_over_as_with_null_check = true
csharp_style_pattern_matching_over_is_with_cast_check = true
csharp_style_prefer_extended_property_pattern = true
csharp_style_prefer_not_pattern = true
csharp_style_prefer_pattern_matching = false
csharp_style_prefer_switch_expression = true

csharp_style_conditional_delegate_call = true

csharp_prefer_static_local_function = false
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
csharp_style_prefer_readonly_struct = true
csharp_style_prefer_readonly_struct_member = true

csharp_prefer_braces = true
csharp_prefer_simple_using_statement = true
csharp_style_namespace_declarations = block_scoped
csharp_style_prefer_method_group_conversion = true
csharp_style_prefer_primary_constructors = true
csharp_style_prefer_top_level_statements = false

csharp_prefer_simple_default_expression = false
csharp_style_deconstructed_variable_declaration = true
csharp_style_implicit_object_creation_when_type_is_apparent = true
csharp_style_inlined_variable_declaration = true
csharp_style_prefer_index_operator = true
csharp_style_prefer_local_over_anonymous_function = true
csharp_style_prefer_null_check_over_type_check = true
csharp_style_prefer_range_operator = true
csharp_style_prefer_tuple_swap = true
csharp_style_prefer_utf8_string_literals = true
csharp_style_throw_expression = true
csharp_style_unused_value_assignment_preference = discard_variable
csharp_style_unused_value_expression_statement_preference = discard_variable

csharp_using_directive_placement = outside_namespace

csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
csharp_style_allow_embedded_statements_on_same_line_experimental = true

csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_open_brace = all
csharp_new_line_between_query_expression_clauses = true

csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = false
csharp_indent_labels = one_less_than_current
csharp_indent_switch_labels = true

csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case
24 changes: 16 additions & 8 deletions src/R34Sharp.Experimental/Program.cs
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
using R34Sharp;
using R34Sharp.Entities.Posts;
using R34Sharp.Enums;
using R34Sharp.Models;
using R34Sharp.Search;

namespace R34Sharp.Experimental
{
internal static class Program
{
private static string AssetsDirectory => Path.Combine(Directory.GetCurrentDirectory(), "R34Assets");

private static R34ApiClient _client = new();
private static readonly R34ApiClient _client = new();

[MTAThread]
private static async Task Main() {
private static async Task Main()
{

if (!Directory.Exists(AssetsDirectory))
{
Directory.CreateDirectory(AssetsDirectory);
_ = Directory.CreateDirectory(AssetsDirectory);
}

R34PostsSearchBuilder searchBuilder = new() {
R34PostsSearchBuilder searchBuilder = new()
{
Limit = 100,
Tags = new R34TagModel[]
Tags = new R34FormattedTag[]
{
new("Bara"),
},
Expand All @@ -28,15 +33,18 @@ private static async Task Main() {
Console.WriteLine(" [ STARTING ] ");
Console.WriteLine($"Path: {AssetsDirectory}");

R34Posts posts = await _client.Posts.GetPostsByFilterAsync(searchBuilder, x => x.FileType == R34FileType.Image);
Console.WriteLine($"Request Completed!");

int count = 0;
foreach (R34Post post in (await _client.Posts.GetPostsByFilterAsync(searchBuilder, x => x.Rating == R34Rating.Questionable)).Data)
foreach (R34Post post in posts.Data)
{
using MemoryStream ms = await post.DownloadFileAsync();
byte[] r34FileByteArray = ms.ToArray();

await File.WriteAllBytesAsync(Path.Combine(AssetsDirectory, $"{post.FileName}{post.FileExtension}"), r34FileByteArray);

Console.WriteLine($"File #{count} Donwloaded! ({(r34FileByteArray.Length / (Math.Pow(1024, 2))).ToString("0.###")}mb)");
Console.WriteLine($"File #{count} Donwloaded! ({r34FileByteArray.Length / Math.Pow(1024, 2):0.###}mb)");
count++;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
namespace R34Sharp.Tests
using R34Sharp.Entities.Posts;
using R34Sharp.Enums;
using R34Sharp.Models;
using R34Sharp.Search;

namespace R34Sharp.Tests.Posts
{
public class R34PostsTest
public class R34PostsTests
{
private static readonly R34ApiClient _client = new();
private static readonly R34TagModel[] tagsPrefab = new R34TagModel[]
private static readonly R34FormattedTag[] tagsPrefab = new R34FormattedTag[]
{
new("Little Mac"),
};
private static readonly R34TagModel[] blockedTagsPrefab = new R34TagModel[]
private static readonly R34FormattedTag[] blockedTagsPrefab = new R34FormattedTag[]
{
new("Looking At Viewer"),
};
Expand All @@ -32,9 +37,9 @@ public async Task Filter_All_Posts_To_Get_Videos_Async()
Limit = 1000,
Tags = tagsPrefab

}, x => x.FileType == FileType.Video);
}, x => x.FileType == R34FileType.Video);

Assert.All(posts.Data, x => Assert.True(x.FileType == FileType.Video));
Assert.All(posts.Data, x => Assert.True(x.FileType == R34FileType.Video));
}

[Fact]
Expand All @@ -44,7 +49,7 @@ public async Task Blocking_Posts_That_Contain_Certain_Tags_Async()
{
Limit = 1000,
Tags = tagsPrefab,
BlockedTags = new(blockedTagsPrefab)
BlockedTags = blockedTagsPrefab,
});

Assert.All(posts.Data, x => Assert.False(x.HasTag(new("Looking At Viewer"))));
Expand All @@ -53,18 +58,18 @@ public async Task Blocking_Posts_That_Contain_Certain_Tags_Async()
[Fact]
public async Task Block_Requests_Outside_The_Limit_Range_Async()
{
await Assert.ThrowsAnyAsync<Exception>(async () =>
_ = await Assert.ThrowsAnyAsync<Exception>(async () =>
{
await _client.Posts.GetPostsAsync(new()
_ = await _client.Posts.GetPostsAsync(new()
{
Limit = 0,
Tags = tagsPrefab
});
});

await Assert.ThrowsAnyAsync<Exception>(async () =>
_ = await Assert.ThrowsAnyAsync<Exception>(async () =>
{
await _client.Posts.GetPostsAsync(new()
_ = await _client.Posts.GetPostsAsync(new()
{
Limit = 1001,
Tags = tagsPrefab
Expand All @@ -75,12 +80,12 @@ await _client.Posts.GetPostsAsync(new()
[Fact]
public async Task Block_Requests_Without_Tags_Async()
{
await Assert.ThrowsAnyAsync<Exception>(async () =>
_ = await Assert.ThrowsAnyAsync<Exception>(async () =>
{
await _client.Posts.GetPostsAsync(new()
_ = await _client.Posts.GetPostsAsync(new()
{
Limit = 0,
Tags = Array.Empty<R34TagModel>()
Tags = Array.Empty<R34FormattedTag>()
});
});
}
Expand Down
48 changes: 48 additions & 0 deletions src/R34Sharp.Tests/Search/R34CommentsSearchBuilderTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
using R34Sharp.Search;

namespace R34Sharp.Tests.Search
{
public sealed class R34CommentsSearchBuilderTests
{
[Fact]
public void Constructor_DefaultValues_Success()
{
// Arrange
R34CommentsSearchBuilder searchBuilder = new();

// Act & Assert
Assert.Equal(0ul, searchBuilder.PostId);
}

[Fact]
public void WithId_ValidValue_ReturnsBuilderWithId()
{
// Arrange
R34CommentsSearchBuilder searchBuilder = new();

// Act
R34CommentsSearchBuilder result = searchBuilder.WithId(42);

// Assert
Assert.Equal(42ul, searchBuilder.PostId);
Assert.Same(searchBuilder, result);
}

[Theory]
[InlineData(0)]
[InlineData(1)]
[InlineData(999)]
public void WithId_SetValidValues_Success(ulong id)
{
// Arrange
R34CommentsSearchBuilder searchBuilder = new();

// Act
R34CommentsSearchBuilder result = searchBuilder.WithId(id);

// Assert
Assert.Equal(id, searchBuilder.PostId);
Assert.Same(searchBuilder, result);
}
}
}
Loading

0 comments on commit 6643f92

Please sign in to comment.