From b2d9ba0ced4bf1538ec631f64c5d5a807ec7a11a Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Fri, 8 Jan 2021 12:42:10 +0100
Subject: [PATCH] ClipboardWatcher: Improve Logging, Fix Catchall

---
 GUIs.ClipboardWatcher/ProfileFilter.vb |  5 ++++-
 GUIs.ClipboardWatcher/frmMatch.vb      | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/GUIs.ClipboardWatcher/ProfileFilter.vb b/GUIs.ClipboardWatcher/ProfileFilter.vb
index 5a7ea143..c80e9b91 100644
--- a/GUIs.ClipboardWatcher/ProfileFilter.vb
+++ b/GUIs.ClipboardWatcher/ProfileFilter.vb
@@ -150,11 +150,14 @@ Public Class ProfileFilter
                         oProcesses.Add(oProcess)
 
                         ' Set Profile matched
-                        oProfile.IsCatchAll = True
                         oProfile.IsMatched = True
                         oProfile.MatchedProcessID = oProcess.Guid
 
                     End If
+
+                    If oIsCatchAll Then
+                        oProfile.IsCatchAll = True
+                    End If
                 Next
                 If oFilteredProfiles.Count > 0 Then
                     oProfile.Processes = oProcesses
diff --git a/GUIs.ClipboardWatcher/frmMatch.vb b/GUIs.ClipboardWatcher/frmMatch.vb
index bd6ea6ba..146e3253 100644
--- a/GUIs.ClipboardWatcher/frmMatch.vb
+++ b/GUIs.ClipboardWatcher/frmMatch.vb
@@ -132,24 +132,33 @@ Public Class frmMatch
 
                 Dim oProfileMatch As Boolean = False
 
+                _Logger.NewBlock($"Profile {oProfile.Name}")
+
                 If oProfile.ProfileType = ProfileType.ANY Or oProfile.ProfileType = ProfileType.DOCS_ONLY Then
-                    _Logger.Debug("Docs only or ProfileTypeAny")
+                    _Logger.Debug("ProfileType: DOCS_ONLY or ANY")
+
                     If oProfile.CountDocs > 0 Then
                         Dim oItem = CreateTile(oProfile, $"{oProfile.CountDocs} Dateien")
                         oDocumentGroup.Items.Add(oItem)
                         oCreatedTiles += 1
                         oProfileMatch = True
+
+                        _Logger.Debug("{0} Doc-Results!", oProfile.CountDocs)
                     Else
                         _Logger.Debug("NO Doc-Results!")
                     End If
                 End If
 
                 If oProfile.ProfileType = ProfileType.ANY Or oProfile.ProfileType = ProfileType.DATA_ONLY Then
+                    _Logger.Debug("ProfileType: DATA_ONLY or ANY")
+
                     If oProfile.CountData > 0 Then
                         Dim oItem = CreateTile(oProfile, $"{oProfile.CountData} Datensätze")
                         oDataGroup.Items.Add(oItem)
                         oCreatedTiles += 1
                         oProfileMatch = True
+
+                        _Logger.Debug("{0} Data-Results!", oProfile.CountData)
                     Else
                         _Logger.Debug("NO Data-Results!")
                     End If