Properly handle failed file processing from FileProcessingQueue tasks.

DragonQ · Oct 17, 2017 · bce440f · bce440f
1 parent 9eb0288
commit bce440f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/FileProcessingQueue.vb b/FileProcessingQueue.vb
@@ -190,6 +190,7 @@ Class FileProcessingQueue
 
         Dim Result As ReturnObject = Nothing
         Dim SuccessMessage = ""
+        Dim FailureMessage = ""
 
         MyFileProcessingInfo.CancelState.Token.ThrowIfCancellationRequested()
 
@@ -199,29 +200,35 @@ Class FileProcessingQueue
                 MyLog.Write(MyFileProcessingInfo.ProcessID, "Processing directory: " & MyFileProcessingInfo.FilePath, Information)
                 Result = MyFileProcessingInfo.FileParser.DeleteDirectoryInSyncFolder()
                 SuccessMessage = "Directory deleted:"
+                FailureMessage = "Directory deletion failed:"
             Case Is = FileProcessingInfo.ActionType.Deleted
                 MyLog.Write(MyFileProcessingInfo.ProcessID, "Processing file: " & MyFileProcessingInfo.FilePath, Information)
                 Result = MyFileProcessingInfo.FileParser.DeleteInSyncFolder()
                 SuccessMessage = "File deleted:"
+                FailureMessage = "File deletion failed:"
             Case Is = FileProcessingInfo.ActionType.Renamed
                 MyLog.Write(MyFileProcessingInfo.ProcessID, "Processing file: " & MyFileProcessingInfo.FilePath, Information)
                 Result = MyFileProcessingInfo.FileParser.RenameInSyncFolder(MyFileProcessingInfo.OldFilePath)
                 SuccessMessage = "File processed:"
+                FailureMessage = "File processing failed:"
             Case Is = FileProcessingInfo.ActionType.Created
                 MyLog.Write(MyFileProcessingInfo.ProcessID, "Processing file: " & MyFileProcessingInfo.FilePath, Information)
                 Result = MyFileProcessingInfo.FileParser.TransferToSyncFolder()
                 SuccessMessage = "File processed:"
+                FailureMessage = "File processing failed:"
             Case Is = FileProcessingInfo.ActionType.Changed
                 MyLog.Write(MyFileProcessingInfo.ProcessID, "Processing file: " & MyFileProcessingInfo.FilePath, Information)
                 Result = MyFileProcessingInfo.FileParser.DeleteInSyncFolder()
                 If Result.Success Then Result = MyFileProcessingInfo.FileParser.TransferToSyncFolder()
                 SuccessMessage = "File processed:"
+                FailureMessage = "File processing failed:"
         End Select
 
         If Result.Success Then
             MyFileProcessingInfo.ResultMessages = {SuccessMessage, MyFileProcessingInfo.FilePath.Substring(UserGlobalSyncSettings.SourceDirectory.Length)}
             Return New ReturnObject(True, "", MyFileProcessingInfo)
         Else
+            MyFileProcessingInfo.ResultMessages = {FailureMessage, MyFileProcessingInfo.FilePath.Substring(UserGlobalSyncSettings.SourceDirectory.Length)}
             Return New ReturnObject(False, Result.ErrorMessage, MyFileProcessingInfo)
         End If
 

diff --git a/TrayApp.vb b/TrayApp.vb
@@ -464,10 +464,14 @@ Public Class TrayApp
         If Not MyFileProcessingInfo.CancelState.IsCancellationRequested Then
             Dim ResultStrings As String() = MyFileProcessingInfo.ResultMessages()
 
-            If Result.Success AndAlso ResultStrings.Length >= 2 Then
-                If Tray.Visible Then Tray.ShowBalloonTip(BalloonTime, ResultStrings(0), ResultStrings(1), ToolTipIcon.Info)
+            If ResultStrings.Length >= 2 Then
+                If Result.Success Then
+                    If Tray.Visible Then Tray.ShowBalloonTip(BalloonTime, ResultStrings(0), ResultStrings(1), ToolTipIcon.Info)
+                Else
+                    If Tray.Visible Then Tray.ShowBalloonTip(BalloonTime, ResultStrings(0), ResultStrings(1), ToolTipIcon.Error)
+                End If
             Else
-                If Tray.Visible Then Tray.ShowBalloonTip(BalloonTime, ResultStrings(0), ResultStrings(1), ToolTipIcon.Error)
+                If Tray.Visible Then Tray.ShowBalloonTip(BalloonTime, "File processing failed!", Result.ErrorMessage, ToolTipIcon.Error)
             End If
         End If