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

rename default folder watch folder to GlobalIndexer, fix folder watch not working after first indexing

Browse Source
This commit is contained in:
Jonathan Jenne 2020-06-08 13:47:32 +02:00
parent cc3ceed9e3
commit 0a1717220f
3 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Global_Indexer/frmConfig_Basic.resx
View File

@ -912,7 +912,7 @@ ausgenommen werden sollen:</value>
<value>3</value> <value>3</value>
</data> </data>
<data name="btnFW_OwnFiles.Text" xml:space="preserve"> <data name="btnFW_OwnFiles.Text" xml:space="preserve">
<value>Ordner 'SimpleIndexer' in Eigenen Dateien erzeugen</value> <value>Ordner 'GlobalIndexer' in Eigenen Dateien erzeugen</value>
</data> </data>
<data name="&gt;&gt;btnFW_OwnFiles.Name" xml:space="preserve"> <data name="&gt;&gt;btnFW_OwnFiles.Name" xml:space="preserve">
<value>btnFW_OwnFiles</value> <value>btnFW_OwnFiles</value>
@ -936,7 +936,7 @@ ausgenommen werden sollen:</value>
<value>2</value> <value>2</value>
</data> </data>
<data name="btnFW_Desktop.Text" xml:space="preserve"> <data name="btnFW_Desktop.Text" xml:space="preserve">
<value>Ordner 'SimpleIndexer' auf Desktop erzeugen</value> <value>Ordner 'GlobalIndexer' auf Desktop erzeugen</value>
</data> </data>
<data name="&gt;&gt;btnFW_Desktop.Name" xml:space="preserve"> <data name="&gt;&gt;btnFW_Desktop.Name" xml:space="preserve">
<value>btnFW_Desktop</value> <value>btnFW_Desktop</value>

4
Global_Indexer/frmConfig_Basic.vb
View File

@ -224,7 +224,7 @@ Public Class frmConfig_Basic
End Sub End Sub
Private Sub btnFW_Desktop_Click(sender As Object, e As EventArgs) Handles btnFW_Desktop.Click Private Sub btnFW_Desktop_Click(sender As Object, e As EventArgs) Handles btnFW_Desktop.Click
CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "SimpleIndexer") CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "GlobalIndexer")
CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT") CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT")
End Sub End Sub
Sub CheckFolder(mypath As String, FOLDER_TYPE As String) Sub CheckFolder(mypath As String, FOLDER_TYPE As String)
@ -293,7 +293,7 @@ Public Class frmConfig_Basic
End Sub End Sub
Private Sub btnFW_OwnFiles_Click(sender As Object, e As EventArgs) Handles btnFW_OwnFiles.Click Private Sub btnFW_OwnFiles_Click(sender As Object, e As EventArgs) Handles btnFW_OwnFiles.Click
CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "SimpleIndexer") CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "GlobalIndexer")
CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT") CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT")
End Sub End Sub

36
Global_Indexer/frmIndex.vb
View File

@ -1372,6 +1372,8 @@ Public Class frmIndex
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:") MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:")
End Try End Try
End Select End Select
Else
INDEXING_ACTIVE = False
End If End If
End Sub End Sub
Private Sub frmIndex_Load(sender As Object, e As System.EventArgs) Handles Me.Load Private Sub frmIndex_Load(sender As Object, e As System.EventArgs) Handles Me.Load
@ -1949,30 +1951,6 @@ Public Class frmIndex
'Die Datei verschieben 'Die Datei verschieben
If Move_File2_Target() = True Then If Move_File2_Target() = True Then
_Logger.Debug(" ...Move_File2_Target durchlaufen") _Logger.Debug(" ...Move_File2_Target durchlaufen")
''Die Originaldatei löschen
'If DropType = "|DROPFROMFSYSTEM|" Then
' If CURR_DELETE_ORIGIN = True Then
' 'Die temporäre Datei löschen
' DeleteFile()
' End If
'ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
' 'Die temporäre Datei löschen
' If CURRENT_WORKFILE.EndsWith("pdf") Then
' DocumentViewer1.Done()
' DocumentViewer1.CloseDocument()
' End If
' DeleteFile()
'ElseIf (DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|") Then
' 'Die temporäre Datei löschen
' DeleteFile()
'ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
' 'Die temporäre Datei löschen
' DeleteFile()
'End If
CURRENT_LASTDOKART = cmbDokumentart.Text CURRENT_LASTDOKART = cmbDokumentart.Text
_Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.") _Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID
@ -2038,14 +2016,7 @@ Public Class frmIndex
CURRENT_WORKFILE_GUID = filerow.Item("GUID") CURRENT_WORKFILE_GUID = filerow.Item("GUID")
CURRENT_WORKFILE = filerow.Item("FILENAME2WORK") CURRENT_WORKFILE = filerow.Item("FILENAME2WORK")
DropType = filerow.Item("HANDLE_TYPE") DropType = filerow.Item("HANDLE_TYPE")
'Dim HandleType As String = filerow.Item("HANDLE_TYPE")
'If HandleType = "|DROPFROMFSYSTEM|" Then
' DropType = "dragdrop file"
'ElseIf HandleType = "|OUTLOOK_ATTMNT|" Then
' DropType = "dragdrop attachment"
'ElseIf HandleType = "|OUTLOOKMESSAGE|" Then
' DropType = "dragdrop message"
'End If
If WORK_FILE() = False Then If WORK_FILE() = False Then
err = True err = True
Exit For Exit For
@ -2059,7 +2030,6 @@ Public Class frmIndex
MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success") MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
End If End If
'DTACTUAL_FILES.Clear()
Me.Close() Me.Close()
End If End If
End If End If