AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ZooFlow: Include Globix fixes

Browse Source
This commit is contained in:
Jonathan Jenne
2021-06-14 11:53:03 +02:00
parent ebef306a72
commit 8530005b6b
9 changed files with 212 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
GUIs.ZooFlow/frmFlowForm.vb
View File

@@ -255,12 +255,16 @@ Public Class frmFlowForm
Logger.Info("Clipboard Watcher Module is not active. Hotkey Monitoring will be disabled!")
End If
If My.Application.ModulesActive.Contains(MODULE_GLOBAL_INDEXER) Then
FileDrop = New ClassFileDrop(My.LogConfig)
FileHandle = New ClassFilehandle()
FolderWatch = New ClassFolderwatcher
Refresh_RegexTable()
If My.Application.Globix.LoadFileExclusion = False Then
Dim oFileExclusions As New ClassExclusions()
If oFileExclusions.Load(My.Application.Globix.PATH_FileExclusions) = False Then
If My.Application.User.Language = "de-DE" Then
MsgBox("Die Ausschlusskriterien für Dateien in Folderwatch konnten nicht angelegt werden!", MsgBoxStyle.Information)
Else
@@ -268,7 +272,7 @@ Public Class frmFlowForm
End If
End If
My.Application.Globix.LoadFileExclusion()
Init_Folderwatch()
Start_Folderwatch()
GlobixToolStripMenuItem.Visible = True
@@ -612,7 +616,7 @@ Public Class frmFlowForm
Logger.Info(" Check Drop-File: " & Str.ToString)
Dim handleType As String = Str.Substring(0, Str.LastIndexOf("|") + 1)
Dim filename As String = Str.Substring(Str.LastIndexOf("|") + 1)
If My.Application.Globix.FileExistsinDropTable(filename) = False Then
If FileHandle.CheckDuplicateFiles(filename, "Manuelle Ablage") Then
FileHandle.Decide_FileHandle(filename, handleType)
i += 1
Else
@@ -733,7 +737,7 @@ Public Class frmFlowForm
End If
'Die Datei übergeben
Logger.Info(" Adding file from Scanfolder after startup:" & fileName)
If My.Application.Globix.FileExistsinDropTable(fileName) = False Then
If FileHandle.CheckDuplicateFiles(fileName, "FolderWatch/Scan") Then
FileHandle.Decide_FileHandle(fileName, handleType)
Else
Logger.Info("Scanfolder Startup: File already exists:" & fileName)
@@ -769,7 +773,7 @@ Public Class frmFlowForm
End If
'Die Datei übergeben
Logger.Info("Adding file from Folderwatch after startup:" & fileName)
If My.Application.Globix.FileExistsinDropTable(fileName) = False Then
If FileHandle.CheckDuplicateFiles(fileName, "FolderWatch/Scan") Then
FileHandle.Decide_FileHandle(fileName, handleType)
Else
Logger.Info("Folderwatch Startup: File already exists:" & fileName)