DynamoDS
diff --git a/‎src/DynamoCore/Configuration/PathManager.cs
Copy file name to clipboard
+22-9Lines changed: 22 additions & 9 deletions b/‎src/DynamoCore/Configuration/PathManager.cs
Copy file name to clipboard
+22-9Lines changed: 22 additions & 9 deletions
diff --git a/‎src/DynamoCore/Configuration/PreferenceSettings.cs
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions b/‎src/DynamoCore/Configuration/PreferenceSettings.cs
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
Copy file name to clipboard
+67-3Lines changed: 67 additions & 3 deletions b/‎src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
Copy file name to clipboard
+67-3Lines changed: 67 additions & 3 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -87,6 +87,7 @@ class PathManager : IPathManager
         private readonly HashSet<string> preloadedLibraries;
         private readonly HashSet<string> extensionsDirectories;
         private readonly HashSet<string> viewExtensionsDirectories;
+        private readonly IPathResolver pathResolver;
 
         #endregion
 
@@ -148,9 +149,21 @@ public string LogDirectory
             get { return logDirectory; }
         }
 
+        /// <summary>
+        /// Default directory where new packages are downloaded to.
+        /// This directory path is user configurable and if set to something other than the default,
+        /// the currently selected path can be obtained from preference settings.
+        /// </summary>
         public string DefaultPackagesDirectory
         {
-            get { return TransformPath(RootDirectories.First(), PackagesDirectoryName); }
+            get
+            {
+                if (Preferences is PreferenceSettings preferences)
+                {
+                    return TransformPath(preferences.SelectedPackagePathForInstall, PackagesDirectoryName);
+                }
+                return TransformPath(RootDirectories.First(), PackagesDirectoryName);
+            }
         }
 
         public IEnumerable<string> PackagesDirectories
@@ -295,7 +308,7 @@ public bool ResolveDocumentPath(ref string document)
         internal PathManager(PathManagerParams pathManagerParams)
         {
             var corePath = pathManagerParams.CorePath;
-            var pathResolver = pathManagerParams.PathResolver;
+            pathResolver = pathManagerParams.PathResolver;
 
             if (string.IsNullOrEmpty(corePath) || !Directory.Exists(corePath))
             {
@@ -339,7 +352,7 @@ internal PathManager(PathManagerParams pathManagerParams)
             }
 
             // Current user specific directories.
-            userDataDir = GetUserDataFolder(pathResolver);
+            userDataDir = GetUserDataFolder();
 
             // When running as a headless process, put the logs directory in a consistent
             // location that doesn't change every time the version number changes.
@@ -352,7 +365,7 @@ internal PathManager(PathManagerParams pathManagerParams)
             backupDirectory = Path.Combine(userDataDirNoVersion, BackupDirectoryName);
 
             // Common directories.
-            commonDataDir = GetCommonDataFolder(pathResolver);
+            commonDataDir = GetCommonDataFolder();
 
             commonDefinitions = Path.Combine(commonDataDir, DefinitionsDirectoryName);
             commonPackages = Path.Combine(commonDataDir, PackagesDirectoryName);
@@ -369,7 +382,7 @@ internal PathManager(PathManagerParams pathManagerParams)
 
             preloadedLibraries = new HashSet<string>();
             additionalResolutionPaths = new HashSet<string>();
-            LoadPathsFromResolver(pathResolver);
+            LoadPathsFromResolver();
         }
 
         /// <summary>
@@ -460,7 +473,7 @@ internal bool BackupXMLFile(XmlDocument xmlDoc, string filePath)
 
         #region Private Class Helper Methods
 
-        private void LoadPathsFromResolver(IPathResolver pathResolver)
+        private void LoadPathsFromResolver()
         {
             if (pathResolver == null) // No optional path resolver is specified...
                 return;
@@ -490,7 +503,7 @@ private void LoadPathsFromResolver(IPathResolver pathResolver)
             }
         }
 
-        internal string GetUserDataFolder(IPathResolver pathResolver = null)
+        internal string GetUserDataFolder()
         {
             if (pathResolver != null && !string.IsNullOrEmpty(pathResolver.UserDataRootFolder))
                 return GetDynamoDataFolder(pathResolver.UserDataRootFolder);
@@ -502,7 +515,7 @@ internal string GetUserDataFolder(IPathResolver pathResolver = null)
             return GetDynamoDataFolder(Path.Combine(folder, "Dynamo", "Dynamo Core"));
         }
 
-        private string GetCommonDataFolder(IPathResolver pathResolver)
+        private string GetCommonDataFolder()
         {
             if (pathResolver != null && !string.IsNullOrEmpty(pathResolver.CommonDataRootFolder))
                 return GetDynamoDataFolder(pathResolver.CommonDataRootFolder);
@@ -516,7 +529,7 @@ private string GetDynamoDataFolder(string folder)
             return Path.Combine(folder,
                 String.Format("{0}.{1}", majorFileVersion, minorFileVersion));
         }
-
+        
         // This method is used to get the locations of packages folder or custom
         // nodes folder given the root path. This is necessary because the packages
         // may be in the root folder or in a packages subfolder of the root folder.
 
@@ -359,6 +359,34 @@ public string DefaultPythonEngine
         /// </summary>
         private static string defaultPythonEngine;
 
+        internal event Func<string> RequestUserDataFolder;
+        internal string OnRequestUserDataFolder()
+        {
+            return RequestUserDataFolder?.Invoke();
+        }
+
+        private string selectedPackagePathForInstall;
+        // TODO: Add this to IPreferences in Dynamo 3.0
+        /// <summary>
+        /// Currently selected package path where all packages downloaded from the Package Manager
+        /// will be installed. The default package path for install is the user data directory
+        /// currently used by the Dynamo environment.
+        /// </summary>
+        public string SelectedPackagePathForInstall {
+            get
+            {
+                if (string.IsNullOrEmpty(selectedPackagePathForInstall))
+                {
+                    selectedPackagePathForInstall = OnRequestUserDataFolder();
+                }
+                return selectedPackagePathForInstall;
+            }
+            set
+            {
+                selectedPackagePathForInstall = value;
+            }
+        }
+
         /// <summary>
         /// Indicates (if any) which namespaces should not be displayed in the Dynamo node library.
         /// String format: "[library name]:[fully qualified namespace]"
@@ -439,6 +467,7 @@ public PreferenceSettings()
             EnableNodeAutoComplete = true;
             DefaultPythonEngine = string.Empty;
             ViewExtensionSettings = new List<ViewExtensionSettings>();
+
         }
 
         /// <summary>
 
@@ -675,6 +675,7 @@ protected DynamoModel(IStartConfiguration config)
             }
 
             pathManager.Preferences = PreferenceSettings;
+            PreferenceSettings.RequestUserDataFolder += pathManager.GetUserDataFolder;
 
             SearchModel = new NodeSearchModel(Logger);
             SearchModel.ItemProduced +=
@@ -1114,6 +1115,7 @@ public void Dispose()
             if (PreferenceSettings != null)
             {
                 PreferenceSettings.PropertyChanged -= PreferenceSettings_PropertyChanged;
+                PreferenceSettings.RequestUserDataFolder -= pathManager.GetUserDataFolder;
             }
 
             LogWarningMessageEvents.LogWarningMessage -= LogWarningMessage;
 
@@ -817,6 +817,10 @@ You will get a chance to save your work.</value>
     <value>Number Format</value>
     <comment>Setting menu | Number format</comment>
   </data>
+  <data name="PreferencesViewSelectedPackagePathForDownload" xml:space="preserve">
+    <value>Selected package path for download</value>
+    <comment>Preferences | Package Manager | Node and Package Paths | New Package Download Directory | Selected package path for download</comment>
+  </data>
   <data name="DynamoViewSettingMenuSquareCentimeter" xml:space="preserve">
     <value>Square Centimeter</value>
     <comment>Setting menu | Square centimeter</comment>
@@ -2256,6 +2260,10 @@ Uninstall the following packages: {0}?</value>
     <value>Default Python Engine</value>
     <comment>Preferences | Features | Python | Default Python Engine</comment>
   </data>
+  <data name="PreferencesViewPackageDownloadDirectory" xml:space="preserve">
+    <value>New Package Download Directory</value>
+    <comment>Preferences | Package Manager | Node and Package Paths | New Package Download Directory</comment>
+  </data>
   <data name="DefaultPythonEngineNone" xml:space="preserve">
     <value>Use System Default</value>
     <comment>Preferences | Features | Python | Default Python Engine</comment>
 
@@ -552,6 +552,10 @@
     <value>Number Format</value>
     <comment>Setting menu | Number format</comment>
   </data>
+  <data name="PreferencesViewSelectedPackagePathForDownload" xml:space="preserve">
+    <value>Selected package path for download</value>
+    <comment>Preferences | Package Manager | Node and Package Paths | New Package Download Directory | Selected package path for download</comment>
+  </data>
   <data name="DynamoViewSettingMenuSquareCentimeter" xml:space="preserve">
     <value>Square Centimeter</value>
     <comment>Setting menu | Square centimeter</comment>
@@ -2264,6 +2268,10 @@ Uninstall the following packages: {0}?</value>
     <value>Default Python Engine</value>
     <comment>Preferences | Features | Python | Default Python Engine</comment>
   </data>
+  <data name="PreferencesViewPackageDownloadDirectory" xml:space="preserve">
+    <value>New Package Download Directory</value>
+    <comment>Preferences | Package Manager | Node and Package Paths | New Package Download Directory</comment>
+  </data>
   <data name="DefaultPythonEngineNone" xml:space="preserve">
     <value>Use System Default</value>
     <comment>Preferences | Features | Python | Default Python Engine</comment>
 
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using Dynamo.Configuration;
@@ -32,11 +33,12 @@ public class PreferencesViewModel : ViewModelBase, INotifyPropertyChanged
         private string savedChangesLabel;
         private string savedChangesTooltip;
         private ObservableCollection<string> languagesList;
+        private ObservableCollection<string> packagePathsForInstall;
         private ObservableCollection<string> fontSizeList;
         private ObservableCollection<string> numberFormatList;
         private ObservableCollection<StyleItem> styleItemsList;
         private StyleItem addStyleControl;
-        private ObservableCollection<string> _pythonEngineList;
+        private ObservableCollection<string> pythonEngineList;
 
         private string selectedLanguage;
         private string selectedFontSize;
@@ -260,6 +262,63 @@ public ObservableCollection<string> LanguagesList
             }
         }
 
+        /// <summary>
+        /// PackagePathsForInstall contains the list of all package paths where
+        /// packages can be installed.
+        /// </summary>
+        public ObservableCollection<string> PackagePathsForInstall
+        {
+            get
+            {
+                if (packagePathsForInstall == null || !packagePathsForInstall.Any())
+                {
+                    var programDataPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
+                    // Filter Std lib and ProgramData paths from list of paths for download
+                    var customPaths = preferenceSettings.CustomPackageFolders.Where(
+                        x => x != DynamoModel.StandardLibraryToken && !x.StartsWith(programDataPath));
+
+                    packagePathsForInstall = new ObservableCollection<string>();
+                    foreach (var path in customPaths)
+                    {
+                        var attr = File.GetAttributes(path);
+
+                        // Add only directory paths
+                        if ((attr & FileAttributes.Directory) == FileAttributes.Directory)
+                        {
+                            packagePathsForInstall.Add(path);
+                        }
+                    }
+                }
+                return packagePathsForInstall;
+            }
+            set
+            {
+                packagePathsForInstall = value;
+                RaisePropertyChanged(nameof(PackagePathsForInstall));
+            }
+        }
+
+        /// <summary>
+        /// Currently selected package path where new packages will be downloaded.
+        /// </summary>
+        public string SelectedPackagePathForInstall
+        {
+            get
+            {
+                return preferenceSettings.SelectedPackagePathForInstall;
+            }
+            set
+            {
+                if (preferenceSettings.SelectedPackagePathForInstall != value)
+                {
+                    preferenceSettings.SelectedPackagePathForInstall = value;
+                    dynamoViewModel.PackageManagerClientViewModel.PackageManagerExtension.PackageLoader.SetPackagesDownloadDirectory(
+                        value, dynamoViewModel.Model.PathManager.UserDataDirectory);
+                    RaisePropertyChanged(nameof(SelectedPackagePathForInstall));
+                }
+            }
+        }
+
         /// <summary>
         /// FontSizesList contains the list of sizes for fonts defined (the ones defined are Small, Medium, Large, Extra Large)
         /// </summary>
@@ -441,11 +500,11 @@ public ObservableCollection<string> PythonEnginesList
         {
             get
             {
-                return _pythonEngineList;
+                return pythonEngineList;
             }
             set
             {
-                _pythonEngineList = value;
+                pythonEngineList = value;
                 RaisePropertyChanged(nameof(PythonEnginesList));
             }
         }
@@ -649,6 +708,8 @@ public PreferencesViewModel(DynamoViewModel dynamoViewModel)
                 SelectedPythonEngine = Res.DefaultPythonEngineNone : 
                 SelectedPythonEngine = preferenceSettings.DefaultPythonEngine;
 
+            SelectedPackagePathForInstall = preferenceSettings.SelectedPackagePathForInstall;
+
             string languages = Wpf.Properties.Resources.PreferencesWindowLanguages;
             LanguagesList = new ObservableCollection<string>(languages.Split(','));
             SelectedLanguage = languages.Split(',').First();
@@ -735,6 +796,9 @@ private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
                 case nameof(SelectedNumberFormat):
                     description = Res.DynamoViewSettingMenuNumberFormat;
                     goto default;
+                case nameof(SelectedPackagePathForInstall):
+                    description = Res.PreferencesViewSelectedPackagePathForDownload;
+                    goto default;
                 case nameof(RunSettingsIsChecked):
                     description = Res.PreferencesViewRunSettingsLabel;
                     goto default;
 
@@ -686,7 +686,7 @@ internal void ExecutePackageDownload(string name, PackageVersion package, string
 
                 // form header version pairs and download and install all packages
                 dependencyVersionHeaders
-                    .Select((dep, i) => {
+                    .Select((dep) => {
                         return new PackageDownloadHandle()
                         {
                             Id = dep.id,
Original file line number	Diff line number	Diff line change
`@@ -675,6 +675,7 @@ protected DynamoModel(IStartConfiguration config)`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`pathManager.Preferences = PreferenceSettings;`
	`678`	`+ PreferenceSettings.RequestUserDataFolder += pathManager.GetUserDataFolder;`
`678`	`679`
`679`	`680`	`SearchModel = new NodeSearchModel(Logger);`
`680`	`681`	`SearchModel.ItemProduced +=`
`@@ -1114,6 +1115,7 @@ public void Dispose()`
`1114`	`1115`	`if (PreferenceSettings != null)`
`1115`	`1116`	`{`
`1116`	`1117`	`PreferenceSettings.PropertyChanged -= PreferenceSettings_PropertyChanged;`
	`1118`	`+ PreferenceSettings.RequestUserDataFolder -= pathManager.GetUserDataFolder;`
`1117`	`1119`	`}`
`1118`	`1120`
`1119`	`1121`	`LogWarningMessageEvents.LogWarningMessage -= LogWarningMessage;`
Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ internal void ExecutePackageDownload(string name, PackageVersion package, string`
`686`	`686`
`687`	`687`	`// form header version pairs and download and install all packages`
`688`	`688`	`dependencyVersionHeaders`
`689`		`- .Select((dep, i) => {`
	`689`	`+ .Select((dep) => {`
`690`	`690`	`return new PackageDownloadHandle()`
`691`	`691`	`{`
`692`	`692`	`Id = dep.id,`