Skip to content

Commit 242f138

Browse files
basicx-StrgVbasicx-StrgV
committed
Moved some methods, that could be static, to new static helper classes, to improve the structure and remove redundancy; Added VS editor config file to make the code style consistent on every system
1 parent 960389c commit 242f138

File tree

9 files changed

+586
-263
lines changed

9 files changed

+586
-263
lines changed

‎src/.editorconfig‎

Lines changed: 244 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,244 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
#### Core EditorConfig Options ####
8+
9+
# Indentation and spacing
10+
indent_size = 4
11+
indent_style = space
12+
tab_width = 4
13+
14+
# New line preferences
15+
end_of_line = crlf
16+
insert_final_newline = false
17+
18+
#### .NET Code Actions ####
19+
20+
# Type members
21+
dotnet_hide_advanced_members = false
22+
dotnet_member_insertion_location = with_other_members_of_the_same_kind
23+
dotnet_property_generation_behavior = prefer_throwing_properties
24+
25+
# Symbol search
26+
dotnet_search_reference_assemblies = true
27+
28+
#### .NET Coding Conventions ####
29+
30+
# Organize usings
31+
dotnet_separate_import_directive_groups = false
32+
dotnet_sort_system_directives_first = false
33+
file_header_template = unset
34+
35+
# this. and Me. preferences
36+
dotnet_style_qualification_for_event = false
37+
dotnet_style_qualification_for_field = false
38+
dotnet_style_qualification_for_method = false
39+
dotnet_style_qualification_for_property = false
40+
41+
# Language keywords vs BCL types preferences
42+
dotnet_style_predefined_type_for_locals_parameters_members = true
43+
dotnet_style_predefined_type_for_member_access = true
44+
45+
# Parentheses preferences
46+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
47+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
48+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
49+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
50+
51+
# Modifier preferences
52+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
53+
54+
# Expression-level preferences
55+
dotnet_prefer_system_hash_code = true
56+
dotnet_style_coalesce_expression = true
57+
dotnet_style_collection_initializer = true
58+
dotnet_style_explicit_tuple_names = true
59+
dotnet_style_namespace_match_folder = false
60+
dotnet_style_null_propagation = true
61+
dotnet_style_object_initializer = true
62+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
63+
dotnet_style_prefer_auto_properties = true
64+
dotnet_style_prefer_collection_expression = when_types_loosely_match
65+
dotnet_style_prefer_compound_assignment = true
66+
dotnet_style_prefer_conditional_expression_over_assignment = true
67+
dotnet_style_prefer_conditional_expression_over_return = true
68+
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
69+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
70+
dotnet_style_prefer_inferred_tuple_names = true
71+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
72+
dotnet_style_prefer_simplified_boolean_expressions = true
73+
dotnet_style_prefer_simplified_interpolation = true
74+
75+
# Field preferences
76+
dotnet_style_readonly_field = true
77+
78+
# Parameter preferences
79+
dotnet_code_quality_unused_parameters = all
80+
81+
# Suppression preferences
82+
dotnet_remove_unnecessary_suppression_exclusions = none
83+
84+
# New line preferences
85+
dotnet_style_allow_multiple_blank_lines_experimental = true
86+
dotnet_style_allow_statement_immediately_after_block_experimental = true
87+
88+
#### C# Coding Conventions ####
89+
90+
# var preferences
91+
csharp_style_var_elsewhere = false
92+
csharp_style_var_for_built_in_types = false
93+
csharp_style_var_when_type_is_apparent = false
94+
95+
# Expression-bodied members
96+
csharp_style_expression_bodied_accessors = true
97+
csharp_style_expression_bodied_constructors = false
98+
csharp_style_expression_bodied_indexers = true
99+
csharp_style_expression_bodied_lambdas = true
100+
csharp_style_expression_bodied_local_functions = false
101+
csharp_style_expression_bodied_methods = false
102+
csharp_style_expression_bodied_operators = false
103+
csharp_style_expression_bodied_properties = true
104+
105+
# Pattern matching preferences
106+
csharp_style_pattern_matching_over_as_with_null_check = false
107+
csharp_style_pattern_matching_over_is_with_cast_check = false
108+
csharp_style_prefer_extended_property_pattern = true
109+
csharp_style_prefer_not_pattern = true
110+
csharp_style_prefer_pattern_matching = false
111+
csharp_style_prefer_switch_expression = true
112+
113+
# Null-checking preferences
114+
csharp_style_conditional_delegate_call = true
115+
116+
# Modifier preferences
117+
csharp_prefer_static_anonymous_function = true
118+
csharp_prefer_static_local_function = false
119+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
120+
csharp_style_prefer_readonly_struct = true
121+
csharp_style_prefer_readonly_struct_member = true
122+
123+
# Code-block preferences
124+
csharp_prefer_braces = true
125+
csharp_prefer_simple_using_statement = false
126+
csharp_prefer_system_threading_lock = true
127+
csharp_style_namespace_declarations = block_scoped
128+
csharp_style_prefer_method_group_conversion = true
129+
csharp_style_prefer_primary_constructors = true
130+
csharp_style_prefer_top_level_statements = false
131+
132+
# Expression-level preferences
133+
csharp_prefer_simple_default_expression = true
134+
csharp_style_deconstructed_variable_declaration = true
135+
csharp_style_implicit_object_creation_when_type_is_apparent = false
136+
csharp_style_inlined_variable_declaration = true
137+
csharp_style_prefer_index_operator = true
138+
csharp_style_prefer_local_over_anonymous_function = true
139+
csharp_style_prefer_null_check_over_type_check = true
140+
csharp_style_prefer_range_operator = true
141+
csharp_style_prefer_tuple_swap = true
142+
csharp_style_prefer_utf8_string_literals = true
143+
csharp_style_throw_expression = false
144+
csharp_style_unused_value_assignment_preference = discard_variable
145+
csharp_style_unused_value_expression_statement_preference = discard_variable
146+
147+
# 'using' directive preferences
148+
csharp_using_directive_placement = outside_namespace
149+
150+
# New line preferences
151+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
152+
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
153+
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
154+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
155+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
156+
157+
#### C# Formatting Rules ####
158+
159+
# New line preferences
160+
csharp_new_line_before_catch = true
161+
csharp_new_line_before_else = true
162+
csharp_new_line_before_finally = true
163+
csharp_new_line_before_members_in_anonymous_types = true
164+
csharp_new_line_before_members_in_object_initializers = true
165+
csharp_new_line_before_open_brace = all
166+
csharp_new_line_between_query_expression_clauses = true
167+
168+
# Indentation preferences
169+
csharp_indent_block_contents = true
170+
csharp_indent_braces = false
171+
csharp_indent_case_contents = true
172+
csharp_indent_case_contents_when_block = true
173+
csharp_indent_labels = one_less_than_current
174+
csharp_indent_switch_labels = true
175+
176+
# Space preferences
177+
csharp_space_after_cast = false
178+
csharp_space_after_colon_in_inheritance_clause = true
179+
csharp_space_after_comma = true
180+
csharp_space_after_dot = false
181+
csharp_space_after_keywords_in_control_flow_statements = true
182+
csharp_space_after_semicolon_in_for_statement = true
183+
csharp_space_around_binary_operators = before_and_after
184+
csharp_space_around_declaration_statements = false
185+
csharp_space_before_colon_in_inheritance_clause = true
186+
csharp_space_before_comma = false
187+
csharp_space_before_dot = false
188+
csharp_space_before_open_square_brackets = false
189+
csharp_space_before_semicolon_in_for_statement = false
190+
csharp_space_between_empty_square_brackets = false
191+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
192+
csharp_space_between_method_call_name_and_opening_parenthesis = false
193+
csharp_space_between_method_call_parameter_list_parentheses = false
194+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
195+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
196+
csharp_space_between_method_declaration_parameter_list_parentheses = false
197+
csharp_space_between_parentheses = false
198+
csharp_space_between_square_brackets = false
199+
200+
# Wrapping preferences
201+
csharp_preserve_single_line_blocks = true
202+
csharp_preserve_single_line_statements = true
203+
204+
#### Naming styles ####
205+
206+
# Naming rules
207+
208+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
209+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
210+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
211+
212+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
213+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
214+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
215+
216+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
217+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
218+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
219+
220+
# Symbol specifications
221+
222+
dotnet_naming_symbols.interface.applicable_kinds = interface
223+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
224+
dotnet_naming_symbols.interface.required_modifiers =
225+
226+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
227+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
228+
dotnet_naming_symbols.types.required_modifiers =
229+
230+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
231+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
232+
dotnet_naming_symbols.non_field_members.required_modifiers =
233+
234+
# Naming styles
235+
236+
dotnet_naming_style.pascal_case.required_prefix =
237+
dotnet_naming_style.pascal_case.required_suffix =
238+
dotnet_naming_style.pascal_case.word_separator =
239+
dotnet_naming_style.pascal_case.capitalization = pascal_case
240+
241+
dotnet_naming_style.begins_with_i.required_prefix = I
242+
dotnet_naming_style.begins_with_i.required_suffix =
243+
dotnet_naming_style.begins_with_i.word_separator =
244+
dotnet_naming_style.begins_with_i.capitalization = pascal_case

‎src/WGet.NET/Builder/WinGetDirectoryBuilder.cs‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System;
66
using System.IO;
77
using WGetNET.Abstractions;
8+
using WGetNET.Helper;
89

910
namespace WGetNET.Builder
1011
{
@@ -113,40 +114,12 @@ private void SetDirectoryInfo(string rawContent, bool hasShortenedContent)
113114
}
114115

115116
// Fallback for an incomplete directory path.
116-
_directoryInfo = new DirectoryInfo(TrimLastDirectory(path));
117+
_directoryInfo = new DirectoryInfo(PathHelper.TrimLastPathPart(path, PathHelper.PathType.Directory));
117118
}
118119
catch
119120
{
120121
_directoryInfo = null;
121122
}
122123
}
123-
124-
/// <summary>
125-
/// Removes the last directory from the given path.
126-
/// </summary>
127-
/// <param name="path">
128-
/// <see cref="System.String"/> containing the path that sould be trimed.
129-
/// </param>
130-
/// <returns>
131-
/// A <see cref="System.String"/> containing the trimed path.
132-
/// </returns>
133-
private string TrimLastDirectory(string path)
134-
{
135-
int lastSeparatorIndex = -1;
136-
for (int i = 0; i < path.Length; i++)
137-
{
138-
if (path[i].Equals(Path.DirectorySeparatorChar))
139-
{
140-
lastSeparatorIndex = i;
141-
}
142-
}
143-
144-
if (lastSeparatorIndex > -1)
145-
{
146-
return path.Remove(lastSeparatorIndex);
147-
}
148-
149-
return path;
150-
}
151124
}
152125
}

‎src/WGet.NET/Builder/WinGetLinkBuilder.cs‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//--------------------------------------------------//
55
using System;
66
using WGetNET.Abstractions;
7+
using WGetNET.Helper;
78

89
namespace WGetNET.Builder
910
{
@@ -97,36 +98,8 @@ private void SetUri(string rawContent, bool hasShortenedContent)
9798
}
9899

99100
// Fallback for an incomplete uri.
100-
Uri.TryCreate(TrimLastUriPart(rawContent), UriKind.Absolute, out Uri? shortenedUri);
101+
Uri.TryCreate(PathHelper.TrimLastPathPart(rawContent, PathHelper.PathType.URI), UriKind.Absolute, out Uri? shortenedUri);
101102
_url = shortenedUri;
102103
}
103-
104-
/// <summary>
105-
/// Removes the last part from the given URI.
106-
/// </summary>
107-
/// <param name="uri">
108-
/// <see cref="System.String"/> containing the URI that sould be trimed.
109-
/// </param>
110-
/// <returns>
111-
/// A <see cref="System.String"/> containing the trimed URI.
112-
/// </returns>
113-
private string TrimLastUriPart(string uri)
114-
{
115-
int lastSeparatorIndex = -1;
116-
for (int i = 0; i < uri.Length; i++)
117-
{
118-
if (uri[i].Equals('/'))
119-
{
120-
lastSeparatorIndex = i;
121-
}
122-
}
123-
124-
if (lastSeparatorIndex > -1)
125-
{
126-
return uri.Remove(lastSeparatorIndex);
127-
}
128-
129-
return uri;
130-
}
131104
}
132105
}

‎src/WGet.NET/Components/WinGet.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
// https://github.com/basicx-StrgV/ //
44
//--------------------------------------------------//
55
using System;
6+
using System.Collections.Generic;
67
using System.IO;
78
using System.Security;
9+
using System.Security.Principal;
810
using System.Threading;
911
using System.Threading.Tasks;
10-
using System.Security.Principal;
11-
using System.Collections.Generic;
12-
using WGetNET.Models;
13-
using WGetNET.Helper;
14-
using WGetNET.Parser;
1512
using WGetNET.Builder;
16-
using WGetNET.Exceptions;
1713
using WGetNET.Components.Internal;
14+
using WGetNET.Exceptions;
15+
using WGetNET.Helper;
16+
using WGetNET.Models;
17+
using WGetNET.Parser;
1818

1919
namespace WGetNET
2020
{

0 commit comments

Comments
 (0)