BIG CLEANUP

Global_Indexer/ClassInit.vb

@@ -6,7 +6,6 @@ Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Messaging
 Imports DigitalData.Modules.Database
 Imports DLLLicenseManager
-
 Public Class ClassInit
     Public Sub InitLogger()
         LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
@@ -48,7 +47,7 @@ Public Class ClassInit
             dbResult = DATABASE_ECM.DBInitialized
 
             ' === OLD ===
-            dbResult = ClassDatabase.Init()
+            'dbResult = ClassDatabase.Init()
         Else
             MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information)
             ERROR_STATE = "NO DB-CONNECTION"
@@ -59,7 +58,7 @@ Public Class ClassInit
             dbResult = DATABASE_ECM.DBInitialized
 
             ' === OLD ===
-            dbResult = ClassDatabase.Init()
+            'dbResult = ClassDatabase.Init()
         End If
 
         If dbResult = False Then
@@ -107,7 +106,7 @@ Public Class ClassInit
 
     Public Function Load_BasicConfig()
         Try
-            ClassDatabase.Init()
+            'ClassDatabase.Init()
             Dim oSql As String = "SELECT * FROM TBDD_MODULES WHERE NAME = 'Global-Indexer'"
             Dim DT As DataTable = DATABASE_ECM.GetDatatable(oSql)
             If DT.Rows.Count = 1 Then
@@ -131,6 +130,10 @@ Public Class ClassInit
 
     Public Sub Init_Folderwatch()
         Try
+            FILE_HANDLER = New ClassFileHandler(LOGCONFIG)
+            FOLDER_WATCHER = New ClassFolderWatcher(LOGCONFIG)
+            AddHandler FOLDER_WATCHER.FileCreated, AddressOf OnCreated
+
             Dim sql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID
             Dim folderwatchPath = DATABASE_ECM.GetScalarValue(sql)
 
@@ -158,7 +161,7 @@ Public Class ClassInit
 
             FW_started = True
             FWFunction_STARTED = True
-            ClassFolderWatcher.StartStop_FolderWatch()
+            FOLDER_WATCHER.StartStop_FolderWatch()
         Catch ex As Exception
             MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatch: {ex.Message}", MsgBoxStyle.Critical)
             LOGGER.Info($"Init_Folderwatch: Unexpected error: {ex.Message}")
@@ -189,13 +192,41 @@ Public Class ClassInit
 
 
             FWFunction_STARTED = True
-            ClassFolderWatcher.StartStop_FolderWatchSCAN()
+            FOLDER_WATCHER.StartStop_FolderWatchSCAN()
         Catch ex As Exception
             MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatchScan: {ex.Message}", MsgBoxStyle.Critical)
             LOGGER.Info($"Init_Folderwatch: Unexpected error: {ex.Message}")
             START_INCOMPLETE = True
         End Try
     End Sub
+
+    Private Sub OnCreated(source As Object, e As IO.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)
+
+            If ClassIndexFunctions.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then
+                FILE_HANDLER.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
+
     Public Sub InitUserLogin()
         Try
             Dim oSql As String