Some code cleanup

Author: Splamy

.editorconfig

@@ -8,12 +8,63 @@ insert_final_newline = true
 charset = utf-8
 
 [*.cs]
+# General Formatting
 indent_style = tab
 indent_size = tab
 tab_width = 4
 trim_trailing_whitespace = true
 
+#### .NET Coding Conventions ####
+
+# Organize usings
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = false
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = false:silent
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_property = false:silent
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+# var preferences
+csharp_style_var_elsewhere = false:silent
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = true:suggestion
+
+# Expression-bodied members
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_properties = true:silent
+
+# Expression-level preferences
+csharp_style_inlined_variable_declaration = true:suggestion
+
+# 'using' directive preferences
+csharp_using_directive_placement = outside_namespace:suggestion
+
+#### C# Formatting Rules ####
+
+# Indentation preferences
 csharp_indent_switch_labels = false
 
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+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_parameter_list_parentheses = false
+
+# Wrapping preferences
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
 [*.{tt,ttinclude}]
 insert_final_newline = false

TS3ABotUnitTests/TS3ABotUnitTests.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup>
 
   <ItemGroup>

TS3AudioBot.ruleset

@@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		appveyor.yml = appveyor.yml
 		GitVersion.yml = GitVersion.yml
 		README.md = README.md
-		TS3AudioBot.ruleset = TS3AudioBot.ruleset
 	EndProjectSection
 EndProject
 Global

TS3AudioBot.sln

@@ -522,10 +522,10 @@ private void EnableIdleTickWorker()
 				return;
 			}
 			idleTickWorker.Interval = idleTime;
-			idleTickWorker.Active = true;
+			idleTickWorker.Enable();
 		}
 
-		private void DisableIdleTickWorker() => idleTickWorker.Active = false;
+		private void DisableIdleTickWorker() => idleTickWorker.Disable();
 
 		#endregion
 

TS3AudioBot/Bot.cs

@@ -100,7 +100,7 @@ private void UpdateMeta()
 		public void StartTimer(bool upload)
 		{
 			uploadParamEnabled = upload;
-			ticker.Active = true;
+			ticker.Enable();
 		}
 
 		private async Task SendStats(StatsPing sendPacket)

TS3AudioBot/Environment/Stats.cs

@@ -7,15 +7,15 @@
 // You should have received a copy of the Open Software License along with this
 // program. If not, see <https://opensource.org/licenses/OSL-3.0>.
 
+using Newtonsoft.Json;
 using System;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using TS3AudioBot.Localization;
-using System.Net.Http.Headers;
-using Newtonsoft.Json;
-using System.Linq;
 
 namespace TS3AudioBot.Helper
 {

TS3AudioBot/Helper/WebWrapper.cs

@@ -7,11 +7,11 @@
 // You should have received a copy of the Open Software License along with this
 // program. If not, see <https://opensource.org/licenses/OSL-3.0>.
 
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
 namespace TS3AudioBot.ResourceFactories
 {
-	using System.Collections.Generic;
-	using System.Threading.Tasks;
-
 	public interface ISearchResolver : IResolver
 	{
 		Task<IList<AudioResource>> Search(ResolveContext ctx, string keyword);

TS3AudioBot/ResourceFactories/ISearchResolver.cs

@@ -7,13 +7,11 @@
 // You should have received a copy of the Open Software License along with this
 // program. If not, see <https://opensource.org/licenses/OSL-3.0>.
 
-using Heijden.DNS;
 using PlaylistsNET.Content;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
 using TS3AudioBot.Config;
 using TS3AudioBot.Helper;
@@ -66,18 +64,18 @@ public async Task<PlayResource> GetResourceById(ResolveContext ctx, AudioResourc
 
 		public string RestoreLink(ResolveContext _, AudioResource resource) => resource.ResourceId;
 
-		private async Task<ResData> ValidateFromString(ConfBot config, string uriStr)
+		private Task<ResData> ValidateFromString(ConfBot config, string uriStr)
 		{
 			var uri = GetUri(config, uriStr);
-			return await ValidateUri(uri);
+			return ValidateUri(uri);
 		}
 
-		private async Task<ResData> ValidateUri(Uri uri)
+		private Task<ResData> ValidateUri(Uri uri)
 		{
 			if (uri.IsWeb())
-				return await ValidateWeb(uri);
+				return ValidateWeb(uri);
 			if (uri.IsFile())
-				return ValidateFile(uri);
+				return Task.Run(() => ValidateFile(uri));
 
 			throw Error.LocalStr(strings.error_media_invalid_uri);
 		}
@@ -211,11 +209,8 @@ public async Task<Playlist> GetPlaylist(ResolveContext ctx, string url)
 			{
 				if (uri.IsFile())
 				{
-					if (File.Exists(url))
-					{
-						using var stream = File.OpenRead(uri.AbsolutePath);
-						return await GetPlaylistContentAsync(stream, url);
-					}
+					using var stream = File.OpenRead(uri.AbsolutePath);
+					return await GetPlaylistContentAsync(stream, url);
 				}
 				else if (uri.IsWeb())
 				{
@@ -252,15 +247,6 @@ private Playlist GetPlaylistContent(Stream stream, string url, string? mime = nu
 			switch (anyId)
 			{
 			case ".m3u":
-				{
-					var parser = new M3uContent();
-					var list = parser.GetFromStream(stream);
-
-					items = new List<PlaylistItem>(
-						from e in list.PlaylistEntries
-						select new PlaylistItem(new AudioResource(e.Path, e.Title, ResolverFor)));
-					break;
-				}
 			case ".m3u8":
 			case "application/mpegurl":
 			case "application/x-mpegurl":
@@ -269,7 +255,7 @@ from e in list.PlaylistEntries
 			case "application/vnd.apple.mpegurl":
 			case "application/vnd.apple.mpegurl.audio":
 				{
-					var parser = new M3u8Content();
+					var parser = new M3uContent();
 					var list = parser.GetFromStream(stream);
 
 					items = new List<PlaylistItem>(

TS3AudioBot/ResourceFactories/MediaResolver.cs

@@ -7,8 +7,6 @@
 // You should have received a copy of the Open Software License along with this
 // program. If not, see <https://opensource.org/licenses/OSL-3.0>.
 
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Globalization;
 using System.IO;