Merge pull request jwallet#287 from jwallet/fixture

code cleanup and fixed form being closed twice
A-SunsetMkt-Forks · Dec 27, 2020 · 605036e · 605036e
2 parents 386e2ad + 13a3b2c
commit 605036e
Show file tree

Hide file tree

Showing 51 changed files with 188 additions and 285 deletions.
diff --git a/EspionSpotify/AudioSessions/AudioMMDevicesManager.cs b/EspionSpotify/AudioSessions/AudioMMDevicesManager.cs
@@ -1,11 +1,7 @@
-using Microsoft.Win32.SafeHandles;
-using NAudio.CoreAudioApi;
+using NAudio.CoreAudioApi;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.AudioSessions
 {
@@ -19,8 +15,9 @@ public class AudioMMDevicesManager : NAudio.CoreAudioApi.Interfaces.IMMNotificat
         public MMDeviceEnumerator AudioMMDevices { get; private set; }
         public string AudioEndPointDeviceID { get; private set; }
         public string DefaultAudioEndPointDeviceID { get; private set; }
-
-        public MMDevice AudioEndPointDevice {
+
+        public MMDevice AudioEndPointDevice
+        {
             get
             {
                 return AudioMMDevices.GetDevice(AudioEndPointDeviceNames.ContainsKey(AudioEndPointDeviceID)
@@ -111,7 +108,7 @@ public void OnPropertyValueChanged(string deviceId, PropertyKey propertyKey) { }
         public void Dispose()
         {
             Dispose(true);
- 
+
             GC.SuppressFinalize(this);
         }
 

diff --git a/EspionSpotify/AudioSessions/MainAudioSession.cs b/EspionSpotify/AudioSessions/MainAudioSession.cs
@@ -21,16 +21,17 @@ public class MainAudioSession : IMainAudioSession, IDisposable
 
         public MMDeviceEnumerator AudioMMDevices { get; private set; }
         public AudioMMDevicesManager AudioMMDevicesManager { get; private set; }
-        public int AudioDeviceVolume { get => (int)(AudioMMDevicesManager.AudioEndPointDevice.AudioEndpointVolume.MasterVolumeLevelScalar * 100);  }
+        public int AudioDeviceVolume { get => (int)(AudioMMDevicesManager.AudioEndPointDevice.AudioEndpointVolume.MasterVolumeLevelScalar * 100); }
         public bool IsAudioEndPointDeviceIndexAvailable { get => AudioMMDevicesManager.AudioEndPointDeviceNames.ContainsKey(AudioMMDevicesManager.AudioEndPointDeviceID); }
 
         public ICollection<AudioSessionControl> SpotifyAudioSessionControls { get; private set; } = new List<AudioSessionControl>();
         public void ClearSpotifyAudioSessionControls() => SpotifyAudioSessionControls = new List<AudioSessionControl>();
 
         private SessionCollection GetSessionsAudioEndPointDevice => AudioMMDevicesManager.GetAudioEndPointDeviceSessions;
 
-        internal MainAudioSession(string audioEndPointDevice):
-            this(audioEndPointDevice, processManager: new ProcessManager()) { }
+        internal MainAudioSession(string audioEndPointDevice) :
+            this(audioEndPointDevice, processManager: new ProcessManager())
+        { }
 
         public MainAudioSession(string audioEndPointDeviceID, IProcessManager processManager)
         {
@@ -206,7 +207,7 @@ private async Task<bool> IsSpotifyPlayingOutsideDefaultAudioEndPoint(bool runnin
         public void Dispose()
         {
             Dispose(true);
-            
+
             GC.SuppressFinalize(this);
         }
 

diff --git a/EspionSpotify/Constants.cs b/EspionSpotify/Constants.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EspionSpotify
+namespace EspionSpotify
 {
     public static class Constants
     {

diff --git a/EspionSpotify/Controls/MetroComboBox.cs b/EspionSpotify/Controls/MetroComboBox.cs
@@ -3,7 +3,7 @@
 
 namespace EspionSpotify.Controls
 {
-    public class MetroComboBox: MetroFramework.Controls.MetroComboBox
+    public class MetroComboBox : MetroFramework.Controls.MetroComboBox
     {
         protected override void OnMouseWheel(MouseEventArgs e)
         {

diff --git a/EspionSpotify/Controls/MetroCredentialsForm.cs b/EspionSpotify/Controls/MetroCredentialsForm.cs
@@ -33,7 +33,7 @@ public FrmSpotifyAPICredentials(Analytics analytics)
             txtSecretId.Text = Settings.Default.SpotifyAPISecretId?.Trim();
 
             Text = FrmEspionSpotify.Instance.Rm.GetString(I18nKeys.TitleSpotifyAPICredentials);
-            
+
             lblClientId.Text = FrmEspionSpotify.Instance.Rm.GetString(I18nKeys.LblClientId);
             lblSecretId.Text = FrmEspionSpotify.Instance.Rm.GetString(I18nKeys.LblSecretId);
 
@@ -103,7 +103,9 @@ private void InitializeComponent()
             this.txtClientId.MaxLength = 32;
             this.txtClientId.Name = "txtClientId";
             this.txtClientId.PasswordChar = '\0';
+#pragma warning disable CS0618 // Type or member is obsolete
             this.txtClientId.PromptText = "PASTE_KEY_ID_HERE";
+#pragma warning restore CS0618 // Type or member is obsolete
             this.txtClientId.ScrollBars = System.Windows.Forms.ScrollBars.None;
             this.txtClientId.SelectedText = "";
             this.txtClientId.SelectionLength = 0;
@@ -144,7 +146,9 @@ private void InitializeComponent()
             this.txtSecretId.MaxLength = 32;
             this.txtSecretId.Name = "txtSecretId";
             this.txtSecretId.PasswordChar = '\0';
+#pragma warning disable CS0618 // Type or member is obsolete
             this.txtSecretId.PromptText = "PASTE_KEY_ID_HERE";
+#pragma warning restore CS0618 // Type or member is obsolete
             this.txtSecretId.ScrollBars = System.Windows.Forms.ScrollBars.None;
             this.txtSecretId.SelectedText = "";
             this.txtSecretId.SelectionLength = 0;

diff --git a/EspionSpotify/Controls/MetroTrackBar.cs b/EspionSpotify/Controls/MetroTrackBar.cs
@@ -2,7 +2,7 @@
 
 namespace EspionSpotify.Controls
 {
-    public class MetroTrackBar: MetroFramework.Controls.MetroTrackBar
+    public class MetroTrackBar : MetroFramework.Controls.MetroTrackBar
     {
         protected override void OnMouseWheel(MouseEventArgs e)
         {

diff --git a/EspionSpotify/Drivers/AudioVirtualCableDriver.cs b/EspionSpotify/Drivers/AudioVirtualCableDriver.cs
@@ -1,11 +1,7 @@
-using NAudio.CoreAudioApi;
-using System;
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.Drivers
 {
@@ -21,7 +17,7 @@ public static bool ExistsInAudioEndPointDevices(IDictionary<string, string> audi
         {
             return audioEndPointDeviceNames.Any(x => x.Value.Contains(DriverName));
         }
-        
+
         public static bool SetupDriver()
         {
             try

diff --git a/EspionSpotify/Enums/RecordRecordingsStatus.cs b/EspionSpotify/Enums/RecordRecordingsStatus.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EspionSpotify.Enums
+namespace EspionSpotify.Enums
 {
     public enum RecordRecordingsStatus
     {

diff --git a/EspionSpotify/Enums/TitleSeparatorType.cs b/EspionSpotify/Enums/TitleSeparatorType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EspionSpotify.Enums
+namespace EspionSpotify.Enums
 {
     public enum TitleSeparatorType
     {

diff --git a/EspionSpotify/Enums/WaveFormatMP3Restriction.cs b/EspionSpotify/Enums/WaveFormatMP3Restriction.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EspionSpotify.Enums
+namespace EspionSpotify.Enums
 {
     public enum WaveFormatMP3Restriction
     {

diff --git a/EspionSpotify/Extensions/ClassPropertyExtensions.cs b/EspionSpotify/Extensions/ClassPropertyExtensions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EspionSpotify.Extensions
+namespace EspionSpotify.Extensions
 {
     public static class ClassPropertyExtensions
     {
@@ -21,7 +15,7 @@ public static void CopyAllTo<TSource, TTarget>(this TSource source, TTarget targ
                 {
                     if (!childProperty.CanWrite || !parentProperty.CanRead) break;
                     if (parentProperty.Name == childProperty.Name && parentProperty.PropertyType == childProperty.PropertyType)
-                    {   
+                    {
                         childProperty.SetValue(target, parentProperty.GetValue(source));
                         break;
                     }

diff --git a/EspionSpotify/Extensions/ColorExtensions.cs b/EspionSpotify/Extensions/ColorExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Drawing;
 
 namespace EspionSpotify.Extensions
 {

diff --git a/EspionSpotify/Extensions/ControlExtensions.cs b/EspionSpotify/Extensions/ControlExtensions.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace EspionSpotify.Extensions

diff --git a/EspionSpotify/Extensions/LinqExtensions.cs b/EspionSpotify/Extensions/LinqExtensions.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.Extensions
 {

diff --git a/EspionSpotify/Extensions/ResourceManagerExtensions.cs b/EspionSpotify/Extensions/ResourceManagerExtensions.cs
@@ -1,10 +1,5 @@
 using EspionSpotify.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Resources;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.Extensions
 {

diff --git a/EspionSpotify/Extensions/SettingExtensions.cs b/EspionSpotify/Extensions/SettingExtensions.cs
@@ -1,10 +1,5 @@
 using EspionSpotify.Enums;
 using EspionSpotify.Properties;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.Extensions
 {

diff --git a/EspionSpotify/Extensions/WaveFormatExtensions.cs b/EspionSpotify/Extensions/WaveFormatExtensions.cs
@@ -1,10 +1,6 @@
 using EspionSpotify.Enums;
 using NAudio.Wave;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.Extensions
 {

diff --git a/EspionSpotify/GitHub.cs b/EspionSpotify/GitHub.cs
@@ -1,17 +1,17 @@
 using EspionSpotify.Extensions;
+using EspionSpotify.Models;
 using EspionSpotify.Models.GitHub;
 using EspionSpotify.Properties;
 using Newtonsoft.Json;
 using System;
-using System.Linq;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Text;
-using System.Windows.Forms;
-using EspionSpotify.Models;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace EspionSpotify
 {
@@ -38,7 +38,7 @@ public static async Task GetVersion()
 
             try
             {
-                using (var response = (HttpWebResponse) await request.GetResponseAsync())
+                using (var response = (HttpWebResponse)await request.GetResponseAsync())
                 {
                     if (response.StatusCode != HttpStatusCode.OK) return;
 

diff --git a/EspionSpotify/IFrmEspionSpotify.cs b/EspionSpotify/IFrmEspionSpotify.cs
@@ -3,7 +3,7 @@
 
 namespace EspionSpotify
 {
-    public interface IFrmEspionSpotify 
+    public interface IFrmEspionSpotify
     {
         ResourceManager Rm { get; }
         void UpdateIconSpotify(bool isSpotifyPlaying, bool isRecording = false);

diff --git a/EspionSpotify/IWatcher.cs b/EspionSpotify/IWatcher.cs
@@ -1,6 +1,4 @@
-using EspionSpotify.Models;
-using EspionSpotify.Spotify;
-using System.Threading.Tasks;
+using EspionSpotify.Spotify;
 
 namespace EspionSpotify
 {
@@ -9,7 +7,7 @@ public interface IWatcher
         int CountSeconds { get; set; }
         ISpotifyHandler Spotify { get; set; }
 
-        bool RecorderUpAndRunning { get;  }
+        bool RecorderUpAndRunning { get; }
         bool IsTypeAllowed { get; }
         bool IsOldSong { get; }
 

diff --git a/EspionSpotify/MediaTags/ILastFMAPI.cs b/EspionSpotify/MediaTags/ILastFMAPI.cs
@@ -1,5 +1,4 @@
 using EspionSpotify.Models;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.MediaTags
 {

diff --git a/EspionSpotify/MediaTags/ISpotifyAPI.cs b/EspionSpotify/MediaTags/ISpotifyAPI.cs
@@ -1,6 +1,5 @@
 using EspionSpotify.Models;
 using SpotifyAPI.Web.Models;
-using System.Threading.Tasks;
 
 namespace EspionSpotify.MediaTags
 {

diff --git a/EspionSpotify/MediaTags/LastFMAPI.cs b/EspionSpotify/MediaTags/LastFMAPI.cs
@@ -1,12 +1,11 @@
 using EspionSpotify.Models;
+using PCLWebUtility;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
-using PCLWebUtility;
-using EspionSpotify.Spotify;
 
 namespace EspionSpotify.MediaTags
 {