Tracks are detected as ads

close issue #107

EspionSpotify.Tests/SpotifyStatusTests.cs

@@ -78,7 +78,7 @@ private void SpotifyStatusSpotifyPlayingAdOrUnknown_ReturnsExpectingTrack(string
             var status = new SpotifyStatus(spotifyWindowInfo);
 
             Assert.Equal(expectedTrack, status.CurrentTrack);
-            Assert.Equal("Spotify - Ad", status.CurrentTrack.ToString());
+            Assert.Equal(expectedTrack.ToString(), status.CurrentTrack.ToString());
         }
     }
 }

EspionSpotify/Models/SpotifyWindowInfo.cs

@@ -1,10 +1,12 @@
-namespace EspionSpotify.Models
+using EspionSpotify.Spotify;
+
+namespace EspionSpotify.Models
 {
     public class SpotifyWindowInfo
     {
         public string WindowTitle { get; set; }
         public bool IsPlaying { get; set; }
 
-        public bool IsTitledSpotify { get => WindowTitle?.ToLowerInvariant().Equals("spotify") ?? false; }
+        public bool IsTitledSpotify { get => SpotifyStatus.WindowTitleIsSpotify(WindowTitle); }
     }
 }

EspionSpotify/Models/Track.cs

@@ -106,7 +106,7 @@ public override string ToString()
 
             if (Ad)
             {
-                song = $"{SPOTIFY} - {FrmEspionSpotify.Rm?.GetString($"logAd") ?? "Ad"}";
+                song = Artist;
             }
 
             return song;

EspionSpotify/Spotify/SpotifyConnect.cs

@@ -1,4 +1,5 @@
-using System;
+using EspionSpotify.Spotify;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
@@ -7,7 +8,6 @@ namespace EspionSpotify
 {
     public class SpotifyConnect
     {
-        private const string SPOTIFY = "spotify";
         private static readonly TimeSpan RunSpotifyInterval = TimeSpan.FromSeconds(3);
 
         private static readonly string[] SpotifyPossiblePaths =
@@ -73,7 +73,7 @@ public static bool IsSpotifyInstalled()
 
         public static bool IsSpotifyRunning()
         {
-            return Process.GetProcessesByName(SPOTIFY).Length >= 1;
+            return Process.GetProcessesByName(SpotifyStatus.SPOTIFY).Length >= 1;
         }
     }
 }

EspionSpotify/Spotify/SpotifyProcess.cs

@@ -10,8 +10,6 @@ namespace EspionSpotify
 {
     public class SpotifyProcess: ISpotifyProcess
     {
-        private const string SPOTIFY = "Spotify";
-
         private readonly int? _spotifyProcessId;
         private readonly ISpotifyAudioSession _spotifyAudioSession;
 
@@ -65,7 +63,7 @@ public static ICollection<Process> GetSpotifyProcesses()
 
             foreach (var process in Process.GetProcesses())
             {
-                if (process.ProcessName.ToLowerInvariant().Equals(SPOTIFY.ToLowerInvariant()))
+                if (SpotifyStatus.WindowTitleIsSpotify(process.ProcessName))
                 {
                     spotifyProcesses.Add(process);
                 }

EspionSpotify/Spotify/SpotifyStatus.cs

@@ -1,15 +1,23 @@
 using EspionSpotify.MediaTags;
 using EspionSpotify.Models;
 using System;
+using System.Linq;
 
 namespace EspionSpotify.Spotify
 {
     public class SpotifyStatus: ISpotifyStatus
     {
+        public const string SPOTIFY = "spotify";
+
         public Track CurrentTrack { get; set; }
 
         private string[] _windowTitleSeparator { get; }
 
+        public static bool WindowTitleIsSpotify(string title)
+        {
+            return title?.ToLowerInvariant().Equals(SPOTIFY) ?? false;
+        }
+
         public SpotifyStatus(SpotifyWindowInfo spotifyWindowInfo)
         {
             _windowTitleSeparator = new[] {" - "};

EspionSpotify/Watcher.cs

@@ -34,9 +34,10 @@ public class Watcher : IWatcher
         public bool NumTrackActivated { get => _userSettings.OrderNumber.HasValue; }
         public bool AdPlaying { get => _currentTrack.Ad; }
         public string SongTitle { get => _currentTrack.ToString(); }
+        public bool IsRecordUnknownActive { get => _userSettings.RecordUnknownTrackTypeEnabled && _currentTrack.Playing && !SpotifyStatus.WindowTitleIsSpotify(_currentTrack.ToString()); }
         public bool IsTypeAllowed
         {
-            get => _currentTrack.IsNormal() || (_userSettings.RecordUnknownTrackTypeEnabled && _currentTrack.Playing);
+            get => _currentTrack.IsNormal() || IsRecordUnknownActive;
         }
         public bool IsOldSong
         { 
@@ -90,10 +91,11 @@ public bool IsNewTrack(Track track)
                 return false;
             }
 
-            _isPlaying = track.Playing;
             _currentTrack = track;
+            _isPlaying = _currentTrack.Playing;
 
-            _form.UpdatePlayingTitle(SongTitle);
+            var adTitle = _currentTrack.Ad && !SpotifyStatus.WindowTitleIsSpotify(_currentTrack.ToString()) ? $"{FrmEspionSpotify.Rm?.GetString($"logAd") ?? "Ad"}: " : "";
+            _form.UpdatePlayingTitle($"{adTitle}{SongTitle}");
 
             MutesSpotifyAds(AdPlaying);