Added check for install path. Disallows installing content into into the directory where the OR exe's reside. Might be a bit too strict, but placing routes in "C:\Program Files (x86)" might not be a good idea anyway.

Author: sweiland-openrails

Source/Menu/DownloadContentForm.Designer.cs

@@ -30,6 +30,7 @@
 using System.Net;
 using System.IO.Compression;
 using System.Drawing;
+using ORTS.Common;
 
 namespace ORTS
 {
@@ -131,8 +132,8 @@ private void dataGridViewDownloadContent_SelectionChanged(object sender, EventAr
         }
         #endregion
 
-        #region InstallPathButton
-        private void InstallPathButton_Click(object sender, EventArgs e)
+        #region InstallPathBrowseButton
+        private void InstallPathBrowseButton_Click(object sender, EventArgs e)
         {
             using (FolderBrowserDialog folderBrowser = new FolderBrowserDialog())
             {
@@ -151,13 +152,33 @@ private void InstallPathButton_Click(object sender, EventArgs e)
         private void DownloadContentButton_Click(object sender, EventArgs e)
         {
             string installPath = InstallPathTextBox.Text;
+            if (installPath.EndsWith(@"\"))
+            {
+                installPath = installPath.Remove(installPath.Length - 1, 1);
+            }
+            installPath = Path.GetFullPath(installPath);
+
             string installPathRoute = Path.Combine(installPath, RouteName);
             string message;
 
             DisableButtons();
 
             // various checks for the directory where the route is installed
 
+            string pathDirectoryExe = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase);
+
+            string topPathDirectoryExe = DirectoryAndFiles.determineTopDirectory(pathDirectoryExe.Substring(6));
+            string topInstallPath = DirectoryAndFiles.determineTopDirectory(installPath);
+
+            if (topPathDirectoryExe.Equals(topInstallPath, StringComparison.OrdinalIgnoreCase))
+            {
+                message = Catalog.GetStringFmt("Top directory {0} is the same for exe and route, installing in this directory not allowed", topInstallPath);
+                MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+                // cancelled
+                EnableButtons();
+                return;
+            }
+
             DriveInfo dInfo = new DriveInfo(installPathRoute);
 
             long size = Routes[RouteName].InstallSize + Routes[RouteName].DownloadSize;
@@ -600,14 +621,15 @@ void StartButton_Click(object sender, EventArgs e)
             Cursor.Current = Cursors.WaitCursor;
 
             RouteSettings.Route route = Routes[RouteName];
+            string contentName = route.ContentName;
             MainForm mainForm = ((MainForm)Owner);
 
             mainForm.DoWithTask = false;
 
             try
             {
                 mainForm.LoadFolderList();
-                mainForm.comboBoxFolder.SelectedIndex = determineSelectedIndex(mainForm.comboBoxFolder, RouteName);
+                mainForm.comboBoxFolder.SelectedIndex = determineSelectedIndex(mainForm.comboBoxFolder, contentName);
 
                 mainForm.LoadRouteList();
                 mainForm.comboBoxRoute.SelectedIndex = determineSelectedIndex(mainForm.comboBoxRoute, route.Start.Route);
@@ -739,7 +761,7 @@ void DeleteButton_Click(object sender, EventArgs e)
             }
             Cursor.Current = Cursors.WaitCursor;
 
-            directoryDelete(Routes[RouteName].DirectoryInstalledIn);
+            DirectoryAndFiles.directoryDelete(Routes[RouteName].DirectoryInstalledIn);
 
             if (Settings.Folders.Folders[Routes[RouteName].ContentName] == Routes[RouteName].ContentDirectory)
             {
@@ -757,28 +779,6 @@ void DeleteButton_Click(object sender, EventArgs e)
 
             EnableButtons();
         }
-
-        private void directoryDelete(string directoryName)
-        {
-            if (Directory.Exists(directoryName))
-            {
-                directoryRemoveReadOnlyFlags(directoryName);
-                Directory.Delete(directoryName, true);
-            }
-        }
-
-        private void directoryRemoveReadOnlyFlags(string directoryName)
-        {
-            foreach (string filename in Directory.GetFiles(directoryName))
-            {
-                FileInfo file = new FileInfo(filename);
-                file.IsReadOnly = false;
-            }
-            foreach (string subDirectoryName in Directory.GetDirectories(directoryName))
-            {
-                directoryRemoveReadOnlyFlags(subDirectoryName);
-            }
-        }
         #endregion
 
         private void DisableButtons()

Source/Menu/DownloadContentForm.cs

@@ -0,0 +1,73 @@
+// COPYRIGHT 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2023 by the Open Rails project.
+// 
+// This file is part of Open Rails.
+// 
+// Open Rails is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Open Rails is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.IO;
+using Microsoft.SqlServer.Server;
+
+namespace ORTS.Common
+{
+    public class DirectoryAndFiles
+    {
+
+        public static void directoryDelete(string directoryName)
+        {
+            if (Directory.Exists(directoryName))
+            {
+                // remove the read only flags,
+                // otherwise the Directory.delete does not work in case read only files exists
+                directoryRemoveReadOnlyFlags(directoryName);
+                Directory.Delete(directoryName, true);
+            }
+        }
+
+        private static void directoryRemoveReadOnlyFlags(string directoryName)
+        {
+            foreach (string filename in Directory.GetFiles(directoryName))
+            {
+                _ = new FileInfo(filename)
+                {
+                    IsReadOnly = false
+                };
+            }
+            foreach (string subDirectoryName in Directory.GetDirectories(directoryName))
+            {
+                directoryRemoveReadOnlyFlags(subDirectoryName);
+            }
+        }
+
+        //
+        // example:
+        //  input:  D:\OpenRailsMaster\Program
+        //  output: D:\OpenRailsMaster
+        //
+        public static string determineTopDirectory(string directoryName)
+        { 
+            string tmpDirectoryName = directoryName;
+            string topDirectoryName = directoryName;
+
+            while (Directory.GetParent(tmpDirectoryName) != null)
+            {
+                topDirectoryName = tmpDirectoryName;
+                tmpDirectoryName = Directory.GetParent(tmpDirectoryName).ToString();
+            }
+
+            return topDirectoryName;
+        }
+    }
+}

Source/ORTS.Common/DirectoryAndFiles.cs

@@ -30,7 +30,7 @@ public class Route
         public readonly string Description;
         public readonly string Path;
 
-        GettextResourceManager Catalog = new GettextResourceManager("ORTS.Menu");
+        readonly GettextResourceManager Catalog = new GettextResourceManager("ORTS.Menu");
 
         Route(string path)
         {

Source/ORTS.Menu/Routes.cs

@@ -23,6 +23,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using LibGit2Sharp;
+using ORTS.Common;
 
 namespace ORTS.Settings
 {
@@ -191,7 +192,7 @@ public void LoadContentAndInstalled()
                         }
                     }
 
-                    directoryDelete(definedContentJsonDirectoryName);
+                    DirectoryAndFiles.directoryDelete(definedContentJsonDirectoryName);
                 }
                 catch (Exception error)
                 {
@@ -245,31 +246,6 @@ private string convertResultToString(JToken result, string fieldName)
             }
         }
 
-        private void directoryDelete(string directoryName)
-        {
-            if (Directory.Exists(directoryName))
-            {
-                // remove the read only flags, otherwise the Directory.delete does not work
-                directoryRemoveReadOnlyFlags(directoryName);
-                Directory.Delete(directoryName, true);
-            }
-        }
-
-        private void directoryRemoveReadOnlyFlags(string directoryName)
-        {
-            foreach (string filename in Directory.GetFiles(directoryName))
-            {
-                _ = new FileInfo(filename)
-                {
-                    IsReadOnly = false
-                };
-            }
-            foreach (string subDirectoryName in Directory.GetDirectories(directoryName))
-            {
-                directoryRemoveReadOnlyFlags(subDirectoryName);
-            }
-        }
-
         public void Save()
         {
             IDictionary<string, Route> routes = new Dictionary<string, Route>();