MS Globix Folderwatch

2022-02-25 14:41:18 +01:00
parent 80a541ff36
commit 1e3ee983e7
6 changed files with 100 additions and 107 deletions
--- 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

--- 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")

--- 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