Merge pull request #64 from RXDCODX/main

Enhance solution secrecy checks in SolutionSecrecyService. Added supp…

Author: Reavert

VisualStudioDiscordRPC.Shared/Services/SolutionSecrecyService.cs

@@ -82,9 +82,18 @@ public void RemoveSecretSolution(string solutionPath)
 
         public bool IsSolutionSecret(string solutionPath)
         {
-            return _secretSolutions.Contains(solutionPath);
+            if (string.IsNullOrEmpty(solutionPath))
+                return false;
+
+            // Check for exact match first
+            if (_secretSolutions.Contains(solutionPath))
+                return true;
+
+            // Check for partial matches - if solution path starts with any of the secret paths
+            return _secretSolutions.Any(secretPath => PathHelper.IsPathBaseOf(secretPath, solutionPath));
         }
 
+
         private void OnSolutionChanged(Solution solution)
         {
             _lastOpenedSolution = solution;
@@ -95,8 +104,8 @@ private void SyncRpcSecrecyStatus()
         {
             Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
 
-            string fullSolutionName = _lastOpenedSolution.FullName;
-            _discordRpcController.Secret = _secretSolutions.Contains(fullSolutionName);
+            string fullSolutionName = _lastOpenedSolution?.FullName;
+            _discordRpcController.Secret = IsSolutionSecret(fullSolutionName);
         }
 
         private void SaveSecretSolutions()

VisualStudioDiscordRPC.Shared/Utils/PathHelper.cs

@@ -31,5 +31,19 @@ public static string GetApplicationDataPath()
                 Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
                 AppDataFolderName);
         }
+
+        public static bool IsPathBaseOf(string basePath, string path)
+        {
+            try
+            {
+                var baseUri = new Uri(Path.GetFullPath(basePath).TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) + Path.DirectorySeparatorChar);
+                var pathUri = new Uri(Path.GetFullPath(path));
+                return baseUri.IsBaseOf(pathUri);
+            }
+            catch
+            {
+                return false;
+            }
+        }
     }
 }

VisualStudioDiscordRPC.Shared/ViewModels/SettingsViewModel.cs

@@ -10,6 +10,7 @@
 using VisualStudioDiscordRPC.Shared.Nests;
 using VisualStudioDiscordRPC.Shared.Utils;
 using System.Windows.Input;
+using System.Windows.Forms;
 
 namespace VisualStudioDiscordRPC.Shared.ViewModels
 {
@@ -266,6 +267,7 @@ public BaseButtonPlug SecondButtonPlug
         public RelayCommand ShowSecretSolutionsCommand { get; }
         public RelayCommand ShowPrivateRepositoriesCommand { get; }
         public RelayCommand ShowCustomTextPlugsEditorCommand { get; }
+        public RelayCommand SelectSecretFolderCommand { get; }
 
         public SettingsViewModel()
         {
@@ -287,6 +289,7 @@ public SettingsViewModel()
             ShowSecretSolutionsCommand = new RelayCommand(ShowSecretSolutionsEditor);
             ShowPrivateRepositoriesCommand = new RelayCommand(ShowPrivateRepositoriesEditor);
             ShowCustomTextPlugsEditorCommand = new RelayCommand(ShowCustomTextPlugsEditor);
+            SelectSecretFolderCommand = new RelayCommand(SelectSecretFolder);
         }
 
         private void ShowSecretSolutionsEditor(object parameter)
@@ -321,5 +324,24 @@ private void ShowCustomTextPlugsEditor(object parameter)
 
             OnPropertyChanged(nameof(AvailableTextPlugs));
         }
+
+        private void SelectSecretFolder(object parameter)
+        {
+            using (var folderDialog = new System.Windows.Forms.FolderBrowserDialog())
+            {
+                folderDialog.Description = "Select folder to hide all solutions in it";
+                folderDialog.ShowNewFolderButton = false;
+                
+                if (folderDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
+                    string selectedPath = folderDialog.SelectedPath;
+                    if (!string.IsNullOrEmpty(selectedPath))
+                    {
+                        _solutionSecrecyService.AddSecretSolution(selectedPath);
+                        OnPropertyChanged(nameof(SecretSolution));
+                    }
+                }
+            }
+        }
     }
 }

VisualStudioDiscordRPC.Shared/Views/SettingsWindow.xaml

@@ -65,9 +65,19 @@
             <Button
                 Width="20"
                 Height="20"
-                Command="{Binding ShowSecretSolutionsCommand}">
+                Margin="2,0,0,0"
+                Command="{Binding ShowSecretSolutionsCommand}"
+                ToolTip="Manage secret solutions list">
                 <TextBlock Text="..."/>
             </Button>
+            <Button
+                Width="20"
+                Height="20"
+                Margin="2,0,0,0"
+                Command="{Binding SelectSecretFolderCommand}"
+                ToolTip="Select folder to hide all solutions in it">
+                <TextBlock Text="📁"/>
+            </Button>
         </StackPanel>
         <StackPanel
             HorizontalAlignment="Right"