Merge branch 'multiple_file_perms' of https://github.com/hecksmosis/Files into rev_propmulti

Author: gave92

src/Files.App/Helpers/CloudDrivesDetector.cs

@@ -14,6 +14,8 @@ namespace Files.App.Helpers
 	[SupportedOSPlatform("Windows10.0.10240")]
 	public class CloudDrivesDetector
 	{
+		private readonly static string programFilesFolder = Environment.GetEnvironmentVariable("ProgramFiles");
+
 		public static async Task<IEnumerable<ICloudProvider>> DetectCloudDrives()
 		{
 			var tasks = new Task<IEnumerable<ICloudProvider>>[]
@@ -23,6 +25,7 @@ public static async Task<IEnumerable<ICloudProvider>> DetectCloudDrives()
 				SafetyExtensions.IgnoreExceptions(DetectGenericCloudDrive, App.Logger),
 				SafetyExtensions.IgnoreExceptions(DetectYandexDisk, App.Logger),
 				SafetyExtensions.IgnoreExceptions(DetectpCloudDrive, App.Logger),
+				SafetyExtensions.IgnoreExceptions(DetectNutstoreDrive, App.Logger),
 			};
 
 			await Task.WhenAll(tasks);
@@ -222,7 +225,7 @@ private static Task<IEnumerable<ICloudProvider>> DetectpCloudDrive()
 			var syncedFolder = (string)pCloudDriveKey?.GetValue("SyncDrive");
 			if (syncedFolder is not null)
 			{
-				string iconPath = Path.Combine(Environment.GetEnvironmentVariable("ProgramFiles"), "pCloud Drive", "pCloud.exe");
+				string iconPath = Path.Combine(programFilesFolder, "pCloud Drive", "pCloud.exe");
 				var iconFile = Win32API.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 32512 }, 32).FirstOrDefault();
 
 				results.Add(new CloudProvider(CloudProviders.pCloud)
@@ -235,5 +238,36 @@ private static Task<IEnumerable<ICloudProvider>> DetectpCloudDrive()
 
 			return Task.FromResult<IEnumerable<ICloudProvider>>(results);
 		}
+
+		private static Task<IEnumerable<ICloudProvider>> DetectNutstoreDrive()
+		{
+			var results = new List<ICloudProvider>();
+			using var NutstoreKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Nutstore");
+
+			if (NutstoreKey is not null)
+			{
+				string iconPath = Path.Combine(programFilesFolder, "Nutstore", "Nutstore.exe");
+				var iconFile = Win32API.ExtractSelectedIconsFromDLL(iconPath, new List<int>() { 101 }).FirstOrDefault();
+
+				// get every folder under the Nutstore folder in %userprofile%
+				var mainFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Nutstore");
+				var nutstoreFolders = Directory.GetDirectories(mainFolder, "Nutstore", SearchOption.AllDirectories);
+				foreach (var nutstoreFolder in nutstoreFolders)
+				{
+					var folderName = Path.GetFileName(nutstoreFolder);
+					if (folderName is not null && folderName.StartsWith("Nutstore", StringComparison.OrdinalIgnoreCase))
+					{
+						results.Add(new CloudProvider(CloudProviders.Nutstore)
+						{
+							Name = $"Nutstore",
+							SyncFolder = nutstoreFolder,
+							IconData = iconFile?.IconData
+						});
+					}
+				}
+			}
+	
+			return Task.FromResult<IEnumerable<ICloudProvider>>(results);
+		}
 	}
 }

src/Files.Shared/Cloud/CloudProviders.cs

@@ -16,6 +16,7 @@ public enum CloudProviders
 		Jottacloud,
 		SynologyDrive,
 		pCloud,
-		AdobeCreativeCloud
+		AdobeCreativeCloud,
+		Nutstore
 	}
 }