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

Reject emoji file names

Browse Source
This commit is contained in:
Jonathan Jenne 2022-02-01 14:39:46 +01:00
parent 934d137651
commit d70eff842a
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Global_Indexer/ClassFileDrop.vb
View File

@ -1,6 +1,6 @@
Imports System.IO Imports System.IO
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports DigitalData.Modules.Language.Utils
Public Class ClassFileDrop Public Class ClassFileDrop
@ -24,8 +24,19 @@ Public Class ClassFileDrop
oFilesFromEvent = e.Data.GetData(DataFormats.FileDrop) oFilesFromEvent = e.Data.GetData(DataFormats.FileDrop)
' Loop through the array and add the files to the list. ' Loop through the array and add the files to the list.
For oIndex = 0 To oFilesFromEvent.Length - 1 For oIndex = 0 To oFilesFromEvent.Length - 1
LOGGER.Info("Simple FileDrop - File: " & oFilesFromEvent(oIndex)) 'Dim oFileName As String = e.Data.GetData("FileNameW")
FilesDropped.Add("|DROPFROMFSYSTEM|" & oFilesFromEvent(oIndex))
Dim oFileName = oFilesFromEvent(oIndex)
If TestContainsInvalidCharacters(oFileName) Then
MsgBox($"Die Datei [{oFileName}] enthält ungültige Zeichen im Dateinamen. Bitte benennen Sie sie vor der Ablage um.", MsgBoxStyle.Critical, "Global Indexer")
Return False
End If
LOGGER.Info("Simple FileDrop - File: " & oFileName)
FilesDropped.Add("|DROPFROMFSYSTEM|" & oFileName)
'ReDim Preserve FilesDropped(oIndex) 'ReDim Preserve FilesDropped(oIndex)
'FilesDropped(oIndex) = "|DROPFROMFSYSTEM|" & oFilesFromEvent(oIndex) 'FilesDropped(oIndex) = "|DROPFROMFSYSTEM|" & oFilesFromEvent(oIndex)

10
Global_Indexer/frmStart.vb
View File

@ -112,12 +112,14 @@ Public Class frmStart
For Each Filerow As DataRow In DTACTUAL_FILES.Rows For Each Filerow As DataRow In DTACTUAL_FILES.Rows
Dim oFileString As String = Filerow.Item("FILENAME2WORK") Dim oFileString As String = Filerow.Item("FILENAME2WORK")
Dim oFileGuid = Filerow.Item("GUID")
Dim oFileHash = Utils.NotNull(Filerow.Item("FILE_HASH"), "")
LOGGER.Info("Processing user file {0}", oFileString) LOGGER.Info("Processing user file {0}", oFileString)
CURRENT_FILENAME = Filerow.Item("FILENAME2WORK") CURRENT_FILENAME = oFileString
CURRENT_WORKFILE_GUID = Filerow.Item(0) CURRENT_WORKFILE_GUID = oFileGuid
CURRENT_WORKFILE = Filerow.Item("FILENAME2WORK") CURRENT_WORKFILE = oFileString
CURRENT_WORKFILE_HASH = Utils.NotNull(Filerow.Item("FILE_HASH"), "") CURRENT_WORKFILE_HASH = oFileHash
LOGGER.Info(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE) LOGGER.Info(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE)
If IO.File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then If IO.File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then