Changeset 1279

Timestamp:

1/31/2010 4:41:08 AM (6 weeks ago)

Author:

vessper

Message:

31/01/2010 (1.14.0.1279)

---

- Core: Added threaded code for the EveMail? retrieval functions to avoid lockup
- Core: Added EveMail? download status messages

Location:

trunk

Files:

• EveHQ.Core/EveMail.vb (modified) (11 diffs)
• EveHQ/Forms/frmMail.vb (modified) (3 diffs)

trunk/EveHQ.Core/EveMail.vb

@@ -7 +7 @@
     Dim MailTimeFormat As String = "yyyy-MM-dd HH:mm:ss"
     Dim culture As System.Globalization.CultureInfo = New System.Globalization.CultureInfo("en-GB")
+
+    Public Event MailProgress(ByVal Status As String)
 
     Public Sub GetMail()
@@ -30 +32 @@
                     Dim mAccount As EveHQ.Core.EveAccount = CType(EveHQ.Core.HQ.EveHQSettings.Accounts.Item(accountName), Core.EveAccount)
                     ' Add in the data for mailing lists
+                    RaiseEvent MailProgress("Processing Mailing Lists for " & mPilot.Name & "...")
                     Call EveHQ.Core.DataFunctions.WriteMailingListIDsToDatabase(mPilot)
                     ' Make a call to the EveHQ.Core.API to fetch the EveMail
+                    RaiseEvent MailProgress("Fetching EveMails for " & mPilot.Name & "...")
                     Dim mailXML As New XmlDocument
                     mailXML = EveHQ.Core.EveAPI.GetAPIXML(EveHQ.Core.EveAPI.APIRequest.MailMessages, mAccount, mPilot.ID, EveHQ.Core.EveAPI.APIReturnMethod.ReturnStandard)
@@ -74 +78 @@
 
         ' Stage 3: Check the messages which have already been posted
+        RaiseEvent MailProgress("Checking for new EveMails for all characters...")
         Dim existingMails As New ArrayList
         Dim strExistingMails As New StringBuilder
@@ -93 +98 @@
 
         ' Stage 4: Post all new messages to the database
+        RaiseEvent MailProgress("Posting new EveMails to the database...")
         Dim NewMails As New ArrayList
         Dim strInsert As String = "INSERT INTO eveMail (messageKey, messageID, originatorID, senderID, sentDate, title, toCorpOrAllianceID, toCharacterIDs, toListIDs, readMail) VALUES "
@@ -128 +134 @@
 
         ' Stage 5: Get all the IDs and parse them
+        RaiseEvent MailProgress("Posting EveMail IDs to the database...")
         Dim IDs As New ArrayList
         For Each cMail As EveHQ.Core.EveMailMessage In Mails.Values
@@ -143 +150 @@
         ' Add in the Mailing List IDs
         For Each cMail As EveHQ.Core.EveMailMessage In Mails.Values
-            EveHQ.Core.DataFunctions.ParseIDs(IDs, cMail.ToCorpAllianceIDs)
+            EveHQ.Core.DataFunctions.ParseIDs(IDs, cMail.ToListIDs)
         Next
 
         ' Send E-mail notification of new mails if required
         If EveHQ.Core.HQ.EveHQSettings.NotifyEveMail = True And NewMails.Count > 0 Then
+            RaiseEvent MailProgress("Sending notification of new mails...")
             Call SendEmailForNewEveMails(NewMails, IDs)
         End If
@@ -174 +182 @@
                     Dim mAccount As EveHQ.Core.EveAccount = CType(EveHQ.Core.HQ.EveHQSettings.Accounts.Item(accountName), Core.EveAccount)
                     ' Make a call to the EveHQ.Core.API to fetch the EveMail
+                    RaiseEvent MailProgress("Fetching Eve Notifications for " & mPilot.Name & "...")
                     Dim mailXML As New XmlDocument
                     mailXML = EveHQ.Core.EveAPI.GetAPIXML(EveHQ.Core.EveAPI.APIRequest.Notifications, mAccount, mPilot.ID, EveHQ.Core.EveAPI.APIReturnMethod.ReturnStandard)
@@ -213 +222 @@
 
         ' Stage 3: Check the messages which have already been posted
+        RaiseEvent MailProgress("Checking for new Eve Notifications for all characters...")
         Dim existingMails As New ArrayList
         Dim strExistingMails As New StringBuilder
@@ -232 +242 @@
 
         ' Stage 4: Post all new messages to the database
+        RaiseEvent MailProgress("Posting new Eve Notifications to the database...")
         Dim newNotifys As New ArrayList
         Dim strInsert As String = "INSERT INTO eveNotifications (messageKey, messageID, originatorID, senderID, typeID, sentDate, readMail) VALUES "
@@ -265 +276 @@
 
         ' Stage 5: Get all the IDs and parse them
+        RaiseEvent MailProgress("Posting Eve Notification IDs to the database...")
         Dim IDs As New ArrayList
         For Each cNotice As EveHQ.Core.EveNotification In Notices.Values
@@ -276 +288 @@
         ' Send E-mail notification of new mails if required
         If EveHQ.Core.HQ.EveHQSettings.NotifyEveMail = True And newNotifys.Count > 0 Then
+            RaiseEvent MailProgress("Sending notification of new notices...")
             Call SendEmailForNewEveNotifications(newNotifys, IDs)
         End If

trunk/EveHQ/Forms/frmMail.vb

@@ -7 +7 @@
     Dim displayPilot As New EveHQ.Core.Pilot
     Dim cDisplayPilotName As String = ""
+    Dim mailStatus As String = ""
 
     Public Property DisplayPilotName() As String
@@ -76 +77 @@
 
     Private Sub btnDownloadMail_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnDownloadMail.Click
-
-        Me.Cursor = Cursors.WaitCursor
-
+        Threading.ThreadPool.QueueUserWorkItem(AddressOf MailUpdateThread)
+    End Sub
+
+    Private Sub MailUpdateThread(ByVal state As Object)
         Dim myMail As New EveHQ.Core.EveMail
+        AddHandler myMail.MailProgress, AddressOf DisplayMailProgress
+        btnDownloadMail.Enabled = False
         Call myMail.GetMail()
-
+        Me.Invoke(New MethodInvoker(AddressOf MailUpdateCompleted))
+    End Sub
+
+    Private Sub DisplayMailProgress(ByVal Status As String)
+        mailStatus = Status
+        Me.Invoke(New MethodInvoker(AddressOf UpdateMailProgress))
+    End Sub
+
+    Private Sub UpdateMailProgress()
+        lblDownloadMailStatus.Text = mailStatus
+    End Sub
+
+    Private Sub MailUpdateCompleted()
         ' Update the display with EveMail
         Call Me.UpdateMailInfo()
-
-        Me.Cursor = Cursors.Default
-
+        lblDownloadMailStatus.Text = "Mail Processing Complete!"
+        btnDownloadMail.Enabled = True
         Call frmEveHQ.UpdateEveMailButton()
-
     End Sub
 
@@ -273 +287 @@
     End Sub
 
-   
+
 End Class