diff --git a/app/DD_Clipboard_Searcher/frmStart.vb b/app/DD_Clipboard_Searcher/frmStart.vb index b64a3aa..705f46b 100644 --- a/app/DD_Clipboard_Searcher/frmStart.vb +++ b/app/DD_Clipboard_Searcher/frmStart.vb @@ -168,6 +168,8 @@ Public Class frmStart oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "CleanUp") oProfiles = oProfiles.ToList() + + CURRENT_MATCHING_PROFILES = oProfiles CURRENT_CLIPBOARD_CONTENTS = ClipboardContents Catch ex As Exception @@ -179,9 +181,17 @@ Public Class frmStart Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles Hotkey.HotKeyPressed If HotKeyID = HOTKEY_TRIGGER_WATCHER Then If CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then - If CURRENT_MATCHING_PROFILES.Count > 0 And MONITORING_ACTIVE = True Then - CHECK_PROFILE_MATCH() + If MONITORING_ACTIVE = True Then + If CURRENT_MATCHING_PROFILES.Count > 0 Then + CHECK_PROFILE_MATCH() + Else + NotifyIconMain.BalloonTipTitle = "Clipboard Watcher" + NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden." + NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning + NotifyIconMain.ShowBalloonTip(2000) + End If End If + End If ElseIf HotKeyID = HOTKEY_TOGGLE_WATCHER Then Change_Monitoring_State() @@ -190,72 +200,8 @@ Public Class frmStart Sub CHECK_PROFILE_MATCH() Logger.Debug("...now CHECK_PROFILE_MATCH...") Dim oProfiles = CURRENT_MATCHING_PROFILES - 'Dim oInvalidDocumentSQL = False - 'Dim oInvalidDataSQL = False - - 'Dim oPatterns As New ClassPatterns(LogConfig) Dim oEnv = GetEnvironment() - 'For Each oProfile In oProfiles - ' Dim oResultDocs As Integer = 0 - ' Dim oResultData As Integer = 0 - - ' Dim oDataSearches As DataTable = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}") - ' Dim oDocSearches As DataTable = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}") - - ' For Each oRow As DataRow In oDataSearches.Rows - ' Dim oCountCommand = String.Empty - ' Try - ' oCountCommand = oRow.Item("COUNT_COMMAND") - - ' If oCountCommand = String.Empty Then - ' Continue For - ' End If - - ' oCountCommand = oPatterns.ReplaceUserValues(oCountCommand, oEnv.User) - ' oCountCommand = oPatterns.ReplaceInternalValues(oCountCommand) - - ' oResultData += Database.GetScalarValue(oCountCommand) - ' Catch ex As Exception - ' Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand) - ' oInvalidDataSQL = True - ' End Try - ' Next - - ' For Each oRow As DataRow In oDocSearches.Rows - ' Dim oCountCommand = String.Empty - ' Try - ' oCountCommand = oRow.Item("COUNT_COMMAND") - - ' If oCountCommand = String.Empty Then - ' Continue For - ' End If - - ' oCountCommand = oPatterns.ReplaceUserValues(oCountCommand, oEnv.User) - ' oCountCommand = oPatterns.ReplaceInternalValues(oCountCommand) - ' Logger.Debug($"Now again checking countDocs: sql so far: {oCountCommand}") - ' oResultDocs += Database.GetScalarValue(oCountCommand) - ' Logger.Debug($"Now oResultDocs is: {oResultDocs}") - ' Catch ex As Exception - ' Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand) - ' oInvalidDocumentSQL = True - ' End Try - ' Next - - ' oProfile.CountData = oResultData - ' If oProfile.CountDocs > 0 Then - ' Logger.Debug($"For hell no replacing JJ as CountDocs already has a result > 0!!!") - ' Else - ' oProfile.CountDocs = oResultDocs - ' End If - - 'Next - - 'If oInvalidDocumentSQL Or oInvalidDataSQL Then - ' MsgBox("Ein oder mehrere Abfragen konnten nicht ausgeführt werden. Bitte überprüfen Sie das Log.", MsgBoxStyle.Exclamation, "Warnung") - ' Exit Sub - 'End If - Dim oParams = New ClipboardWatcherParams() With { .ClipboardContents = CURRENT_CLIPBOARD_CONTENTS, .MatchingProfiles = oProfiles,