Fixes for sharing/downloading maps (#865)

* Fix incorrect directory for downloaded maps
Fix non-hosts being able to download maps
Add better error handling

* Add try catch to delete calls

Author: 11EJDE11

DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs

@@ -106,7 +106,7 @@ Random random
                 true, (s) => ShowTunnelSelectionWindow("Select tunnel server:".L10N("Client:Main:SelectTunnelServerCommand"))));
             AddChatBoxCommand(new ChatBoxCommand("DOWNLOADMAP",
                 "Download a map from CNCNet's map server using a map ID and an optional filename.\nExample: \"/downloadmap MAPID [2] My Battle Map\"".L10N("Client:Main:DownloadMapCommandDescription"),
-                false, DownloadMapByIdCommand));
+                true, DownloadMapByIdCommand));
         }
 
         public event EventHandler GameLeft;

DXMainClient/Domain/Multiplayer/CnCNet/MapSharer.cs

@@ -374,71 +374,113 @@ public static string GetMapFileName(string sha1, string mapName)
 
         private static string DownloadMain(string sha1, string myGame, string mapName, out bool success)
         {
-            string customMapsDirectory = SafePath.CombineDirectoryPath(ProgramConstants.GamePath, "Maps", "Custom");
-            string mapFileName = GetMapFileName(sha1, mapName);
+            try
+            {
+                string customMapsDirectory = SafePath.CombineDirectoryPath(ProgramConstants.GamePath, "Maps", "Custom");
+                string mapFileName = GetMapFileName(sha1, mapName);
 
-            FileInfo destinationFile = SafePath.GetFile(customMapsDirectory, FormattableString.Invariant($"{mapFileName}.zip"));
+                FileInfo destinationFile = SafePath.GetFile(customMapsDirectory, FormattableString.Invariant($"{mapFileName}.zip"));
 
-            // This string is up here so we can check that there isn't already a .map file for this download.
-            // This prevents the client from crashing when trying to rename the unzipped file to a duplicate filename.
-            FileInfo newFile = SafePath.GetFile(customMapsDirectory, FormattableString.Invariant($"{mapFileName}.{ClientConfiguration.Instance.MapFileExtension}"));
+                // This string is up here so we can check that there isn't already a .map file for this download.
+                // This prevents the client from crashing when trying to rename the unzipped file to a duplicate filename.
+                FileInfo newFile = SafePath.GetFile(customMapsDirectory, FormattableString.Invariant($"{mapFileName}.{ClientConfiguration.Instance.MapFileExtension}"));
 
-            destinationFile.Delete();
-            newFile.Delete();
+                try
+                {
+                    destinationFile.Delete();
+                }
+                catch (Exception ex)
+                {
+                    Logger.Log($"MapSharer: Failed to delete existing zip file: {ex.Message}");
+                }
 
-            using (WebClient webClient = new ExtendedWebClient(DOWNLOAD_TIMEOUT))
-            {
-                if (string.IsNullOrWhiteSpace(ClientConfiguration.Instance.CnCNetMapDBDownloadURL))
+                try
+                {
+                    newFile.Delete();
+                }
+                catch (Exception ex)
+                {
+                    Logger.Log($"MapSharer: Failed to delete existing map file: {ex.Message}");
+                }
+
+                using (WebClient webClient = new ExtendedWebClient(DOWNLOAD_TIMEOUT))
+                {
+                    if (string.IsNullOrWhiteSpace(ClientConfiguration.Instance.CnCNetMapDBDownloadURL))
+                    {
+                        success = false;
+                        Logger.Log("MapSharer: Download URL is not configured.");
+                        return null;
+                    }
+
+                    string url = string.Format(CultureInfo.InvariantCulture, "{0}/{1}/{2}.zip", ClientConfiguration.Instance.CnCNetMapDBDownloadURL, myGame, sha1);
+
+                    try
+                    {
+                        Logger.Log($"MapSharer: Downloading URL: {url}");
+                        webClient.DownloadFile(url, destinationFile.FullName);
+                    }
+                    catch (Exception ex)
+                    {
+                        /*                    if (ex.Message.Contains("404"))
+                                            {
+                                                string messageToSend = "NOTICE " + ChannelName + " " + CTCPChar1 + CTCPChar2 + "READY 1" + CTCPChar2;
+                                                CnCNetData.ConnectionBridge.SendMessage(messageToSend);
+                                            }
+                                            else
+                                            {
+                                                //GlobalVars.WriteLogfile(ex.StackTrace.ToString(), DateTime.Now.ToString("hh:mm:ss") + " DownloadMap: " + ex.Message + _DestFile);
+                                                MessageBox.Show("Download failed:" + _DestFile);
+                                            }*/
+                        success = false;
+                        return ex.Message;
+                    }
+                }
+
+                destinationFile.Refresh();
+
+                if (!destinationFile.Exists)
                 {
                     success = false;
-                    Logger.Log("MapSharer: Download URL is not configured.");
                     return null;
                 }
 
-                string url = string.Format(CultureInfo.InvariantCulture, "{0}/{1}/{2}.zip", ClientConfiguration.Instance.CnCNetMapDBDownloadURL, myGame, sha1);
+                string extractedFile;
 
                 try
                 {
-                    Logger.Log($"MapSharer: Downloading URL: {url}");
-                    webClient.DownloadFile(url, destinationFile.FullName);
+                    extractedFile = ExtractZipFile(destinationFile.FullName, customMapsDirectory);
                 }
                 catch (Exception ex)
                 {
-                    /*                    if (ex.Message.Contains("404"))
-                                        {
-                                            string messageToSend = "NOTICE " + ChannelName + " " + CTCPChar1 + CTCPChar2 + "READY 1" + CTCPChar2;
-                                            CnCNetData.ConnectionBridge.SendMessage(messageToSend);
-                                        }
-                                        else
-                                        {
-                                            //GlobalVars.WriteLogfile(ex.StackTrace.ToString(), DateTime.Now.ToString("hh:mm:ss") + " DownloadMap: " + ex.Message + _DestFile);
-                                            MessageBox.Show("Download failed:" + _DestFile);
-                                        }*/
+                    Logger.Log($"MapSharer: Failed to extract map: {ex.Message}");
                     success = false;
                     return ex.Message;
                 }
-            }
-
-            destinationFile.Refresh();
 
-            if (!destinationFile.Exists)
-            {
-                success = false;
-                return null;
-            }
+                if (String.IsNullOrEmpty(extractedFile))
+                {
+                    success = false;
+                    return null;
+                }
 
-            string extractedFile = ExtractZipFile(destinationFile.FullName, newFile.FullName);
+                try
+                {
+                    destinationFile.Delete();
+                }
+                catch (Exception ex)
+                {
+                    Logger.Log($"MapSharer: Failed to delete zip file after extraction: {ex.Message}");
+                }
 
-            if (String.IsNullOrEmpty(extractedFile))
+                success = true;
+                return extractedFile;
+            }
+            catch (Exception ex)
             {
+                Logger.Log($"MapSharer: Map download failed with exception: {ex.Message}");
                 success = false;
-                return null;
+                return ex.Message;
             }
-
-            destinationFile.Delete();
-
-            success = true;
-            return extractedFile;
         }
 
         class FileToUpload