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

MS

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber
2017-04-18 16:08:05 +02:00
parent ca7a26beb9
commit 701cce5dff
9 changed files with 137 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Global_Indexer/frmIndex.vb
View File

@@ -1788,8 +1788,8 @@ Public Class frmIndex
'Me.VWINDEX_AUTOMTableAdapter.Connection.ConnectionString = My.Settings.MyConnectionString
'Me.VWINDEX_MANTableAdapter.Connection.ConnectionString = My.Settings.MyConnectionString
Catch ex As Exception
ClassLogger.Add(" - Unexpected error inm Speichern der Verbindung - Fehler: " & vbNewLine & ex.Message)
MsgBox("Unexpected error inm Speichern der Verbindung: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
ClassLogger.Add(" - Unexpected error in Speichern der Verbindung - Fehler: " & vbNewLine & ex.Message)
MsgBox("Unexpected error in Speichern der Verbindung: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
End Try
End Sub
@@ -2164,37 +2164,53 @@ Public Class frmIndex
Else
Dim tempFilename = My.Computer.FileSystem.GetTempFileName()
Dim tempFilename1 = My.Computer.FileSystem.GetTempFileName()
Try
Me.grpBetreff.Dock = DockStyle.Top
Me.grpbxMailBody.Dock = DockStyle.Fill
Dim msg_email As New Msg.Message(CURRENT_WORKFILE)
msg_email.Encoding = Encoding.Unicode
Dim headers As String = ClassEmailHeaderExtractor.getMessageHeaders(msg_email)
If LogErrorsOnly = False Then ClassLogger.Add(" EMAIL-HEADER: " & headers, False)
'Eine tempfile generieren
Dim name = Path.GetFileNameWithoutExtension(tempFilename)
tempFilename = Path.Combine(Path.GetDirectoryName(tempFilename), name & ".html")
name = Path.GetFileNameWithoutExtension(tempFilename1)
tempFilename1 = Path.Combine(Path.GetDirectoryName(tempFilename1), name & ".msg")
msg_email.Save(tempFilename1)
Dim msg_email_unicode As New Msg.Message(tempFilename1)
TEMP_FILES.Add(tempFilename)
TEMP_FILES.Add(tempFilename1)
If LogErrorsOnly = False Then ClassLogger.Add(" ...tempFilename: " & tempFilename, False)
If LogErrorsOnly = False Then ClassLogger.Add(" ...tempFilename1: " & tempFilename1, False)
'tempfile löschen
If My.Computer.FileSystem.FileExists(tempFilename) Then
My.Computer.FileSystem.DeleteFile(tempFilename)
End If
If msg_email.Subject = "" Then
Me.txtBetreff.Text = "!! No subject in email !!"
If msg_email_unicode.Subject = "" Then
Me.txtBetreff.Text = "!!No subject in email!!"
Else
Dim betreff = ClassHelper.encode_utf8(msg_email.Subject)
If LogErrorsOnly = False Then ClassLogger.Add(" ...subject before converting: '" & msg_email_unicode.Subject & "'", False)
Dim betreff = ClassHelper.encode_utf8(msg_email_unicode.Subject)
If Not IsNothing(betreff) Then
If ClassHelper.CheckSpecialSigns(betreff) > 0 Then
End If
If LogErrorsOnly = False Then ClassLogger.Add(" ...subject after converting: " & betreff, False)
Me.txtBetreff.Text = betreff
Else
Me.txtBetreff.Text = msg_email.Subject
ClassLogger.Add(" ...subject could not be converted to utf8!", False)
Me.txtBetreff.Text = msg_email_unicode.Subject
End If
End If
'Try
Dim wFile As System.IO.FileStream
Dim byteData() As Byte
byteData = msg_email.BodyHtml
byteData = msg_email_unicode.BodyHtml
If LogErrorsOnly = False Then ClassLogger.Add(" ...byteData HTML finished", False)
' MsgBox(msg_email.InternetCodePage)
' wFile = New FileStream(tempFilename, FileMode.Append)
@@ -2203,10 +2219,10 @@ Public Class frmIndex
'Catch ex As IOException
' MsgBox(ex.ToString)
'End Try
If IsNothing(msg_email.BodyHtml) Then
File.WriteAllText(tempFilename, msg_email.Body, System.Text.Encoding.UTF8)
If IsNothing(msg_email_unicode.BodyHtml) Then
File.WriteAllText(tempFilename, msg_email_unicode.Body, System.Text.Encoding.UTF8)
Else
Dim vOut As String = System.Text.Encoding.UTF8.GetString(msg_email.BodyHtml)
Dim vOut As String = System.Text.Encoding.UTF8.GetString(msg_email_unicode.BodyHtml)
File.WriteAllText(tempFilename, vOut, System.Text.Encoding.UTF8)
End If