BIG CLEANUP

Global_Indexer/ClassFolderWatcher.vb

@@ -1,10 +1,25 @@
 Imports System.IO
 Imports System.Threading
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
 
 Public Class ClassFolderWatcher
-    Public Shared FolderWatcher As FileSystemWatcher
-    Public Shared FolderWatcher_SCAN As FileSystemWatcher
-    Public Shared Function Restart_FolderWatch()
+    Inherits BaseClass
+
+    Public FolderWatcher As FileSystemWatcher
+    Public FolderWatcher_SCAN As FileSystemWatcher
+
+    Public Event FileCreated As EventHandler(Of FileSystemEventArgs)
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+    End Sub
+
+    Private Sub OnCreated(source As Object, e As IO.FileSystemEventArgs)
+        RaiseEvent FileCreated(source, e)
+    End Sub
+
+    Public Sub Restart_FolderWatch()
         Try
             If FolderWatcher.EnableRaisingEvents = True Then
                 'Gestartet also Stoppen
@@ -12,41 +27,40 @@ Public Class ClassFolderWatcher
                 FW_started = False
                 'FolderWatch neu instanzieren
                 FolderWatcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch neu instanziert")
+
+                Logger.Info(" >> FolderWatch neu instanziert")
                 FolderWatcher.IncludeSubdirectories = False
                 FolderWatcher.EnableRaisingEvents = True
                 AddHandler FolderWatcher.Created, AddressOf OnCreated
                 FW_started = True
-                'SaveConfigValue("FW_started", "True")
                 CONFIG.Config.FolderWatchStarted = True
                 CONFIG.Save()
             End If
         Catch ex As Exception
-            LOGGER.Info($"Error in Restart_FolderWatch: {ex.Message}")
-            LOGGER.Error(ex)
+            Logger.Info($"Error in Restart_FolderWatch: {ex.Message}")
+            Logger.Error(ex)
         End Try
-    End Function
-    Public Shared Function Restart_FolderWatchSCAN()
+    End Sub
+    Public Sub Restart_FolderWatchSCAN()
         Try
             If FolderWatcher_SCAN.EnableRaisingEvents = True Then
                 'Gestartet also Stoppen
                 FolderWatcher_SCAN.EnableRaisingEvents = False
                 'FolderWatch neu instanzieren
                 FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatchScan neu instanziert")
+                Logger.Info(" >> FolderWatchScan neu instanziert")
                 FolderWatcher_SCAN.IncludeSubdirectories = False
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
-                'SaveConfigValue("FWSCAN_started", "True")
                 CONFIG.Config.FolderWatchScanStarted = True
                 CONFIG.Save()
             End If
         Catch ex As Exception
-            LOGGER.Info($"Error in Restart_FolderWatchSCAN: {ex.Message}")
-            LOGGER.Error(ex)
+            Logger.Info($"Error in Restart_FolderWatchSCAN: {ex.Message}")
+            Logger.Error(ex)
         End Try
-    End Function
-    Public Shared Function StartStop_FolderWatch()
+    End Sub
+    Public Function StartStop_FolderWatch() As Integer
         Try
             If CURRENT_FOLDERWATCH = "" Then
                 'MsgBox("Bitte definieren Sie einen Überwachungsordner:", MsgBoxStyle.Exclamation)
@@ -54,12 +68,11 @@ Public Class ClassFolderWatcher
             End If
             If FolderWatcher Is Nothing Then
                 FolderWatcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Gestartet")
+                Logger.Info(" >> FolderWatch Gestartet")
                 FolderWatcher.IncludeSubdirectories = False
                 FolderWatcher.EnableRaisingEvents = True
                 AddHandler FolderWatcher.Created, AddressOf OnCreated
                 FW_started = True
-                'SaveConfigValue("FW_started", "True")
                 CONFIG.Config.FolderWatchStarted = True
                 CONFIG.Save()
                 Return 1
@@ -68,12 +81,11 @@ Public Class ClassFolderWatcher
                 ' Dim watcher As New FileSystemWatcher()
                 ' watcher.Path = CURRENT_FOLDERWATCH
                 FolderWatcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Gestartet")
+                Logger.Info(" >> FolderWatch Gestartet")
                 FolderWatcher.IncludeSubdirectories = False
                 FolderWatcher.EnableRaisingEvents = True
                 AddHandler FolderWatcher.Created, AddressOf OnCreated
                 FW_started = True
-                'SaveConfigValue("FW_started", "True")
                 CONFIG.Config.FolderWatchStarted = True
                 CONFIG.Save()
                 Return 1
@@ -81,30 +93,17 @@ Public Class ClassFolderWatcher
                 'Gestartet also Stoppen
                 FolderWatcher.EnableRaisingEvents = False
                 FW_started = False
-                LOGGER.Info(" >> FolderWatch gestoppt")
-                'SaveConfigValue("FW_started", "False")
+                Logger.Info(" >> FolderWatch gestoppt")
                 CONFIG.Config.FolderWatchStarted = False
                 CONFIG.Save()
                 Return 0
             End If
-            'If watcher.EnableRaisingEvents = False Then
-            '    watcher = New System.IO.FileSystemWatcher(CURRENT_FOLDERWATCH, "*.*")
-            '    LOGGER.Info(" - vFolderWatch.Gestartet")
-            '    watcher.IncludeSubdirectories = False
-            '    watcher.EnableRaisingEvents = True
-            '    AddHandler watcher.Created, AddressOf OnCreated
-            '    Return 1
-            'Else
-            '    'Gestartet also Stoppen
-            '    watcher.EnableRaisingEvents = False
-            '    Return 0
-            'End If
         Catch ex As Exception
             MsgBox("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return 99
         End Try
     End Function
-    Public Shared Function StartStop_FolderWatchSCAN()
+    Public Function StartStop_FolderWatchSCAN() As Integer
         Try
             If CURRENT_SCAN_FOLDERWATCH = "" Then
                 If FolderWatcher.EnableRaisingEvents = True Then
@@ -122,7 +121,7 @@ Public Class ClassFolderWatcher
             End If
             If FolderWatcher_SCAN Is Nothing Then
                 FolderWatcher_SCAN = New FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Scan Gestartet")
+                Logger.Info(" >> FolderWatch Scan Gestartet")
                 FolderWatcher_SCAN.IncludeSubdirectories = False
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
@@ -134,7 +133,7 @@ Public Class ClassFolderWatcher
                 ' Dim watcher As New FileSystemWatcher()
                 ' watcher.Path = CURRENT_FOLDERWATCH
                 FolderWatcher_SCAN = New FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                LOGGER.Info(" >> FolderWatch Scan Gestartet")
+                Logger.Info(" >> FolderWatch Scan Gestartet")
                 FolderWatcher_SCAN.IncludeSubdirectories = False
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
@@ -144,8 +143,7 @@ Public Class ClassFolderWatcher
             Else
                 'Gestartet also Stoppen
                 FolderWatcher_SCAN.EnableRaisingEvents = False
-                LOGGER.Info(" >> FolderWatch Scan gestoppt")
-                'SaveConfigValue("FWSCAN_started", "False")
+                Logger.Info(" >> FolderWatch Scan gestoppt")
                 CONFIG.Config.FolderWatchScanStarted = False
                 CONFIG.Save()
                 Return 0
@@ -156,12 +154,12 @@ Public Class ClassFolderWatcher
             Return 99
         End Try
     End Function
-    Public Shared Function Stop_FWSCAN()
+    Public Function Stop_FWSCAN() As Boolean
         If FolderWatcher.EnableRaisingEvents = True Then
             'Gestartet also Stoppen
             FolderWatcher.EnableRaisingEvents = False
             FW_started = False
-            LOGGER.Info(" >> FolderWatch gestoppt")
+            Logger.Info(" >> FolderWatch gestoppt")
             'SaveConfigValue("FW_started", "False")
             CONFIG.Config.FolderWatchStarted = True
             CONFIG.Save()
@@ -170,31 +168,31 @@ Public Class ClassFolderWatcher
             Return False
         End If
     End Function
-    Private Shared Sub OnCreated(source As Object, e As FileSystemEventArgs)
-        Try
-            For Each row As DataRow In DTEXCLUDE_FILES.Rows
-                Dim content As String = row.Item(0).ToString.ToLower
-                If e.FullPath.ToLower.Contains(content) Then
-                    Exit Sub
-                End If
-            Next
+    'Private Sub OnCreated(source As Object, e As FileSystemEventArgs)
+    '    Try
+    '        For Each row As DataRow In DTEXCLUDE_FILES.Rows
+    '            Dim content As String = row.Item(0).ToString.ToLower
+    '            If e.FullPath.ToLower.Contains(content) Then
+    '                Exit Sub
+    '            End If
+    '        Next
 
-            Dim oHandleType As String
-            If e.FullPath.ToLower.EndsWith(".msg") Then
-                oHandleType = "|FW_OUTLOOK_MESSAGE|"
-            Else
-                oHandleType = "|FW_SIMPLEINDEXER|"
-            End If
-            'Die Datei übergeben
-            LOGGER.Info(">> OnCreated-File:" & e.FullPath)
+    '        Dim oHandleType As String
+    '        If e.FullPath.ToLower.EndsWith(".msg") Then
+    '            oHandleType = "|FW_OUTLOOK_MESSAGE|"
+    '        Else
+    '            oHandleType = "|FW_SIMPLEINDEXER|"
+    '        End If
+    '        'Die Datei übergeben
+    '        Logger.Info(">> OnCreated-File:" & e.FullPath)
 
-            If ClassIndexFunctions.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then
-                ClassFilehandle.Decide_FileHandle(e.FullPath, oHandleType)
-            End If
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in folder_watch_Created")
-        End Try
+    '        If ClassIndexFunctions.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then
+    '            FileHandler.Decide_FileHandle(e.FullPath, oHandleType)
+    '        End If
+    '    Catch ex As Exception
+    '        MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in folder_watch_Created")
+    '    End Try
 
-    End Sub
+    'End Sub
 
 End Class