From 1e3ee983e7825e5172790e0d94c64954e3baf6a5 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 25 Feb 2022 14:41:18 +0100 Subject: [PATCH] MS Globix Folderwatch --- .../Modules/Globix/ClassFolderwatcher.vb | 20 +---- GUIs.ZooFlow/Modules/Globix/State.vb | 1 + .../Modules/Globix/frmGlobixBasicConfig.vb | 88 ++++++++----------- GUIs.ZooFlow/frmFlowForm.Designer.vb | 20 ++--- GUIs.ZooFlow/frmFlowForm.resx | 24 +++++ GUIs.ZooFlow/frmFlowForm.vb | 52 ++++++----- 6 files changed, 99 insertions(+), 106 deletions(-) diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb index 2d1e9d57..0d0c4e07 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb @@ -59,6 +59,7 @@ Public Class ClassFolderwatcher My.Application.Globix.Folderwatchstarted = True My.UIConfig.Globix.FolderWatchStarted = True My.UIConfigManager.Save() + Logger.Info("Folderwatch successfully started!") Return 1 End If @@ -66,7 +67,7 @@ Public Class ClassFolderwatcher 'Gestartet also Stoppen FWFolderWatcher.EnableRaisingEvents = False My.Application.Globix.Folderwatchstarted = False - Logger.Info(" >> FolderWatch gestoppt") + Logger.Info("Folderwatch stopped!") My.UIConfig.Globix.FolderWatchStarted = False My.UIConfigManager.Save() Return 0 @@ -78,20 +79,6 @@ Public Class ClassFolderwatcher End Function Public Function StartStop_FolderWatchSCAN() As Integer Try - If My.Application.Globix.CURRENT_SCAN_FOLDERWATCH = "" Then - If FWFolderWatcher.EnableRaisingEvents = True Then - Stop_FWSCAN() - Return 0 - Else - If My.Application.User.Language = "de-DE" Then - MsgBox("Bitte definieren Sie einen Überwachungsordner für Scan-Eingänge:", MsgBoxStyle.Exclamation) - Else - MsgBox("Please define a watchfolder for Scanning:", MsgBoxStyle.Exclamation) - End If - - Return False - End If - End If If FWScan Is Nothing Then FWScan = New FileSystemWatcher(My.Application.Globix.CURRENT_SCAN_FOLDERWATCH, "*.*") Logger.Info(" >> FolderWatch Scan Gestartet") @@ -152,9 +139,6 @@ Public Class ClassFolderwatcher AddHandler oWatcher.Created, AddressOf OnCreated Logger.Debug("Folder Watcher started for Path [{0}]", pPath) - My.UIConfig.Globix.FolderWatchScanStarted = True - My.UIConfigManager.Save() - Return oWatcher End Function diff --git a/GUIs.ZooFlow/Modules/Globix/State.vb b/GUIs.ZooFlow/Modules/Globix/State.vb index 7396db7a..4533043e 100644 --- a/GUIs.ZooFlow/Modules/Globix/State.vb +++ b/GUIs.ZooFlow/Modules/Globix/State.vb @@ -18,6 +18,7 @@ Namespace Globix Public Property CURRENT_LASTDOCTYPE As String Public Property MULTIINDEXING_ACTIVE As Boolean = False Public Property Folderwatchstarted As Boolean = False + Public Property ScanFolderwatchstarted As Boolean = False Public Property DTEXCLUDE_FILES As DataTable Public Property PATH_FileExclusions As String = Path.Combine(Application.UserAppDataPath(), "FileExclusions.xml") diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb index b4167e10..5b17b6ac 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb @@ -3,7 +3,7 @@ Imports DigitalData.Modules.Logging Public Class frmGlobixBasicConfig Private Logger As Logger - Private oReload As Boolean = False + Private oFormLoad As Boolean = False Private clsFW As ClassFolderwatcher Public Sub New() @@ -85,39 +85,24 @@ Public Class frmGlobixBasicConfig Logger = My.LogConfig.GetLogger() clsFW = New ClassFolderwatcher(My.LogConfig) Try - oReload = True - Dim oFolderwatch = My.DatabaseECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & My.Application.User.UserId) - If oFolderwatch IsNot Nothing Then - My.Application.Globix.CurrentFolderWatchPath = oFolderwatch - End If - Me.TextEditHotfolder.Text = My.Application.Globix.CurrentFolderWatchPath - Dim oSCANFolderwatch = My.DatabaseECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & My.Application.User.UserId) - If oSCANFolderwatch IsNot Nothing Then - My.Application.Globix.CURRENT_SCAN_FOLDERWATCH = oSCANFolderwatch - End If - Me.TextEditHotfolder.Text = My.Application.Globix.CurrentFolderWatchPath - Me.TextEditScanfolder.Text = My.Application.Globix.CURRENT_SCAN_FOLDERWATCH - - If Not ClassFolderwatcher.FWFolderWatcher Is Nothing Then - If ClassFolderwatcher.FWFolderWatcher.EnableRaisingEvents = True Then - ToggleSwitchHotfolder.IsOn = True - Else - ToggleSwitchHotfolder.IsOn = False - End If + oFormLoad = True + If My.Application.Globix.Folderwatchstarted = True Then + ToggleSwitchHotfolder.IsOn = True Else ToggleSwitchHotfolder.IsOn = False End If - If Not ClassFolderwatcher.FWScan Is Nothing Then - If ClassFolderwatcher.FWScan.EnableRaisingEvents = True Then - ToggleSwitchScanfolder.IsOn = True - Else - ToggleSwitchScanfolder.IsOn = False - End If + If My.Application.Globix.ScanFolderwatchstarted = True Then + ToggleSwitchScanfolder.IsOn = True Else ToggleSwitchScanfolder.IsOn = False End If - oReload = False + + Me.TextEditHotfolder.Text = My.Application.Globix.CurrentFolderWatchPath + Me.TextEditScanfolder.Text = My.Application.Globix.CURRENT_SCAN_FOLDERWATCH + + + oFormLoad = False Me.DataGridView1.DataSource = My.Application.Globix.DTEXCLUDE_FILES If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP3 @@ -133,23 +118,10 @@ Public Class frmGlobixBasicConfig Sub CheckFWHF_State() - Select Case clsFW.StartStop_FolderWatch() - Case 1 - ToggleSwitchHotfolder.IsOn = True - Case 0 - ToggleSwitchHotfolder.IsOn = False - End Select + clsFW.StartStop_FolderWatch() End Sub - Sub CheckFWSCAN_State() - Select Case clsFW.StartStop_FolderWatchSCAN() - Case 1 - ToggleSwitchHotfolder.IsOn = True - Case 0 - ToggleSwitchHotfolder.IsOn = False - End Select - End Sub Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click My.Application.Globix.DTEXCLUDE_FILES.AcceptChanges() @@ -167,14 +139,35 @@ Public Class frmGlobixBasicConfig CheckFolder(fbdialog.SelectedPath, "SCAN") End If End Sub - + Private Sub ToggleSwitchHotfolder_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchHotfolder.Toggled + Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) + If oFormLoad = True Then + Exit Sub + End If + If oToggle.IsOn Then + If My.Application.Globix.CurrentFolderWatchPath <> "" Then + CheckFWHF_State() + Else + ToggleSwitchHotfolder.IsOn = False + End If + Else + CheckFWHF_State() + End If + End Sub Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchScanfolder.Toggled Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) + If oFormLoad = True Then + Exit Sub + End If If oToggle.IsOn Then If My.Application.Globix.CURRENT_SCAN_FOLDERWATCH <> "" Then - CheckFWSCAN_State() + clsFW.StartStop_FolderWatchSCAN() + Else + ToggleSwitchScanfolder.IsOn = False End If + Else + clsFW.StartStop_FolderWatchSCAN() End If End Sub @@ -210,12 +203,5 @@ Public Class frmGlobixBasicConfig End If End Sub - Private Sub ToggleSwitchHotfolder_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchHotfolder.Toggled - Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) - If oToggle.IsOn Then - If My.Application.Globix.CurrentFolderWatchPath <> "" Then - CheckFWHF_State() - End If - End If - End Sub + End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index c7326465..2fc053c8 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -59,6 +59,7 @@ Partial Class frmFlowForm Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.Bar3 = New DevExpress.XtraBars.Bar() Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem() + Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() @@ -72,7 +73,6 @@ Partial Class frmFlowForm Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() @@ -117,7 +117,7 @@ Partial Class frmFlowForm 'TsiGlobixConfig ' Me.TsiGlobixConfig.Name = "TsiGlobixConfig" - Me.TsiGlobixConfig.Size = New System.Drawing.Size(180, 22) + Me.TsiGlobixConfig.Size = New System.Drawing.Size(178, 22) Me.TsiGlobixConfig.Text = "Grundeinstellungen" ' 'UserKonfigurationToolStripMenuItem @@ -357,11 +357,18 @@ Partial Class frmFlowForm Me.BarSubItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right Me.BarSubItem1.Caption = "Menu" Me.BarSubItem1.Id = 0 - Me.BarSubItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.scatterchartlabeloptions + Me.BarSubItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarSubItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonExitZooflow)}) Me.BarSubItem1.Name = "BarSubItem1" Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'BarButtonItem9 + ' + Me.BarButtonItem9.Caption = "Einstellungen Globix" + Me.BarButtonItem9.Id = 10 + Me.BarButtonItem9.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem9.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem9.Name = "BarButtonItem9" + ' 'BarButtonItem6 ' Me.BarButtonItem6.Caption = "Dienstkonfiguration" @@ -455,13 +462,6 @@ Partial Class frmFlowForm Me.BarButtonItem5.Id = 5 Me.BarButtonItem5.Name = "BarButtonItem5" ' - 'BarButtonItem9 - ' - Me.BarButtonItem9.Caption = "Einstellungen Globix" - Me.BarButtonItem9.Id = 10 - Me.BarButtonItem9.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem9.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem9.Name = "BarButtonItem9" - ' 'frmFlowForm ' Me.AllowDrop = True diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 94245768..c1498dd6 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1998,6 +1998,30 @@ 990, 17 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w + LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu + NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3 + LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww + LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww + LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz + LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x + NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y + LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index fc5412f9..c18d4c26 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -309,7 +309,7 @@ Public Class frmFlowForm End If Init_Folderwatch() - Start_Folderwatch() + Folderwatch_CheckFiles() GlobixToolStripMenuItem.Visible = True End If @@ -390,21 +390,21 @@ Public Class frmFlowForm My.Application.Globix.Folderwatchstarted = False My.UIConfig.Globix.FolderWatchStarted = False My.UIConfigManager.Save() + Else + If Not IO.Directory.Exists(oFolderWatchPath) Then + Logger.Info("Init_Folderwatch: folderwatchPath does not exists or is invalid path") + My.Application.Globix.Folderwatchstarted = False + My.UIConfig.Globix.FolderWatchStarted = False + My.UIConfigManager.Save() + Else + My.Application.Globix.CurrentFolderWatchPath = oFolderWatchPath + FolderWatch.StartStop_FolderWatch() + End If End If - If Not IO.Directory.Exists(oFolderWatchPath) Then - Logger.Info("Init_Folderwatch: folderwatchPath does not exists or is invalid path") - My.Application.Globix.Folderwatchstarted = False - My.UIConfig.Globix.FolderWatchStarted = False - My.UIConfigManager.Save() - End If - My.Application.Globix.CurrentFolderWatchPath = oFolderWatchPath - My.Application.Globix.Folderwatchstarted = True - 'FWFunction_STARTED = True - FolderWatch.StartStop_FolderWatch() Catch ex As Exception ShowErrorMessage(ex) End Try @@ -416,24 +416,22 @@ Public Class frmFlowForm oFolderwatchScanPath = IIf(IsDBNull(oFolderwatchScanPath), "", oFolderwatchScanPath) If oFolderwatchScanPath = String.Empty Then - Logger.Info("Init_Folderwatch: folderwatchScanPath is empty") - My.UIConfig.Globix.FolderWatchStarted = False + Logger.Info("Init_Folderwatch: folderwatchPath is empty") + My.Application.Globix.ScanFolderwatchstarted = False + My.UIConfig.Globix.FolderWatchScanStarted = False My.UIConfigManager.Save() - Exit Sub - End If + Else + If Not IO.Directory.Exists(oFolderwatchScanPath) Then + Logger.Info("Init_Folderwatch: folderwatchPath does not exists or is invalid path") + My.Application.Globix.ScanFolderwatchstarted = False + My.UIConfig.Globix.FolderWatchScanStarted = False + My.UIConfigManager.Save() + Else + My.Application.Globix.CURRENT_SCAN_FOLDERWATCH = oFolderwatchScanPath + FolderWatch.StartStop_FolderWatchSCAN() + End If - If Not IO.Directory.Exists(oFolderwatchScanPath) Then - Logger.Info("Init_Folderwatch: folderwatchScanPath does not exists or is invalid path") - My.UIConfig.Globix.FolderWatchStarted = False - My.UIConfigManager.Save() - Exit Sub End If - - My.Application.Globix.CURRENT_SCAN_FOLDERWATCH = oFolderwatchScanPath - - - 'FWFunction_STARTED = True - FolderWatch.StartStop_FolderWatchSCAN() Catch ex As Exception ShowErrorMessage(ex) End Try @@ -757,7 +755,7 @@ Public Class frmFlowForm ShowErrorMessage(ex) End Try End Sub - Sub Start_Folderwatch() + Sub Folderwatch_CheckFiles() If My.Application.Globix.CurrentFolderWatchPath = String.Empty Then My.Application.Globix.Folderwatchstarted = False End If