Skip to content

Improve cloud drives detection speed #9230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2022
Merged

Improve cloud drives detection speed #9230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/Files.FullTrust/Helpers/CloudDrivesDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,27 @@ private static Task<List<CloudProvider>> DetectGenericCloudDrive()
{
var results = new List<CloudProvider>();
using var clsidKey = Registry.ClassesRoot.OpenSubKey(@"CLSID");
foreach (var subKeyName in clsidKey.GetSubKeyNames())
using var namespaceKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace");
foreach (var subKeyName in namespaceKey.GetSubKeyNames())
{
using var subKey = SafetyExtensions.IgnoreExceptions(() => clsidKey.OpenSubKey(subKeyName));
if (subKey != null && (int?)subKey.GetValue("System.IsPinnedToNameSpaceTree") == 1)
using var clsidSubKey = SafetyExtensions.IgnoreExceptions(() => clsidKey.OpenSubKey(subKeyName));
if (clsidSubKey != null && (int?)clsidSubKey.GetValue("System.IsPinnedToNameSpaceTree") == 1)
{
using var namespaceKey = Registry.CurrentUser.OpenSubKey($@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{subKeyName}");
var driveType = (string)namespaceKey?.GetValue("");
using var namespaceSubKey = namespaceKey.OpenSubKey(subKeyName);
var driveType = (string)namespaceSubKey?.GetValue("");
if (driveType == null)
{
continue;
}

//Nextcloud specific
var appName = (string)namespaceKey?.GetValue("ApplicationName");
var appName = (string)namespaceSubKey?.GetValue("ApplicationName");
if (!string.IsNullOrEmpty(appName) && appName == "Nextcloud")
{
driveType = appName;
}

using var bagKey = subKey.OpenSubKey(@"Instance\InitPropertyBag");
using var bagKey = clsidSubKey.OpenSubKey(@"Instance\InitPropertyBag");
var syncedFolder = (string)bagKey?.GetValue("TargetFolderPath");
if (syncedFolder == null)
{
Expand Down Expand Up @@ -96,7 +97,7 @@ private static Task<List<CloudProvider>> DetectGenericCloudDrive()
{
CloudProviders.Mega => $"MEGA ({Path.GetFileName(syncedFolder.TrimEnd('\\'))})",
CloudProviders.AmazonDrive => $"Amazon Drive",
CloudProviders.Nextcloud => $"{ (!string.IsNullOrEmpty((string)namespaceKey?.GetValue("")) ? (string)namespaceKey?.GetValue(""):"Nextcloud")}",
CloudProviders.Nextcloud => $"{ (!string.IsNullOrEmpty((string)namespaceSubKey?.GetValue("")) ? (string)namespaceSubKey?.GetValue(""):"Nextcloud")}",
CloudProviders.Jottacloud => $"Jottacloud",
_ => null
},
Expand Down