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

fix files not deleting when folderwatch is active

Browse Source
This commit is contained in:
Jonathan Jenne
2020-06-04 16:58:49 +02:00
parent 1bd5b7446b
commit dff3272b31
2 changed files with 60 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Global_Indexer/frmIndex.vb
View File

@@ -1193,10 +1193,10 @@ Public Class frmIndex
LOGGER.Debug("File streamed to Windream: {0}", oStreamSuccessful)
LOGGER.Debug("File exists in Destination: {0}", File.Exists(CURRENT_NEWFILENAME))
LOGGER.Debug("File should be deleted: {0}", CONFIG.Config.DeleteOriginalFile)
LOGGER.Debug("File should be deleted: {0}", CURR_DELETE_ORIGIN)
If File.Exists(CURRENT_NEWFILENAME) And oStreamSuccessful Then
If CONFIG.Config.DeleteOriginalFile = True Then
If CURR_DELETE_ORIGIN = True Then
Try
My.Computer.FileSystem.DeleteFile(CURRENT_WORKFILE)
Catch ex As Exception
@@ -1371,6 +1371,10 @@ Public Class frmIndex
CURRENT_ISATTACHMENT = False
DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True)
CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile
checkItemDeleteSource.Enabled = True
checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
VIEWER_LICENSE = ClassDatabase.Execute_Scalar("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'", MyConnectionString)
DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE)
@@ -1382,6 +1386,14 @@ Public Class frmIndex
Else
CURRENT_DROPTYPE = DropType.Replace("|", "")
' Eine Datei aus FolderWatch wird IMMER gelöscht, egal wie die Einstellung in der Config lautet
If DropType.StartsWith("|FW") Then
CURR_DELETE_ORIGIN = True
checkItemDeleteSource.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else
checkItemDeleteSource.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
If DropType = "|DROPFROMFSYSTEM|" Then
If USER_LANGUAGE <> "de-DE" Then
Me.Text = "Indexing of dropped file"
@@ -1485,10 +1497,6 @@ Public Class frmIndex
Refresh_Dokart()
pnlIndex.Controls.Clear()
CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile
checkItemDeleteSource.Enabled = True
checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
checkItemTopMost.Checked = CONFIG.Config.TopMost
TopMost = CONFIG.Config.TopMost
BringToFront()
@@ -2373,7 +2381,7 @@ Public Class frmIndex
End Sub
Private Sub checkItemDeleteSource_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemDeleteSource.CheckedChanged
If FormLoaded = True Then
If FormLoaded = True And checkItemDeleteSource.Visibility <> DevExpress.XtraBars.BarItemVisibility.Never Then
CURR_DELETE_ORIGIN = checkItemDeleteSource.Checked
CONFIG.Config.DeleteOriginalFile = checkItemDeleteSource.Checked
CONFIG.Save()