Refactor some objects

Changes:
- Code cleanup
- Refactor some objects
- Fix double cover fetch issue
- Fix Textbox overflows

Known issues:
- There is a bug that crashes the entire Application. Looking for it.
- If song has quote in its name it crashes whole database system (which also enables SQL Injection but since this is a local database application it doesnt matter that much). Rich Presence works but no data saved in database.

Author: CrawLeyYou

AMDiscordRPC/AMDiscordRPC.cs

@@ -35,10 +35,10 @@ static void Main(string[] args)
                  }
                  else
                  {
-                     if (httpRes == Array.Empty<string>() || CoverThread != null)
+                     if (httpRes.Equals(new WebSongResponse()) || CoverThread != null)
                      {
                          httpRes = await GetCover(x.ArtistandAlbumName.Split('—')[1], HttpUtility.UrlEncode(ConvertToValidString(x.ArtistandAlbumName) + $" {ConvertToValidString(x.SongName)}"));
-                         log.Debug($"Set Cover: {((httpRes.Length > 0) ? httpRes[0] : null)}");
+                         log.Debug($"Set Cover: {((httpRes.artworkURL != null) ? httpRes.artworkURL : null)}");
                      }
                      SetPresence(x, httpRes);
                      oldAlbumnArtist = x.ArtistandAlbumName;
@@ -127,7 +127,7 @@ static void AMEvent()
                     string previousSong = string.Empty;
                     string previousArtistAlbum = string.Empty;
                     string lastFetchedArtistAlbum = string.Empty;
-                    int audioStatus = 3;
+                    AudioFormat format = AudioFormat.AAC;
                     bool resetStatus = false;
                     double oldValue = 0;
 
@@ -185,7 +185,7 @@ static void AMEvent()
                                     Task t = new Task(async () =>
                                     {
                                         httpRes = await GetCover(idontknowwhatshouldinamethisbutitsaboutalbum.Split('—')[1], HttpUtility.UrlEncode(ConvertToValidString((isSingle) ? string.Join("-", dashSplit.Take(dashSplit.Length - 1).ToArray()) : string.Join("—", currentArtistAlbum.Split('—').Take(2).ToArray())) + $" {ConvertToValidString(currentSong)}"));
-                                        log.Debug($"Set Cover: {((httpRes.Length > 0) ? httpRes[0] : null)}");
+                                        log.Debug($"Set Cover: {((httpRes.artworkURL != null) ? httpRes.artworkURL : null)}");
                                     });
                                     CoverThread = t;
                                     t.Start();
@@ -202,21 +202,21 @@ static void AMEvent()
                                         switch (audioBadge?.Name)
                                         {
                                             case "Dolby Atmos":
-                                                audioStatus = 1;
+                                                format = AudioFormat.Dolby_Atmos;
                                                 break;
                                             case "Dolby Audio":
-                                                audioStatus = 2;
+                                                format = AudioFormat.Dolby_Audio;
                                                 break;
                                             default:
-                                                audioStatus = 0;
+                                                format = AudioFormat.Lossless;
                                                 break;
                                         }
                                     }
-                                    else audioStatus = 3;
+                                    else format = AudioFormat.AAC;
                                     oldValue = 0;
                                     oldStartTime = startTime;
                                     oldEndTime = endTime;
-                                    AMSongDataEvent.ChangeSong(new SongData(currentSong, (isSingle) ? string.Join("-", dashSplit.Take(dashSplit.Length - 1).ToArray()) : string.Join("—", currentArtistAlbum.Split('—').Take(2).ToArray()), currentArtistAlbum.Split('—').Length <= 1, startTime, endTime, audioStatus));
+                                    AMSongDataEvent.ChangeSong(new SongData(currentSong, (isSingle) ? string.Join("-", dashSplit.Take(dashSplit.Length - 1).ToArray()) : string.Join("—", currentArtistAlbum.Split('—').Take(2).ToArray()), currentArtistAlbum.Split('—').Length <= 1, startTime, endTime, format));
                                 }
 
                                 if (playButton?.Name != null && (localizedPlay != null && localizedPlay == playButton?.Name || localizedStop != null && localizedStop != playButton?.Name))

AMDiscordRPC/Covers.cs

@@ -12,7 +12,7 @@ public class Covers
     {
         public static Task CoverThread;
 
-        public static async Task<String[]> AsyncFetchiTunes(string album, string searchStr)
+        private static async Task<WebSongResponse> AsyncFetchiTunes(string album, string searchStr)
         {
             try
             {
@@ -24,30 +24,35 @@ public static async Task<String[]> AsyncFetchiTunes(string album, string searchS
                     dynamic imageRes = JObject.Parse(await iTunesReq.Content.ReadAsStringAsync());
                     if (imageRes["resultCount"] != 0)
                     {
-                        string[] res = { imageRes["results"][0]["artworkUrl100"].ToString(), imageRes["results"][0]["trackViewUrl"].ToString(), imageRes["results"][0]["collectionName"].ToString() };
-                        Database.UpdateAlbum(new Database.SQLCoverResponse(album, res[0], res[1], null, null, null));
+                        WebSongResponse webRes = new WebSongResponse
+                        (
+                            imageRes["results"][0]["artworkUrl100"].ToString(),
+                            imageRes["results"][0]["trackViewUrl"].ToString(),
+                            imageRes["results"][0]["collectionName"].ToString()
+                        );
+                        Database.UpdateAlbum(new Database.SQLCoverResponse(album, webRes.artworkURL, webRes.trackURL));
                         CoverThread = null;
-                        return res;
+                        return webRes;
                     }
                     else
                     {
                         log.Warn("iTunes no image found");
                         CoverThread = null;
-                        return Array.Empty<string>();
+                        return new WebSongResponse();
                     }
                 }
                 else
                 {
                     log.Warn("iTunes request failed");
                     CoverThread = null;
-                    return Array.Empty<string>();
+                    return new WebSongResponse();
                 }
             }
             catch (Exception e)
             {
                 log.Error($"iTunes Exception {e.Message}");
                 CoverThread = null;
-                return Array.Empty<string>();
+                return new WebSongResponse();
             }
         }
 
@@ -72,24 +77,35 @@ public static async Task CheckAnimatedCover(string album, string url, Cancellati
             {
                 log.Error($"Apple Music animatedCover exception: {e.Message}");
                 Discord.animatedCoverCts = null;
-                Database.UpdateAlbum(new Database.SQLCoverResponse(album, null, null, false, null, null));
+                Database.UpdateAlbum(new Database.SQLCoverResponse(album, null, null, false));
             }
         }
 
-        public static async Task<string[]> GetCover(string album, string searchStr)
+        public static async Task<WebSongResponse> GetCover(string album, string searchStr)
         {
             try
             {
                 Database.SQLCoverResponse cover = Database.GetAlbumDataFromSQL(album);
                 if (cover != null)
                 {
-                    string[] res = { (cover.animated == true && cover.animatedURL != null) ? cover.animatedURL : (cover.source != null) ? cover.source : throw new Exception("Source not found."), cover.redirURL, album };
+                    WebSongResponse res = new WebSongResponse(
+                    (
+                        cover.animated == true && cover.animatedURL != null) ? cover.animatedURL : (cover.source != null) ? cover.source : throw new Exception("Source not found."),
+                        cover.redirURL,
+                        album
+                    );
+                    CoverThread = null;
                     return res;
                 }
-                else return await AsyncFetchiTunes(album, searchStr);
+                else
+                {
+                    CoverThread = null;
+                    return await AsyncFetchiTunes(album, searchStr);
+                }
             }
             catch (Exception ex)
             {
+                CoverThread = null;
                 return await AsyncFetchiTunes(album, searchStr);
             }
         }

AMDiscordRPC/Database.cs

@@ -258,7 +258,7 @@ public class SQLCoverResponse
             public string streamURL { get; set; }
             public string animatedURL { get; set; }
 
-            public SQLCoverResponse(string album, string source, string redirURL, bool? animated, string streamURL, string animatedURL)
+            public SQLCoverResponse(string album = null, string source = null, string redirURL = null, bool? animated = null, string streamURL = null, string animatedURL = null)
             {
                 this.album = album;
                 this.source = source;

AMDiscordRPC/Discord.cs

@@ -51,10 +51,10 @@ public static void SetPresence(SongData x)
 
         private static async Task AsyncSetButton(SongData x)
         {
-            string[] resp = await GetCover(x.ArtistandAlbumName.Split('—')[1], HttpUtility.UrlEncode(ConvertToValidString(x.ArtistandAlbumName) + $" {ConvertToValidString(x.SongName)}"));
+            WebSongResponse resp = await GetCover(x.ArtistandAlbumName.Split('—')[1], HttpUtility.UrlEncode(ConvertToValidString(x.ArtistandAlbumName) + $" {ConvertToValidString(x.SongName)}"));
             oldData.Buttons = new Button[]
             {
-                new Button() { Label = "Listen on Apple Music", Url = (resp.Length > 0) ? resp[1].Replace("https://", "music://") : "music://music.apple.com/home"}
+                new Button() { Label = "Listen on Apple Music", Url = (resp.trackURL != null) ? resp.trackURL.Replace("https://", "music://") : "music://music.apple.com/home"}
             };
             client.SetPresence(oldData);
             thread = null;
@@ -67,7 +67,7 @@ public static async Task SetCover(string coverURL)
             animatedCoverCts = null;
         }
 
-        public static void SetPresence(SongData x, string[] resp)
+        public static void SetPresence(SongData x, WebSongResponse resp)
         {
             log.Debug($"Timestamps {x.StartTime}/{x.EndTime}");
             if (thread != null) thread.Abort();
@@ -83,14 +83,14 @@ public static void SetPresence(SongData x, string[] resp)
                 State = $"by {((x.IsMV) ? x.ArtistandAlbumName : ConvertToValidString(x.ArtistandAlbumName.Split('—')[0]))}",
                 Assets = new Assets()
                 {
-                    LargeImageKey = (resp.Length > 0) ? resp[0] : "",
-                    LargeImageText = (x.IsMV) ? resp[2] : ConvertToValidString(x.ArtistandAlbumName.Split('—')[1]),
-                    SmallImageKey = (x.AudioDetail == 0) ? "lossless" : (x.AudioDetail == 1 || x.AudioDetail == 2) ? "dolbysimplified" : null,
-                    SmallImageText = (x.AudioDetail == 0) ? "Lossless" : (x.AudioDetail == 1) ? "Dolby Atmos" : (x.AudioDetail == 2) ? "Dolby Audio" : null,
+                    LargeImageKey = (resp.artworkURL != null) ? resp.artworkURL : "",
+                    LargeImageText = (x.IsMV) ? resp.trackName : ConvertToValidString(x.ArtistandAlbumName.Split('—')[1]),
+                    SmallImageKey = (x.format == AudioFormat.Lossless) ? "lossless" : (x.format == AudioFormat.Dolby_Atmos || x.format == AudioFormat.Dolby_Audio) ? "dolbysimplified" : null,
+                    SmallImageText = (x.format == AudioFormat.Lossless) ? "Lossless" : (x.format == AudioFormat.Dolby_Atmos) ? "Dolby Atmos" : (x.format == AudioFormat.Dolby_Audio) ? "Dolby Audio" : null,
                 },
                 Buttons = new Button[]
                      {
-                         new Button() { Label = "Listen on Apple Music", Url = (resp.Length > 0) ? resp[1].Replace("https://", "music://") : "music://music.apple.com/home"}
+                         new Button() { Label = "Listen on Apple Music", Url = (resp.trackURL != null) ? resp.trackURL.Replace("https://", "music://") : "music://music.apple.com/home"}
                      },
                 Timestamps = new Timestamps()
                 {
@@ -99,10 +99,10 @@ public static void SetPresence(SongData x, string[] resp)
                 }
             };
             client.SetPresence(oldData);
-            if (resp?[0] is { Length: > 0 } && !resp[0].Contains((S3_Credentials != null) ? (S3_Credentials.GetNullKeys().Count == 0) ? S3_Credentials.bucketURL : "" : ""))
+            if (resp.artworkURL != null && !resp.artworkURL.Contains((S3_Credentials != null) ? (S3_Credentials.GetNullKeys().Count == 0) ? S3_Credentials.bucketURL : "" : ""))
             {
                 animatedCoverCts = new CancellationTokenSource();
-                Task t = new Task(() => CheckAnimatedCover(ConvertToValidString(x.ArtistandAlbumName.Split('—')[1]), resp[1], animatedCoverCts.Token));
+                Task t = new Task(() => CheckAnimatedCover(ConvertToValidString(x.ArtistandAlbumName.Split('—')[1]), resp.trackURL, animatedCoverCts.Token));
                 t.Start();
             }
         }

AMDiscordRPC/Globals.cs

@@ -14,8 +14,8 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using static AMDiscordRPC.UI;
 using static AMDiscordRPC.Database;
+using static AMDiscordRPC.UI;
 
 namespace AMDiscordRPC
 {
@@ -31,7 +31,7 @@ public static class Globals
         public static readonly Assembly assembly = Assembly.GetExecutingAssembly();
         public static HtmlParser parser = new HtmlParser();
         public static RichPresence oldData = new RichPresence();
-        public static string[] httpRes = Array.Empty<string>();
+        public static WebSongResponse httpRes = new WebSongResponse();
         public static string ffmpegPath;
         public static S3_Creds S3_Credentials;
         private static List<string> newMatchesArr;
@@ -41,6 +41,13 @@ public enum S3ConnectionStatus
             Disconnected,
             Error
         }
+        public enum AudioFormat
+        {
+            Lossless,
+            Dolby_Atmos,
+            Dolby_Audio,
+            AAC
+        }
         public static S3ConnectionStatus S3Status = S3ConnectionStatus.Disconnected;
 
         public static void ConfigureLogger()
@@ -121,7 +128,7 @@ private static void StartFFmpegProcess(string filename)
 
         public static async void CheckFFmpeg()
         {
-            List<string> paths = Environment.GetEnvironmentVariable("PATH").Split(';').Where(v => v.Contains("ffmpeg")).Select(s => $@"{s}\ffmpeg.exe").Prepend("ffmpeg").ToList() ;
+            List<string> paths = Environment.GetEnvironmentVariable("PATH").Split(';').Where(v => v.Contains("ffmpeg")).Select(s => $@"{s}\ffmpeg.exe").Prepend("ffmpeg").ToList();
             object SQLQueryRes = ExecuteScalarCommand($"SELECT FFmpegPath from creds");
 
             if (SQLQueryRes != null)
@@ -150,16 +157,16 @@ public class SongData : EventArgs
             public bool IsMV { get; set; }
             public DateTime StartTime { get; set; }
             public DateTime EndTime { get; set; }
-            public int AudioDetail { get; set; }
+            public AudioFormat format { get; set; }
 
-            public SongData(string SongName, string ArtistandAlbumName, bool IsMV, DateTime StartTime, DateTime EndTime, int AudioDetail)
+            public SongData(string SongName, string ArtistandAlbumName, bool IsMV, DateTime StartTime, DateTime EndTime, AudioFormat format)
             {
                 this.SongName = SongName;
                 this.ArtistandAlbumName = ArtistandAlbumName;
                 this.IsMV = IsMV;
                 this.StartTime = StartTime;
                 this.EndTime = EndTime;
-                this.AudioDetail = AudioDetail;
+                this.format = format;
             }
         }
 
@@ -202,5 +209,27 @@ public List<object> GetNotNullValues()
                 return GetType().GetProperties().Where(s => s.GetValue(this) != null).Select(p => (p.PropertyType == typeof(string)) ? $"'{p.GetValue(this)}'" : p.GetValue(this)).ToList();
             }
         }
+
+        public class WebSongResponse
+        {
+            public string artworkURL { get; set; }
+            public string trackURL { get; set; }
+            public string trackName { get; set; }
+
+            public WebSongResponse(string artworkURL = null, string trackURL = null, string trackName = null)
+            {
+                this.artworkURL = artworkURL;
+                this.trackURL = trackURL;
+                this.trackName = trackName;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is WebSongResponse other &&
+                       artworkURL == other.artworkURL &&
+                       trackURL == other.trackURL &&
+                       trackName == other.trackName;
+            }
+        }
     }
 }

AMDiscordRPC/Helpers/TextBoxHelper.cs

@@ -96,9 +96,9 @@ private static bool GetOrCreateAdorner(TextBox textBoxControl, out PlaceholderAd
 
         public class PlaceholderAdorner : Adorner
         {
-            public PlaceholderAdorner(TextBox textBox) : base(textBox) 
+            public PlaceholderAdorner(TextBox textBox) : base(textBox)
             {
-                IsHitTestVisible = false;    
+                IsHitTestVisible = false;
             }
 
             protected override void OnRender(DrawingContext drawingContext)

AMDiscordRPC/Playlist.cs

@@ -24,7 +24,7 @@ internal class Playlist
         public static async Task ConvertM3U8(string album, string playlistUrl, CancellationToken ct)
         {
             // ^I thought storing Master Playlist would be better for in case of bucket changes and Apple's codec changes on lowest quality.
-            Database.UpdateAlbum(new Database.SQLCoverResponse(album, null, null, true, playlistUrl, null));
+            Database.UpdateAlbum(new Database.SQLCoverResponse(album, null, null, true, playlistUrl));
             StreamInf playlist = await FetchResolution(playlistUrl);
             if (!ct.IsCancellationRequested && playlist != null)
             {

AMDiscordRPC/S3.cs

@@ -1,13 +1,13 @@
 using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.S3.Model;
+using AMDiscordRPC.UIComponents;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using AMDiscordRPC.UIComponents;
 using static AMDiscordRPC.Globals;
 
 namespace AMDiscordRPC
@@ -37,7 +37,8 @@ public static void InitS3()
                     S3Status = S3ConnectionStatus.Disconnected;
                     InputWindow.ChangeS3Status(S3ConnectionStatus.Disconnected);
                 }
-            } catch (Exception e) 
+            }
+            catch (Exception e)
             {
                 S3Status = S3ConnectionStatus.Error;
                 InputWindow.ChangeS3Status(S3ConnectionStatus.Error);

AMDiscordRPC/UI.cs

@@ -1,15 +1,15 @@
 using AMDiscordRPC.UIComponents;
+using Microsoft.Win32;
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.IO;
-using System.Diagnostics;
-using static AMDiscordRPC.Globals;
 using static AMDiscordRPC.Database;
+using static AMDiscordRPC.Globals;
 using Application = System.Windows.Application;
 using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
 
@@ -38,7 +38,8 @@ public static void CreateUI()
         public static void FFmpegDialog()
         {
             log.Warn("FFmpeg not found");
-            Thread thread = new Thread(() => {
+            Thread thread = new Thread(() =>
+            {
                 if (System.Windows.MessageBox.Show("FFmpeg not found. Do you want to specify the path?", "FFmpeg not found.", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes) == MessageBoxResult.Yes)
                 {
                     log.Debug("Yes");