Compare commits
8 Commits
Release-Mo
...
5b3d2bf2c3
| Author | SHA1 | Date | |
|---|---|---|---|
| 5b3d2bf2c3 | |||
| 7204390e85 | |||
|
|
9dccbee8c9 | ||
|
|
af916cc5d2 | ||
|
|
5980d907b2 | ||
|
|
7f95c28b5e | ||
|
|
6b291e82a7 | ||
|
|
35bdee53e3 |
@@ -24,6 +24,13 @@ Public Class MailContainer
|
|||||||
''' </summary>
|
''' </summary>
|
||||||
Public ReadOnly Property MessageId As String
|
Public ReadOnly Property MessageId As String
|
||||||
|
|
||||||
|
''' <summary>
|
||||||
|
''' Eine zweite MessageID, in der das Mail-Datum berücksichtigt wird.
|
||||||
|
''' Wird verwendet wenn MessageId bereits existiert.
|
||||||
|
''' </summary>
|
||||||
|
''' <returns></returns>
|
||||||
|
Public ReadOnly Property MessageId2 As String
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' The subject, truncated to SUBJECT_MAX_LENGTH characters
|
''' The subject, truncated to SUBJECT_MAX_LENGTH characters
|
||||||
''' </summary>
|
''' </summary>
|
||||||
@@ -41,6 +48,7 @@ Public Class MailContainer
|
|||||||
|
|
||||||
MessageIdOriginal = pMail.MessageID
|
MessageIdOriginal = pMail.MessageID
|
||||||
MessageId = StringEx.GetShortHash(pMail.MessageID)
|
MessageId = StringEx.GetShortHash(pMail.MessageID)
|
||||||
|
MessageId2 = StringEx.GetShortHash(pMail.MessageID + pMail.Date.ToString())
|
||||||
|
|
||||||
Subject = ObjectEx.NotNull(pMail.Subject.Truncate(SUBJECT_MAX_LENGTH), String.Empty)
|
Subject = ObjectEx.NotNull(pMail.Subject.Truncate(SUBJECT_MAX_LENGTH), String.Empty)
|
||||||
SubjectOriginal = ObjectEx.NotNull(pMail.Subject, String.Empty)
|
SubjectOriginal = ObjectEx.NotNull(pMail.Subject, String.Empty)
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
|
|||||||
<Assembly: AssemblyDescription("")>
|
<Assembly: AssemblyDescription("")>
|
||||||
<Assembly: AssemblyCompany("")>
|
<Assembly: AssemblyCompany("")>
|
||||||
<Assembly: AssemblyProduct("DigitalData.EMLProfiler")>
|
<Assembly: AssemblyProduct("DigitalData.EMLProfiler")>
|
||||||
<Assembly: AssemblyCopyright("Copyright © 2025")>
|
<Assembly: AssemblyCopyright("Copyright © 2026")>
|
||||||
<Assembly: AssemblyTrademark("3.0.10.0")>
|
<Assembly: AssemblyTrademark("3.5.1.0")>
|
||||||
|
|
||||||
<Assembly: ComVisible(False)>
|
<Assembly: ComVisible(False)>
|
||||||
|
|
||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("3.5.0.0")>
|
<Assembly: AssemblyVersion("3.5.1.0")>
|
||||||
<Assembly: AssemblyFileVersion("3.5.0.0")>
|
<Assembly: AssemblyFileVersion("3.5.1.0")>
|
||||||
|
|||||||
@@ -117,45 +117,29 @@ Public Class clsWorkEmail
|
|||||||
|
|
||||||
CURRENT_MAIL_UID = poUID
|
CURRENT_MAIL_UID = poUID
|
||||||
|
|
||||||
' 05.06.23
|
If String.IsNullOrEmpty(_CurrentMail.SubjectOriginal) Then
|
||||||
' The MessageID is now replaced by a SHA256 Hash of the MessageID
|
|
||||||
' The reason is that MessageIDs can be very long,
|
|
||||||
' which results in the final filepath exceeding the Windream/Windows maximum of 255 chars.
|
|
||||||
' 28.07.23
|
|
||||||
' The SHA256 Hash is now truncated to half the size
|
|
||||||
' which should be a good balance between uniqueness and length
|
|
||||||
'CURRENT_MAIL_MESSAGE_ID = StringEx.GetShortHash(pMailMessage.MessageID)
|
|
||||||
|
|
||||||
'If String.IsNullOrEmpty(CURRENT_MAIL_MESSAGE_ID) Then
|
|
||||||
' CURRENT_MAIL_MESSAGE_ID = Guid.NewGuid.ToString()
|
|
||||||
'
|
|
||||||
'ElseIf CURRENT_MAIL_MESSAGE_ID.Length > MESSAGE_ID_MAX_LENGTH Then
|
|
||||||
'
|
|
||||||
' ' MessageIds longer than 100 chars will be replaced with a guid to avoid errors
|
|
||||||
' ' because of file paths longer than 255 chars.
|
|
||||||
' CURRENT_MAIL_MESSAGE_ID = Hash(CURRENT_MAIL_MESSAGE_ID)
|
|
||||||
'
|
|
||||||
'Else
|
|
||||||
' ' Default case, should cover most message ids
|
|
||||||
' CURRENT_MAIL_MESSAGE_ID = CURRENT_MAIL_MESSAGE_ID.Replace(">", "").Replace("<", "")
|
|
||||||
' CURRENT_MAIL_MESSAGE_ID = CURRENT_MAIL_MESSAGE_ID.Replace("'", "")
|
|
||||||
'
|
|
||||||
'End If
|
|
||||||
|
|
||||||
If IsNothing(_CurrentMail.SubjectOriginal) Then
|
|
||||||
CURRENT_MAIL_SUBJECT = String.Empty
|
CURRENT_MAIL_SUBJECT = String.Empty
|
||||||
_Logger.Warn("Subject was nothing!")
|
_Logger.Warn("Subject was empty or nothing!")
|
||||||
Else
|
Else
|
||||||
CURRENT_MAIL_SUBJECT = _CurrentMail.SubjectOriginal.ToUpper.EscapeForSQL()
|
CURRENT_MAIL_SUBJECT = _CurrentMail.SubjectOriginal.ToUpper.EscapeForSQL()
|
||||||
_Logger.Debug("Fixed Subject: [{0}]", CURRENT_MAIL_SUBJECT)
|
_Logger.Debug("Fixed Subject: [{0}]", CURRENT_MAIL_SUBJECT)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
' Checking the messageID - could be a duplicate
|
||||||
|
_Logger.Debug($"messageID: '{_CurrentMail.MessageId}' - messageID2: '{_CurrentMail.MessageId2}'")
|
||||||
|
|
||||||
Dim oSql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{_CurrentMail.MessageId}'"
|
Dim oSql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{_CurrentMail.MessageId}'"
|
||||||
Dim oHistoryID = _DB_MSSQL.GetScalarValue(oSql)
|
Dim oHistoryID = _DB_MSSQL.GetScalarValue(oSql)
|
||||||
|
|
||||||
If oHistoryID > 0 And IS_LOCAL_TEST = False Then
|
If oHistoryID > 0 And IS_LOCAL_TEST = False Then
|
||||||
_Logger.Info($"Message with subject [{_CurrentMail.SubjectOriginal}] from [{_CurrentMail.SenderAddress}] has already been worked!")
|
_Logger.Warn("Found a MessageID already in use! Try MessageID2")
|
||||||
Return True
|
|
||||||
|
oSql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{_CurrentMail.MessageId2}'"
|
||||||
|
oHistoryID = _DB_MSSQL.GetScalarValue(oSql)
|
||||||
|
|
||||||
|
If oHistoryID > 0 And IS_LOCAL_TEST = False Then
|
||||||
|
_Logger.Warn("Found a MessageID2 already in use!")
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim oTempMailExists As Boolean = Save2TempDirectory(_CurrentMail)
|
Dim oTempMailExists As Boolean = Save2TempDirectory(_CurrentMail)
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -57,13 +57,13 @@
|
|||||||
<Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<Reference Include="DigitalData.Modules.Config">
|
<Reference Include="DigitalData.Modules.Config">
|
||||||
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
|
<HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="DigitalData.Modules.Database">
|
<Reference Include="DigitalData.Modules.Database">
|
||||||
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
|
<HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="DigitalData.Modules.Logging">
|
<Reference Include="DigitalData.Modules.Logging">
|
||||||
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
<HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="EmailProfiler.Common">
|
<Reference Include="EmailProfiler.Common">
|
||||||
<HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
|
<HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
|
||||||
|
|||||||
Reference in New Issue
Block a user