MS18042016

Global_Indexer/ClassFilehandle.vb

@@ -1,7 +1,21 @@
 Imports System.IO
 Imports Independentsoft
+Imports System.Text.RegularExpressions
 
 Public Class ClassFilehandle
+    ''' <summary>
+    ''' Diese Funktion entfernt alle Zeichen aus dem übergebenen String
+    ''' die in Dateinamen nicht erlaubt sind.
+    ''' </summary>
+    ''' <param name="Input">Der zu prüfende String</param>
+    ''' <returns>String ohne nichterlaubte Zeichen</returns>
+    Public Shared Function InvalidCharacters(Input As String) As String
+        Dim replacement = ""
+        'Return System.Text.RegularExpressions.Regex.Replace(Input, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline)
+        Dim regexSearch = New String(Path.GetInvalidFileNameChars()) & New String(Path.GetInvalidPathChars())
+        Dim r = New Regex(String.Format("[{0}]", Regex.Escape(regexSearch)))
+        Return r.Replace(Input, replacement)
+    End Function
     Public Shared Function Decide_FileHandle(filename As String, handletype As String)
         Try
             If filename.EndsWith(".msg") Then
@@ -47,6 +61,7 @@ Public Class ClassFilehandle
 
             'Nur die MSGDatei ablegen
             Dim tempfile As String = Path.Combine(Path.GetTempPath, Path.GetFileNameWithoutExtension(msgname) & "_excl_att.msg")
+        
             If File.Exists(tempfile) Then
                 File.Delete(tempfile)
             End If
@@ -74,19 +89,20 @@ Public Class ClassFilehandle
                         attachment_name = attachment.LongFileName
                     End If
                     If Not attachment_name.Contains("inline") Then
+                        'Sonderzeichen entfernen
+                        attachment_name = ClassFilehandle.InvalidCharacters(attachment_name)
                         tempfile = Path.Combine(Path.GetTempPath, attachment_name)
-                        If File.Exists(tempfile) Then
-                            File.Delete(tempfile)
+                        tempfile = ClassFilehandle.Versionierung_Datei(tempfile)
+                        If tempfile <> "" Then
+                            attachment.Save(tempfile)
+                            'Datei in Array zum Templöschen speichern
+                            TEMP_FILES.Add(tempfile)
+                            If LogErrorsOnly = False Then ClassLogger.Add(">> Attachment (" & i1 & "):" & tempfile, False)
+                            'nun der Insert des Anhanges
+                            erfolgreich = Insert_GI_File(tempfile, ATT_EXTR)
+                            i1 += 1
                         End If
-                        attachment.Save(tempfile)
-                        'Datei in Array zum Templöschen speichern
-                        TEMP_FILES.Add(tempfile)
-                        If LogErrorsOnly = False Then ClassLogger.Add(">> Attachment (" & i1 & "):" & tempfile, False)
-                        'nun der Insert des Anhanges
-                        erfolgreich = Insert_GI_File(tempfile, ATT_EXTR)
-                        i1 += 1
                     End If
-
                 Next
             End If
             Return erfolgreich
@@ -130,4 +146,33 @@ Public Class ClassFilehandle
         End If
 
     End Function
+    Public Shared Function Versionierung_Datei(Dateiname As String)
+        Dim extension
+        Dim _NewFileString
+        Try
+            Dim version As Integer = 1
+
+            Dim Stammname As String = Path.GetDirectoryName(Dateiname) & "\" & Path.GetFileNameWithoutExtension(Dateiname)
+            extension = Path.GetExtension(Dateiname)
+
+            Dim _neuername As String = Stammname
+            'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "")
+            'Überprüfen ob File existiert
+            If File.Exists(_neuername & extension) = False Then
+                _NewFileString = _neuername
+            Else
+                Do While File.Exists(_neuername & extension)
+                    version = version + 1
+                    _neuername = Stammname & "~" & version
+                    _NewFileString = _neuername
+                Loop
+            End If
+            Return _NewFileString & extension
+        Catch ex As Exception
+            ClassLogger.Add(" - Error in versioning file - error: " & vbNewLine & ex.Message)
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in versioning file:")
+            Return ""
+        End Try
+
+    End Function
 End Class