Merge pull request #40 from KrystianLesniak/develop

KrystianLesniak · web-flow · commit 567d25141168 · 2023-11-12T18:09:15.000+01:00
Release: 1.7.0
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 ***
 
-GamesLauncher is a plugin for [Flow launcher](https://github.com/Flow-Launcher/Flow.Launcher) that simplifies the process of searching for and launching games from multiple libraries. It provides quick and convenient access to your favorite games across various platforms, including Steam, Epic Games, Xbox, Amazon, and more libraries to come.
+GamesLauncher is a plugin for [Flow launcher](https://github.com/Flow-Launcher/Flow.Launcher) that simplifies the process of searching for and launching games from multiple libraries. It provides quick and convenient access to your favorite games across various platforms, including Steam, Epic Games, Xbox, and more.
 
 ![Capture](docs/capture.gif)
 
@@ -16,6 +16,7 @@ GamesLauncher is a plugin for [Flow launcher](https://github.com/Flow-Launcher/F
 * Steam
 * Epic Games Launcher
 * Xbox
+* Ubisoft Connect
 * Amazon Games
 * [Custom Shortcuts](#custom-shortcuts)
 
diff --git a/src/GamesLauncher.Common/Settings/MainSettings.cs b/src/GamesLauncher.Common/Settings/MainSettings.cs
@@ -6,5 +6,6 @@ public class MainSettings
         public bool SynchronizeSteam { get; set; } = true;
         public bool SynchronizeXbox { get; set; } = true;
         public bool SynchronizeAmazon { get; set; } = true;
+        public bool SynchronizeUbisoft { get; set; } = true;
     }
 }
diff --git a/src/GamesLauncher.Platforms/Game.cs b/src/GamesLauncher.Platforms/Game.cs
@@ -1,32 +1,29 @@
 ﻿using Flow.Launcher.Plugin;
-using static Flow.Launcher.Plugin.Result;
 
 namespace GamesLauncher.Platforms
 {
-    public class Game
+    public class Game : Result
     {
+        public new string SubTitle => Platform;
+
         internal Game(string title,
-                       Func<ActionContext, ValueTask<bool>> runTask,
-                       string? iconPath,
-                       IconDelegate? iconDelegate,
                        string platform,
+                       Func<Task> runTask,
+                       string? iconPath,
+                       IconDelegate? iconDelegate = null,
                        UninstallAction? uninstallAction = null)
         {
             Title = title;
             RunTask = runTask;
-            IconPath = iconPath;
-            IconDelegate = iconDelegate;
+            IcoPath = iconPath;
+            Icon = iconDelegate;
             Platform = platform;
             UninstallAction = uninstallAction;
         }
-
-        public string Title { get; }
-        public Func<ActionContext, ValueTask<bool>> RunTask { get; }
+        public string InternalGameId => $"{Platform}_{Title}";
+        public Func<Task> RunTask { get; set; }
         public UninstallAction? UninstallAction { get; }
-        public string? IconPath { get; }
-        public IconDelegate? IconDelegate { get; }
         public string Platform { get; }
-        public string InternalGameId => $"{Platform}_{Title}";
 
     }
 
diff --git a/src/GamesLauncher.Platforms/GamesLauncher.Platforms.csproj b/src/GamesLauncher.Platforms/GamesLauncher.Platforms.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0-windows</TargetFramework>
@@ -34,6 +34,9 @@
     <None Update="Icons\steam.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Icons\ubisoft.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Icons\xbox.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/GamesLauncher.Platforms/Icons/ubisoft.ico b/src/GamesLauncher.Platforms/Icons/ubisoft.ico
diff --git a/src/GamesLauncher.Platforms/PlatformsManager.cs b/src/GamesLauncher.Platforms/PlatformsManager.cs
@@ -2,8 +2,10 @@
 using GamesLauncher.Common.Settings;
 using GamesLauncher.Platforms.SyncEngines;
 using GamesLauncher.Platforms.SyncEngines.Amazon;
+using GamesLauncher.Platforms.SyncEngines.Common.Interfaces;
 using GamesLauncher.Platforms.SyncEngines.Epic;
 using GamesLauncher.Platforms.SyncEngines.Steam;
+using GamesLauncher.Platforms.SyncEngines.Ubisoft;
 using System.Diagnostics;
 
 namespace GamesLauncher.Platforms
@@ -39,11 +41,6 @@ await Parallel.ForEachAsync(Engines, async (engine, ct) =>
 #endif
         }
 
-        public Game? GetGame(string title, string platform)
-        {
-            return AllSynchronizedGames.FirstOrDefault(x => x.Title == title && x.Platform == platform);
-        }
-
         private IEnumerable<ISyncEngine> InitializeEngines(MainSettings settings)
         {
             var engines = new List<ISyncEngine>();
@@ -57,6 +54,9 @@ private IEnumerable<ISyncEngine> InitializeEngines(MainSettings settings)
             if (settings.SynchronizeSteam)
                 engines.Add(new SteamSyncEngine(publicApi));
 
+            if (settings.SynchronizeUbisoft)
+                engines.Add(new UbisoftSyncEngine(publicApi));
+
             if (settings.SynchronizeAmazon)
                 engines.Add(new AmazonSyncEngine(publicApi));
 
diff --git a/src/GamesLauncher.Platforms/SyncEngines/Amazon/AmazonSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/Amazon/AmazonSyncEngine.cs
@@ -1,5 +1,6 @@
 ﻿using Flow.Launcher.Plugin;
 using GamesLauncher.Platforms.SyncEngines.Amazon.Readers;
+using GamesLauncher.Platforms.SyncEngines.Common.Interfaces;
 using System.Collections.Concurrent;
 
 namespace GamesLauncher.Platforms.SyncEngines.Amazon
@@ -39,15 +40,15 @@ public async Task SynchronizeGames()
         }
 
 
-        private Func<ActionContext, ValueTask<bool>> GetGameRunTask(string gameAppIdString)
+        private Func<Task> GetGameRunTask(string gameAppIdString)
         {
             var uriString = "amazon-games://play/" + gameAppIdString;
 
-            return (context) =>
+            return () =>
             {
                 publicApi.OpenAppUri(new Uri(uriString));
 
-                return ValueTask.FromResult(true);
+                return Task.CompletedTask;
             };
         }
     }
diff --git a/src/GamesLauncher.Platforms/SyncEngines/Common/ControlPanelUninstall/ControlPanelUninstall.cs b/src/GamesLauncher.Platforms/SyncEngines/Common/ControlPanelUninstall/ControlPanelUninstall.cs
@@ -0,0 +1,61 @@
+﻿using GamesLauncher.Platforms.SyncEngines.Common.ControlPanelUninstall.Models;
+using Microsoft.Win32;
+using System.Collections.Concurrent;
+
+namespace GamesLauncher.Platforms.SyncEngines.Common.ControlPanelUninstall
+{
+    internal static class ControlPanelUninstall
+    {
+        internal static async Task<IEnumerable<UninstallProgram>> GetPrograms()
+        {
+            var programs = new ConcurrentBag<UninstallProgram>();
+
+            var registryHives = new RegistryHive[] { RegistryHive.LocalMachine, RegistryHive.CurrentUser };
+            var registryViews = new RegistryView[] { RegistryView.Registry32, RegistryView.Registry64 };
+
+            await Parallel.ForEachAsync(registryHives, async (hive, ct) =>
+            {
+                await Parallel.ForEachAsync(registryViews, async (view, ct) =>
+                {
+                    SearchPrograms(hive, view, programs);
+                    await Task.CompletedTask;
+                });
+            });
+
+            return programs;
+
+
+            static void SearchPrograms(RegistryHive hive, RegistryView view, ConcurrentBag<UninstallProgram> programs)
+            {
+                const string uninstallRootKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\";
+
+                using var baseKey = RegistryKey.OpenBaseKey(hive, view);
+
+                using var uninstallSubKey = baseKey.OpenSubKey(uninstallRootKey);
+                if (uninstallSubKey == null)
+                    return;
+
+                foreach (var programUninstallSubKeyName in uninstallSubKey.GetSubKeyNames())
+                {
+                    try
+                    {
+                        using var prog = baseKey.OpenSubKey(uninstallRootKey + programUninstallSubKeyName);
+                        if (prog == null)
+                            continue;
+
+                        programs.Add(new UninstallProgram()
+                        {
+                            DisplayIcon = prog.GetValue("DisplayIcon")?.ToString(),
+                            DisplayName = prog.GetValue("DisplayName")?.ToString() ?? string.Empty,
+                            UninstallCommand = prog.GetValue("UninstallString")?.ToString(),
+                            SubKeyName = programUninstallSubKeyName
+                        });
+                    }
+                    catch (System.Security.SecurityException)
+                    {
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/GamesLauncher.Platforms/SyncEngines/Common/ControlPanelUninstall/Models/UninstallProgram.cs b/src/GamesLauncher.Platforms/SyncEngines/Common/ControlPanelUninstall/Models/UninstallProgram.cs
@@ -0,0 +1,10 @@
+﻿namespace GamesLauncher.Platforms.SyncEngines.Common.ControlPanelUninstall.Models
+{
+    internal class UninstallProgram
+    {
+        public string DisplayName { get; internal set; } = string.Empty;
+        public string SubKeyName { get; internal set; } = string.Empty;
+        public string? DisplayIcon { get; internal set; }
+        public string? UninstallCommand { get; internal set; }
+    }
+}
diff --git a/src/GamesLauncher.Platforms/SyncEngines/Common/Interfaces/ISyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/Common/Interfaces/ISyncEngine.cs
@@ -1,4 +1,4 @@
-﻿namespace GamesLauncher.Platforms.SyncEngines;
+﻿namespace GamesLauncher.Platforms.SyncEngines.Common.Interfaces;
 
 internal interface ISyncEngine
 {
diff --git a/src/GamesLauncher.Platforms/SyncEngines/Epic/EpicSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/Epic/EpicSyncEngine.cs
@@ -1,4 +1,5 @@
 ﻿using Flow.Launcher.Plugin;
+using GamesLauncher.Platforms.SyncEngines.Common.Interfaces;
 using GamesLauncher.Platforms.SyncEngines.Epic.Models;
 using Microsoft.Win32;
 using Newtonsoft.Json;
@@ -69,15 +70,14 @@ private static async Task<IEnumerable<EpicGame>> GetEpicGamesFromMetadata()
             return epicGames;
         }
 
-        private Func<ActionContext, ValueTask<bool>> PrepareRunTask(string catalogNamespace, string catalogItemId, string appName)
+        private Func<Task> PrepareRunTask(string catalogNamespace, string catalogItemId, string appName)
         {
             var launchUriString = $"com.epicgames.launcher://apps/{catalogNamespace}%3A{catalogItemId}%3A{appName}?action=launch&silent=true";
 
-            return (context) =>
+            return async () =>
             {
                 publicApi.OpenAppUri(new Uri(launchUriString));
-
-                return ValueTask.FromResult(true);
+                await Task.CompletedTask;
             };
         }
 
diff --git a/src/GamesLauncher.Platforms/SyncEngines/ShortcutsSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/ShortcutsSyncEngine.cs
@@ -1,5 +1,6 @@
 ﻿using Flow.Launcher.Plugin;
 using GamesLauncher.Common;
+using GamesLauncher.Platforms.SyncEngines.Common.Interfaces;
 
 namespace GamesLauncher.Platforms.SyncEngines
 {
@@ -43,13 +44,12 @@ public async Task SynchronizeGames()
             SynchronizedGames = syncedGames;
         }
 
-        private Func<ActionContext, ValueTask<bool>> GetGameRunTask(string fullPath)
+        private Func<Task> GetGameRunTask(string fullPath)
         {
-            return (context) =>
+            return async () =>
             {
                 publicApi.ShellRun($"start \"\" \"{fullPath}\"");
-
-                return ValueTask.FromResult(true);
+                await Task.CompletedTask;
             };
         }
 
diff --git a/src/GamesLauncher.Platforms/SyncEngines/Steam/SteamSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/Steam/SteamSyncEngine.cs
@@ -2,6 +2,7 @@
 using GameFinder.Common;
 using GameFinder.RegistryUtils;
 using GameFinder.StoreHandlers.Steam;
+using GamesLauncher.Platforms.SyncEngines.Common.Interfaces;
 using NexusMods.Paths;
 
 namespace GamesLauncher.Platforms.SyncEngines.Steam
@@ -47,15 +48,14 @@ private Game MapSteamGameToGame(SteamGame steamGame)
                 );
         }
 
-        private Func<ActionContext, ValueTask<bool>> GetGameRunTask(string gameAppIdString)
+        private Func<Task> GetGameRunTask(string gameAppIdString)
         {
             var uriString = $"steam://launch/{gameAppIdString}/Dialog";
 
-            return (context) =>
+            return async () =>
             {
                 publicApi.OpenAppUri(new Uri(uriString));
-
-                return ValueTask.FromResult(true);
+                await Task.CompletedTask;
             };
         }
 
diff --git a/src/GamesLauncher.Platforms/SyncEngines/Ubisoft/UbisoftSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/Ubisoft/UbisoftSyncEngine.cs
@@ -0,0 +1,84 @@
+﻿using Flow.Launcher.Plugin;
+using GamesLauncher.Platforms.SyncEngines.Common.ControlPanelUninstall;
+using GamesLauncher.Platforms.SyncEngines.Common.ControlPanelUninstall.Models;
+using GamesLauncher.Platforms.SyncEngines.Common.Interfaces;
+
+namespace GamesLauncher.Platforms.SyncEngines.Ubisoft
+{
+    internal class UbisoftSyncEngine : ISyncEngine
+    {
+        public string PlatformName => "Ubisoft Connect";
+        public IEnumerable<Game> SynchronizedGames { get; private set; } = Array.Empty<Game>();
+
+
+        private readonly string UbisoftConnectUninstallRegistryKeyStart = "Uplay Install ";
+
+        private readonly IPublicAPI publicApi;
+
+        public UbisoftSyncEngine(IPublicAPI publicApi)
+        {
+            this.publicApi = publicApi;
+        }
+
+        public async Task SynchronizeGames()
+        {
+            var ubiUninstallPrograms = (await ControlPanelUninstall.GetPrograms())
+                                .Where(x => x.SubKeyName.StartsWith(UbisoftConnectUninstallRegistryKeyStart));
+
+            if (!ubiUninstallPrograms.Any())
+                return;
+
+            var syncedGames = new List<Game>();
+
+            foreach (var ubiUninstallProgram in ubiUninstallPrograms)
+            {
+                syncedGames.Add(new Game(
+                    title: ubiUninstallProgram.DisplayName,
+                    platform: PlatformName,
+                    runTask: GetGameRunTask(ubiUninstallProgram),
+                    iconPath: ubiUninstallProgram.DisplayIcon ?? Path.Combine("Icons", "ubisoft.ico"),
+                    uninstallAction: GetUninstallAction(ubiUninstallProgram)
+                ));
+            }
+
+            SynchronizedGames = syncedGames;
+        }
+
+        private Func<Task> GetGameRunTask(UninstallProgram ubiUninstallProgram)
+        {
+            var gameId = ubiUninstallProgram.SubKeyName.Replace(UbisoftConnectUninstallRegistryKeyStart, string.Empty).Trim();
+            var uriString = $"uplay://launch/{gameId}/0";
+
+            return async () =>
+            {
+                publicApi.OpenAppUri(new Uri(uriString));
+                await Task.CompletedTask;
+            };
+        }
+
+        private UninstallAction? GetUninstallAction(UninstallProgram ubiUninstallProgram)
+        {
+            var uninstallCommand = ubiUninstallProgram.UninstallCommand;
+            var subKeyName = ubiUninstallProgram.SubKeyName;
+
+            if (uninstallCommand == null) return null;
+
+            return new UninstallAction(async () =>
+            {
+                publicApi.ShellRun(uninstallCommand);
+
+                for (int i = 0; i < 12; i++)
+                {
+                    var programs = await ControlPanelUninstall.GetPrograms();
+
+                    if (programs.Any(x => x.SubKeyName.Equals(subKeyName)) == false)
+                        break;
+
+                    await Task.Delay(TimeSpan.FromSeconds(5));
+                }
+
+                await SynchronizeGames();
+            });
+        }
+    }
+}
diff --git a/src/GamesLauncher.Platforms/SyncEngines/XboxSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/XboxSyncEngine.cs
diff --git a/src/GamesLauncher/Main.cs b/src/GamesLauncher/Main.cs
diff --git a/src/GamesLauncher/Views/SettingsView.xaml b/src/GamesLauncher/Views/SettingsView.xaml
diff --git a/src/GamesLauncher/Views/SettingsView.xaml.cs b/src/GamesLauncher/Views/SettingsView.xaml.cs
diff --git a/src/GamesLauncher/plugin.json b/src/GamesLauncher/plugin.json

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ public class MainSettings`
`6`	`6`	`public bool SynchronizeSteam { get; set; } = true;`
`7`	`7`	`public bool SynchronizeXbox { get; set; } = true;`
`8`	`8`	`public bool SynchronizeAmazon { get; set; } = true;`
	`9`	`+ public bool SynchronizeUbisoft { get; set; } = true;`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Flow.Launcher.Plugin;`
`2`	`2`	`using GamesLauncher.Platforms.SyncEngines.Amazon.Readers;`
	`3`	`+using GamesLauncher.Platforms.SyncEngines.Common.Interfaces;`
`3`	`4`	`using System.Collections.Concurrent;`
`4`	`5`
`5`	`6`	`namespace GamesLauncher.Platforms.SyncEngines.Amazon`
`@@ -39,15 +40,15 @@ public async Task SynchronizeGames()`
`39`	`40`	`}`
`40`	`41`
`41`	`42`
`42`		`- private Func<ActionContext, ValueTask<bool>> GetGameRunTask(string gameAppIdString)`
	`43`	`+ private Func<Task> GetGameRunTask(string gameAppIdString)`
`43`	`44`	`{`
`44`	`45`	`var uriString = "amazon-games://play/" + gameAppIdString;`
`45`	`46`
`46`		`- return (context) =>`
	`47`	`+ return () =>`
`47`	`48`	`{`
`48`	`49`	`publicApi.OpenAppUri(new Uri(uriString));`
`49`	`50`
`50`		`- return ValueTask.FromResult(true);`
	`51`	`+ return Task.CompletedTask;`
`51`	`52`	`};`
`52`	`53`	`}`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace GamesLauncher.Platforms.SyncEngines;`
	`1`	`+namespace GamesLauncher.Platforms.SyncEngines.Common.Interfaces;`
`2`	`2`
`3`	`3`	`internal interface ISyncEngine`
`4`	`4`	`{`