Merge pull request #131 from Code52/tidy-up-message-merger

tidy up message merger

Author: hnrkndrssn

src/Carnac.Logic/Carnac.Logic.csproj

@@ -78,7 +78,6 @@
   <ItemGroup>
     <Compile Include="Enums\NotificationPlacement.cs" />
     <Compile Include="IConcurrencyService.cs" />
-    <Compile Include="IMessageMerger.cs" />
     <Compile Include="IMessageProvider.cs" />
     <Compile Include="Internal\FixedQueue.cs" />
     <Compile Include="IKeyProvider.cs" />
@@ -92,7 +91,6 @@
     <Compile Include="KeyMonitor\InterceptKeys.cs" />
     <Compile Include="KeyMonitor\KeyDirection.cs" />
     <Compile Include="KeysController.cs" />
-    <Compile Include="MessageMerger.cs" />
     <Compile Include="Models\Processinfo.cs" />
     <Compile Include="ShortcutAccumulator.cs" />
     <Compile Include="KeyPressDefinition.cs" />

src/Carnac.Logic/IMessageMerger.cs

@@ -9,13 +9,11 @@ public class MessageProvider : IMessageProvider
         readonly IShortcutProvider shortcutProvider;
         readonly IKeyProvider keyProvider;
         readonly PopupSettings settings;
-        readonly IMessageMerger messageMerger;
 
-        public MessageProvider(IShortcutProvider shortcutProvider, IKeyProvider keyProvider, PopupSettings settings, IMessageMerger messageMerger)
+        public MessageProvider(IShortcutProvider shortcutProvider, IKeyProvider keyProvider, PopupSettings settings)
         {
             this.shortcutProvider = shortcutProvider;
             this.keyProvider = keyProvider;
-            this.messageMerger = messageMerger;
             this.settings = settings;
         }
 
@@ -38,7 +36,7 @@ public IObservable<Message> GetMessageStream()
                 .Scan(new ShortcutAccumulator(), (acc, key) => acc.ProcessKey(shortcutProvider, key))
                 .Where(c => c.HasCompletedValue)
                 .SelectMany(c => c.GetMessages())
-                .Scan(new Message(), (acc, key) => messageMerger.MergeIfNeeded(acc, key))
+                .Scan(new Message(), (acc, key) => Message.MergeIfNeeded(acc, key))
                 .Where(m => !settings.DetectShortcutsOnly || m.IsShortcut);
         }
     }

src/Carnac.Logic/MessageMerger.cs

@@ -91,13 +91,29 @@ private Message(Message initial, bool isDeleting)
         public DateTime LastMessage { get { return lastMessage; } }
 
         public bool IsDeleting { get { return isDeleting; } }
-
-
+        
         public Message Merge(Message other)
         {
             return new Message(this, other);
         }
 
+        static readonly TimeSpan OneSecond = TimeSpan.FromSeconds(1);
+
+        public static Message MergeIfNeeded(Message previousMessage, Message newMessage)
+        {
+            return ShouldCreateNewMessage(previousMessage, newMessage)
+                ? newMessage
+                : previousMessage.Merge(newMessage);
+        }
+
+        static bool ShouldCreateNewMessage(Message previous, Message current)
+        {
+            return previous.ProcessName != current.ProcessName ||
+                   current.LastMessage.Subtract(previous.LastMessage) > OneSecond ||
+                   !previous.CanBeMerged ||
+                   !current.CanBeMerged;
+        }
+
         public Message FadeOut()
         {
             return new Message(this, true);

src/Carnac.Logic/MessageProvider.cs

@@ -32,7 +32,7 @@ MessageProvider CreateMessageProvider(IObservable<InterceptKeyEventArgs> keysStr
             var desktopLockEventService = Substitute.For<IDesktopLockEventService>();
             desktopLockEventService.GetSessionSwitchStream().Returns(Observable.Never<SessionSwitchEventArgs>());
             var keyProvider = new KeyProvider(source, new PasswordModeService(), desktopLockEventService);
-            return new MessageProvider(shortcutProvider, keyProvider, new PopupSettings(), new MessageMerger());
+            return new MessageProvider(shortcutProvider, keyProvider, new PopupSettings());
         }
 
         [Fact]

src/Carnac.Logic/Models/Message.cs

@@ -22,7 +22,7 @@ public App()
             var keyProvider = new KeyProvider(InterceptKeys.Current, new PasswordModeService(), new DesktopLockEventService());
             settingsProvider = new SettingsProvider(new RoamingAppDataStorage("Carnac"));
             settings = settingsProvider.GetSettings<PopupSettings>();
-            messageProvider = new MessageProvider(new ShortcutProvider(), keyProvider, settings, new MessageMerger());
+            messageProvider = new MessageProvider(new ShortcutProvider(), keyProvider, settings);
         }
 
         protected override void OnStartup(StartupEventArgs e)