Allow Desktop Shortcut Deletion

src/UniGetUI.Core.Settings/SettingsEngine.cs

@@ -110,10 +110,10 @@ public static bool AreUpdatesNotificationsDisabled()
             return AreNotificationsDisabled() || Get("DisableUpdatesNotifications");
         }
 
-        public static bool AreShortcutsNotificationsDisabled()
+        /*public static bool AreShortcutsNotificationsDisabled()
         {
             return AreNotificationsDisabled() || Get("DisableShortcutNotifications");
-        }
+        }*/
 
         public static bool AreErrorNotificationsDisabled()
         {

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/DesktopShortcutsDatabase.cs

@@ -33,7 +33,7 @@ public static void ResetDatabase()
     /// </summary>
     /// <param name="shortcutPath">The path of the shortcut to delete</param>
     /// <param name="deletable">Whether or not to mark this entry as deletable in the databse. Defaults to true</param>
-    public static void Add(string shortcutPath, bool deletable = true)
+    public static void AddToDatabase(string shortcutPath, bool deletable = true)
     {
         Settings.SetDictionaryItem("DeletableDesktopShortcuts", shortcutPath, deletable);
     }
@@ -67,7 +67,7 @@ public static bool Remove(string shortcutPath)
     /// </summary>
     /// <param name="shortcutPath">The path of the shortcut to delete</param>
     /// <returns>True if the shortcut was completely removed, false if it was not there from the beginning</returns>
-    public static bool Reset(string shortcutPath)
+    public static bool ResetShortcut(string shortcutPath)
     {
         // Remove the entry if present
         if (Settings.DictionaryContainsKey<string, bool>("DeletableDesktopShortcuts", shortcutPath))
@@ -89,7 +89,7 @@ public static bool Reset(string shortcutPath)
     /// </summary>
     /// <param name="shortcutPath">The path of the shortcut to delete</param>
     /// <returns>True if the shortcut was deleted, false if it was not (or didn't exist)</returns>
-    public static bool DeleteShortcut(string shortcutPath)
+    public static bool DeleteFromDisk(string shortcutPath)
     {
         Logger.Info("Deleting shortcut " + shortcutPath);
         try
@@ -132,8 +132,21 @@ public static Status GetStatus(string shortcutPath)
     /// <returns>A list of desktop shortcut paths</returns>
     public static List<string> GetShortcuts()
     {
-        string DesktopPath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-        return Directory.EnumerateFiles(DesktopPath, "*.lnk").ToList();
+        string UserDesktop = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+        string CommonDesktop = Environment.GetFolderPath(Environment.SpecialFolder.CommonDesktopDirectory);
+        List<string> shortcuts = new();
+
+        foreach (var shortcut in Directory.EnumerateFiles(UserDesktop, "*.lnk"))
+        {
+            shortcuts.Add(Path.Join(UserDesktop, shortcut));
+        }
+
+        foreach (var shortcut in Directory.EnumerateFiles(CommonDesktop, "*.lnk"))
+        {
+            shortcuts.Add(Path.Join(CommonDesktop, shortcut));
+        }
+
+        return shortcuts;
     }
 
     /// <summary>
@@ -150,7 +163,7 @@ public static bool RemoveFromUnknownShortcuts(string shortcutPath)
     /// Get the list of shortcuts whose deletion verdicts are unknown (as in, the user needs to be asked about deleting them when their operations finish)
     /// </summary>
     /// <returns>The list of shortcuts awaiting verdicts</returns>
-    public static List<string> GetAwaitingVerdicts()
+    public static List<string> GetUnknownShortcuts()
     {
         return UnknownShortcuts;
     }
@@ -169,7 +182,7 @@ public static void TryRemoveNewShortcuts(IEnumerable<string> PreviousShortCutLis
             switch (DesktopShortcutsDatabase.GetStatus(shortcut))
             {
                 case Status.Delete:
-                    DesktopShortcutsDatabase.DeleteShortcut(shortcut);
+                    DesktopShortcutsDatabase.DeleteFromDisk(shortcut);
                     break;
                 case Status.Maintain:
                     Logger.Debug("Refraining from deleting new shortcut " + shortcut + ": user disabled its deletion");

src/UniGetUI/Controls/OperationWidgets/OperationControl.xaml.cs

@@ -532,7 +532,7 @@ protected async Task MainThread()
                         break;
                 }
 
-                if (MainApp.Instance.OperationQueue.Count == 0 && DesktopShortcutsDatabase.GetAwaitingVerdicts().Count > 0)
+                if (MainApp.Instance.OperationQueue.Count == 0 && DesktopShortcutsDatabase.GetUnknownShortcuts().Any() && Settings.Get("AskToDeleteNewDesktopShortcuts"))
                 {
                     await DialogHelper.HandleNewDesktopShortcuts();
                 }

src/UniGetUI/Controls/OperationWidgets/PackageOperations.cs

@@ -370,13 +370,11 @@ protected override async Task<AfterFinshAction> HandleSuccess()
                     new Dictionary<string, object?> { { "package", Package.Name } })
             );
 
-
             if (Settings.Get("AskToDeleteNewDesktopShortcuts"))
             {
                 DesktopShortcutsDatabase.TryRemoveNewShortcuts(DesktopShortcutsBeforeStart);
             }
 
-
             return AfterFinshAction.TimeoutClose;
         }
 

src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml

@@ -17,7 +17,7 @@
                     <ColumnDefinition Width="200"/>
                 </Grid.ColumnDefinitions>
                 <widgets:TranslatedTextBlock
-                    Text="The shortcuts listed here will be either deleted or ignored if they're added after an update operation, depending on the value of the checkbox. Double-click them or click the button on their right for UniGetUI to ask you what to do next time they're detected."/>
+                    Text="Here you can change UniGetUI's behaviour regarding the following shortcuts. Checking a shortcut will make UniGetUI delete it if if gets created on a future upgrade. Unchecking it will keep the shortcut intact"/>
                 <Button
                     Grid.Column="2"
                     HorizontalAlignment="Stretch"
@@ -39,7 +39,7 @@
                                 </Grid.ColumnDefinitions>
                                 <TextBlock
                                     Grid.ColumnSpan="2"
-                                    Text="Do you really want to reset the deletable shortcuts list? This action cannot be reverted"
+                                    Text="Do you really want to reset this list? This action cannot be reverted."
                                     Margin="0,0,0,0"
                                     TextWrapping="WrapWholeWords"
                                     />
@@ -76,14 +76,14 @@
                         <DataTemplate x:DataType="local:ShortcutEntry">
                             <Grid ColumnSpacing="4">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="50"/>
+                                    <ColumnDefinition Width="24"/>
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <CheckBox IsChecked="{x:Bind Enabled}" Checked="{x:Bind Enable}" Unchecked="{x:Bind Disable}" Grid.Column="0"/>
-                                <widgets:LocalIcon Icon="localpc" Grid.Column="1" Height="24" Width="24"/>
+                                <CheckBox IsChecked="{x:Bind IsChecked, Mode=TwoWay}" Grid.Column="0"/>
+                                <widgets:LocalIcon Icon="Launch" Grid.Column="1" Height="24" Width="24"/>
                                 <TextBlock Text="{x:Bind ShortcutPath}" Grid.Column="2" VerticalAlignment="Center"/>
                                 <Button Click="{x:Bind OpenShortcutPath}" Height="32" Width="32" Padding="0" Grid.Column="3" IsEnabled="{x:Bind ShortcutExists}">
                                     <widgets:LocalIcon Icon="launch" Height="24" Width="24"/>

src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs

@@ -1,5 +1,7 @@
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using UniGetUI.Core.Logging;
@@ -24,25 +26,45 @@ public sealed partial class DesktopShortcutsManager : Page
         public event EventHandler? Close;
         private ObservableCollection<ShortcutEntry> desktopShortcuts = new ObservableCollection<ShortcutEntry>();
 
-        public DesktopShortcutsManager()
+        private bool NewOnly = false;
+
+        public DesktopShortcutsManager(List<string>? NewShortcuts)
         {
+            if (NewShortcuts is not null) NewOnly = true;
+
+
             InitializeComponent();
             DeletableDesktopShortcutsList.ItemsSource = desktopShortcuts;
             DeletableDesktopShortcutsList.DoubleTapped += DeletableDesktopShortcutsList_DoubleTapped;
+            UpdateData(NewShortcuts);
         }
 
-        public async Task UpdateData()
+        public void UpdateData(List<string>? NewShortcuts)
         {
             desktopShortcuts.Clear();
 
-            foreach (var (shortcutPath, shortcutEnabled) in DesktopShortcutsDatabase.GetDatabase())
+            if (NewShortcuts is not null) foreach (var path in NewShortcuts)
+            {
+                desktopShortcuts.Add(new(path, false));
+            }
+            else foreach (var (shortcutPath, shortcutEnabled) in DesktopShortcutsDatabase.GetDatabase())
             {
-                var shortcutEntry = new ShortcutEntry(shortcutPath, shortcutEnabled, desktopShortcuts);
+                var shortcutEntry = new ShortcutEntry(shortcutPath, shortcutEnabled);
                 desktopShortcuts.Add(shortcutEntry);
             }
+
+            foreach(var shortcut in desktopShortcuts)
+            {
+                shortcut.OnReset += (sender, path) =>
+                {
+                    if (sender is not ShortcutEntry sh) throw new Exception();
+                    DesktopShortcutsDatabase.ResetShortcut(sh.ShortcutPath);
+                    desktopShortcuts.Remove(sh);
+                };
+            }
         }
 
-        private async void DeletableDesktopShortcutsList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+        private void DeletableDesktopShortcutsList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
         {
             if (DeletableDesktopShortcutsList.SelectedItem is ShortcutEntry shortcut)
             {
@@ -56,7 +78,7 @@ private void CloseButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs
             Close?.Invoke(this, EventArgs.Empty);
         }
 
-        private async void YesResetButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        private void YesResetButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
             foreach (ShortcutEntry shortcut in desktopShortcuts.ToArray())
             {
@@ -70,38 +92,46 @@ private void NoResetButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArg
         {
             ConfirmResetFlyout.Hide();
         }
+
+        public void SaveChangesAndClose()
+        {
+            Close?.Invoke(this, EventArgs.Empty);
+            foreach (var shortcut in desktopShortcuts)
+            {
+                DesktopShortcutsDatabase.AddToDatabase(shortcut.ShortcutPath, shortcut.IsChecked);
+                if (shortcut.IsChecked && File.Exists(shortcut.ShortcutPath))
+                {
+                    DesktopShortcutsDatabase.DeleteFromDisk(shortcut.ShortcutPath);
+                }
+                DesktopShortcutsDatabase.RemoveFromUnknownShortcuts(shortcut.ShortcutPath);
+            }
+        }
     }
 
-    public class ShortcutEntry
+    public class ShortcutEntry : INotifyPropertyChanged
     {
+        public event EventHandler<EventArgs>? OnReset;
+
         public string ShortcutPath { get; }
         private bool _enabled;
-        public bool Enabled
+        public bool IsChecked
         {
-            get
-            {
-                return _enabled;
-            }
+            get =>  _enabled;
             set
             {
                 _enabled = value;
-                DesktopShortcutsDatabase.Add(ShortcutPath, _enabled);
+                OnPropertyChanged();
             }
         }
         public bool ShortcutExists
         {
-            get
-            {
-                return File.Exists(ShortcutPath);
-            }
+            get => File.Exists(ShortcutPath);
         }
-        private ObservableCollection<ShortcutEntry> List { get; }
 
-        public ShortcutEntry(string shortcutPath, bool enabled, ObservableCollection<ShortcutEntry> list)
+        public ShortcutEntry(string shortcutPath, bool enabled)
         {
             ShortcutPath = shortcutPath;
-            Enabled = enabled;
-            List = list;
+            IsChecked = enabled;
         }
 
         public void OpenShortcutPath()
@@ -111,18 +141,22 @@ public void OpenShortcutPath()
 
         public void ResetConfiguration()
         {
-            DesktopShortcutsDatabase.Reset(ShortcutPath);
-            List.Remove(this);
+            OnReset?.Invoke(this, EventArgs.Empty);
         }
 
-        public void Enable()
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
-            Enabled = true;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public void Disable()
+        protected bool SetField<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)
         {
-            Enabled = false;
+            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            field = value;
+            OnPropertyChanged(propertyName);
+            return true;
         }
     }
 }