Fix message box after file transfer.

immense · Apr 22, 2020 · 2da785e · 2da785e
1 parent b01ac18
commit 2da785e
Showing 1 changed file with 38 additions and 7 deletions.
diff --git a/ScreenCast.Core/Services/FileTransferService.cs b/ScreenCast.Core/Services/FileTransferService.cs
@@ -11,6 +11,7 @@
 using System.Threading;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
+using Remotely.Shared.Win32;
 
 namespace Remotely.ScreenCast.Core.Services
 {
@@ -23,9 +24,10 @@ public interface IFileTransferService
 
     public class FileTransferService : IFileTransferService
     {
-        private static readonly ConcurrentDictionary<string, FileStream> _partialTransfers = new ConcurrentDictionary<string, FileStream>();
+        private static readonly ConcurrentDictionary<string, FileStream> partialTransfers = new ConcurrentDictionary<string, FileStream>();
 
-        private static readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1);
+        private static readonly SemaphoreSlim writeLock = new SemaphoreSlim(1);
+        private static volatile bool messageBoxPending;
 
         public string GetBaseDirectory()
         {
@@ -48,7 +50,7 @@ public async Task ReceiveFile(byte[] buffer, string fileName, string messageId,
         {
             try
             {
-                await _writeLock.WaitAsync();
+                await writeLock.WaitAsync();
 
                 var baseDir = GetBaseDirectory();
 
@@ -71,10 +73,10 @@ public async Task ReceiveFile(byte[] buffer, string fileName, string messageId,
                     File.Create(filePath).Close();
                     SetFileOrFolderPermissions(filePath);
                     var fs = new FileStream(filePath, FileMode.OpenOrCreate);
-                    _partialTransfers.AddOrUpdate(messageId, fs, (k,v) => fs);
+                    partialTransfers.AddOrUpdate(messageId, fs, (k,v) => fs);
                 }
 
-                var fileStream = _partialTransfers[messageId];
+                var fileStream = partialTransfers[messageId];
 
                 if (buffer?.Length > 0)
                 {
@@ -85,7 +87,7 @@ public async Task ReceiveFile(byte[] buffer, string fileName, string messageId,
                 if (endOfFile)
                 {
                     fileStream.Close();
-                    _partialTransfers.Remove(messageId, out _);
+                    partialTransfers.Remove(messageId, out _);
                     if (EnvironmentHelper.IsWindows)
                     {
                         Process.Start("explorer.exe", baseDir);
@@ -98,7 +100,12 @@ public async Task ReceiveFile(byte[] buffer, string fileName, string messageId,
             }
             finally
             {
-                _writeLock.Release();
+                writeLock.Release();
+
+                if (endOfFile)
+                {
+                    await Task.Run(ShowTransferComplete);
+                }
             }
         }
 
@@ -149,5 +156,29 @@ private void SetFileOrFolderPermissions(string path)
                 }
             }
         }
+
+        private void ShowTransferComplete()
+        {
+            // Prevent multiple dialogs from popping up.
+            if (!messageBoxPending)
+            {
+                if (EnvironmentHelper.IsWindows)
+                {
+                    messageBoxPending = true;
+                    var result = Win32Interop.ShowMessageBox(IntPtr.Zero,
+                                    "File transfer complete.  Show folder?",
+                                    "Transfer Complete",
+                                    User32.MessageBoxType.MB_YESNO | 
+                                    User32.MessageBoxType.MB_ICONINFORMATION |
+                                    User32.MessageBoxType.MB_TOPMOST);
+
+                    if (result == User32.MessageBoxResult.IDYES)
+                    {
+                        Process.Start("explorer.exe", GetBaseDirectory());
+                    }
+                    messageBoxPending = false;
+                }
+            }
+        }
     }
 }