musicbeeremote · kelsos · Oct 3, 2023
diff --git a/firewall-utility/App.config b/firewall-utility/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
+    <startup>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>
diff --git a/firewall-utility/Program.cs b/firewall-utility/Program.cs
@@ -10,7 +10,7 @@
     /// <summary>
     ///     Firewall Utility
     /// </summary>
-    internal class Program
+    internal static class Program
     {
 
         /// <summary>
@@ -95,12 +95,10 @@ private static void Main(string[] args)
             if (args.Length == 2)
             {
                 var key = args[0];
-                int val;
-                int.TryParse(args[0 + 1], out val);
+                int.TryParse(args[0 + 1], out var val);
                 dictionary.Add(key, val);
 
-                int socketPort;
-                if (dictionary.TryGetValue(Socket, out socketPort))
+                if (dictionary.TryGetValue(Socket, out var socketPort))
                 {
                     CreateFirewallRuleForPort(socketPort, SocketRule);
                     return;

diff --git a/firewall-utility/firewall-utility.csproj b/firewall-utility/firewall-utility.csproj
@@ -1,83 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{48E9B838-6430-459B-9B44-D1E3548DF393}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>firewall_utility</RootNamespace>
-    <AssemblyName>firewall-utility</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
-    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <AssemblyVersionSettings>None.None.None.Increment</AssemblyVersionSettings>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\build\bin\firewall-utility\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseIntermediateOutputPath>..\build\obj\firewall-utility\</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\build\bin\firewall-utility\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseIntermediateOutputPath>..\build\obj\firewall-utility\</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="NetFwTypeLib">
-      <Guid>{58FBCF7C-E7A9-467C-80B3-FC65E8FCCA08}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{48E9B838-6430-459B-9B44-D1E3548DF393}</ProjectGuid>
+        <OutputType>Exe</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>firewall_utility</RootNamespace>
+        <AssemblyName>firewall-utility</AssemblyName>
+        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+        <FileAlignment>512</FileAlignment>
+        <AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
+        <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
+        <UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
+        <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
+        <AssemblyVersionSettings>None.None.None.Increment</AssemblyVersionSettings>
+        <TargetFrameworkProfile/>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>..\build\bin\firewall-utility\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+        <BaseIntermediateOutputPath>..\build\obj\firewall-utility\</BaseIntermediateOutputPath>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <DebugType>pdbonly</DebugType>
+        <Optimize>true</Optimize>
+        <OutputPath>..\build\bin\firewall-utility\Release\</OutputPath>
+        <DefineConstants>TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+        <BaseIntermediateOutputPath>..\build\obj\firewall-utility\</BaseIntermediateOutputPath>
+    </PropertyGroup>
+    <PropertyGroup/>
+    <ItemGroup>
+        <Reference Include="System"/>
+        <Reference Include="System.Core"/>
+        <Reference Include="System.Xml.Linq"/>
+        <Reference Include="System.Data.DataSetExtensions"/>
+        <Reference Include="Microsoft.CSharp"/>
+        <Reference Include="System.Data"/>
+        <Reference Include="System.Xml"/>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Include="Program.cs"/>
+        <Compile Include="Properties\AssemblyInfo.cs"/>
+    </ItemGroup>
+    <ItemGroup>
+        <None Include="App.config"/>
+    </ItemGroup>
+    <ItemGroup>
+        <COMReference Include="NetFwTypeLib">
+            <Guid>{58FBCF7C-E7A9-467C-80B3-FC65E8FCCA08}</Guid>
+            <VersionMajor>1</VersionMajor>
+            <VersionMinor>0</VersionMinor>
+            <Lcid>0</Lcid>
+            <WrapperTool>tlbimp</WrapperTool>
+            <Isolated>False</Isolated>
+            <EmbedInteropTypes>True</EmbedInteropTypes>
+        </COMReference>
+    </ItemGroup>
+    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
+    <ProjectExtensions>
+        <VisualStudio>
+            <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.None.Increment"/>
+        </VisualStudio>
+    </ProjectExtensions>
+    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+         Other similar extension points exist, see Microsoft.Common.targets.
+    <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+    </Target>
+    -->
 </Project>
diff --git a/plugin/AndroidRemote/Commands/CoverPayload.cs b/plugin/AndroidRemote/Commands/CoverPayload.cs
@@ -5,6 +5,10 @@ namespace MusicBeePlugin.AndroidRemote.Commands
     [DataContract]
     public class CoverPayload
     {
+        private const int CoverReady = 1;
+        private const int NotFound = 404;
+        private const int CoverAvailable = 200;
+
         public CoverPayload(string cover, bool include)
         {
             if (string.IsNullOrEmpty(cover))
@@ -25,16 +29,9 @@ public CoverPayload(string cover, bool include)
             }
         }
 
+        [DataMember(Name = "status")] public int Status { get; set; }
 
-        public const int CoverReady = 1;
-        public const int NotFound = 404;
-        public const int CoverAvailable = 200;
-
-        [DataMember(Name = "status")]
-        public int Status { get; set; }
-
-        [DataMember(Name = "cover")]
-        public string Cover { get; set; }
+        [DataMember(Name = "cover")] public string Cover { get; set; }
 
         public override string ToString()
         {

diff --git a/plugin/AndroidRemote/Commands/InstaReplies/HandlePong.cs b/plugin/AndroidRemote/Commands/InstaReplies/HandlePong.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using MusicBeePlugin.AndroidRemote.Interfaces;
 using NLog;
 

diff --git a/plugin/AndroidRemote/Commands/InstaReplies/PingReply.cs b/plugin/AndroidRemote/Commands/InstaReplies/PingReply.cs
@@ -1,6 +1,5 @@
-using System;
-using MusicBeePlugin.AndroidRemote.Entities;
-using MusicBeePlugin.AndroidRemote.Interfaces;
+using MusicBeePlugin.AndroidRemote.Interfaces;
+using MusicBeePlugin.AndroidRemote.Model.Entities;
 using MusicBeePlugin.AndroidRemote.Networking;
 
 namespace MusicBeePlugin.AndroidRemote.Commands.InstaReplies

diff --git a/plugin/AndroidRemote/Commands/InstaReplies/RequestCover.cs b/plugin/AndroidRemote/Commands/InstaReplies/RequestCover.cs
@@ -1,19 +1,14 @@
-using MusicBeePlugin.AndroidRemote.Utilities;
+using MusicBeePlugin.AndroidRemote.Interfaces;
+using MusicBeePlugin.AndroidRemote.Model;
+using MusicBeePlugin.AndroidRemote.Model.Entities;
+using MusicBeePlugin.AndroidRemote.Networking;
+using MusicBeePlugin.AndroidRemote.Utilities;
 using static MusicBeePlugin.AndroidRemote.Networking.Constants;
 
 namespace MusicBeePlugin.AndroidRemote.Commands.InstaReplies
 {
-    using Entities;
-    using Interfaces;
-    using Model;
-    using Networking;
-
     internal class RequestCover : ICommand
     {
-        public void Dispose()
-        {
-        }
-
         public void Execute(IEvent eEvent)
         {
             SocketMessage message;
@@ -27,6 +22,7 @@ public void Execute(IEvent eEvent)
             {
                 message = new SocketMessage(NowPlayingCover, LyricCoverModel.Instance.Cover);
             }
+
             SocketServer.Instance.Send(message.ToJsonString(), eEvent.ClientId);
         }
     }

diff --git a/plugin/AndroidRemote/Commands/InstaReplies/RequestLyrics.cs b/plugin/AndroidRemote/Commands/InstaReplies/RequestLyrics.cs
@@ -1,19 +1,9 @@
-using MusicBeePlugin.AndroidRemote.Utilities;
+using MusicBeePlugin.AndroidRemote.Interfaces;
 
 namespace MusicBeePlugin.AndroidRemote.Commands.InstaReplies
 {
-    using Entities;
-    using Model;
-    using Interfaces;
-    using Networking;
-
     internal class RequestLyrics : ICommand
     {
-        public void Dispose()
-        {
-
-        }
-
         public void Execute(IEvent eEvent)
         {
             Plugin.Instance.RequestNowPlayingTrackLyrics();

diff --git a/plugin/AndroidRemote/Commands/Internal/BroadcastEventAvailable.cs b/plugin/AndroidRemote/Commands/Internal/BroadcastEventAvailable.cs
@@ -1,17 +1,14 @@
-using MusicBeePlugin.AndroidRemote.Interfaces;
+using MusicBeePlugin.AndroidRemote.Events;
+using MusicBeePlugin.AndroidRemote.Interfaces;
 using MusicBeePlugin.AndroidRemote.Networking;
 
-namespace MusicBeePlugin.AndroidRemote
+namespace MusicBeePlugin.AndroidRemote.Commands.Internal
 {
     internal class BroadcastEventAvailable : ICommand
     {
         public void Execute(IEvent eEvent)
         {
-            var broadcastEvent = eEvent.Data as BroadcastEvent;
-            if (broadcastEvent != null)
-            {
-                SocketServer.Instance.Broadcast(broadcastEvent);
-            }
+            if (eEvent.Data is BroadcastEvent broadcastEvent) SocketServer.Instance.Broadcast(broadcastEvent);
         }
     }
 }
diff --git a/plugin/AndroidRemote/Commands/Internal/ClientConnected.cs b/plugin/AndroidRemote/Commands/Internal/ClientConnected.cs
@@ -3,16 +3,11 @@
 
 namespace MusicBeePlugin.AndroidRemote.Commands.Internal
 {
-    class ClientConnected:ICommand
+    internal class ClientConnected : ICommand
     {
-        public void Dispose()
-        {
-
-        }
-
         public void Execute(IEvent eEvent)
         {
             Authenticator.AddClientOnConnect(eEvent.ClientId);
         }
     }
-}
+}
diff --git a/plugin/AndroidRemote/Commands/Internal/ClientDisconnected.cs b/plugin/AndroidRemote/Commands/Internal/ClientDisconnected.cs
@@ -3,16 +3,11 @@
 
 namespace MusicBeePlugin.AndroidRemote.Commands.Internal
 {
-    class ClientDisconnected:ICommand
+    internal class ClientDisconnected : ICommand
     {
-        public void Dispose()
-        {
-
-        }
-
         public void Execute(IEvent eEvent)
         {
             Authenticator.RemoveClientOnDisconnect(eEvent.ClientId);
         }
     }
-}
+}
diff --git a/plugin/AndroidRemote/Commands/Internal/ForceClientDisconnect.cs b/plugin/AndroidRemote/Commands/Internal/ForceClientDisconnect.cs
@@ -1,18 +1,13 @@
-namespace MusicBeePlugin.AndroidRemote.Commands.Internal
-{
-    using Interfaces;
-    using Networking;
+using MusicBeePlugin.AndroidRemote.Interfaces;
+using MusicBeePlugin.AndroidRemote.Networking;
 
-    class ForceClientDisconnect:ICommand
+namespace MusicBeePlugin.AndroidRemote.Commands.Internal
+{
+    internal class ForceClientDisconnect : ICommand
     {
-        public void Dispose()
-        {
-
-        }
-
         public void Execute(IEvent eEvent)
         {
             SocketServer.Instance.KickClient(eEvent.ClientId);
         }
     }
-}
+}