Merge pull request #47 from KrystianLesniak/develop

Release: 1.7.2
KrystianLesniak · Dec 13, 2023 · f76b1ed · f76b1ed
2 parents abe2e4f + c643e6e
commit f76b1ed
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/src/GamesLauncher.Platforms/PlatformsManager.cs b/src/GamesLauncher.Platforms/PlatformsManager.cs
@@ -32,7 +32,17 @@ public async Task SynchronizeGames(MainSettings settings)
             Engines = InitializeEngines(settings);
             await Parallel.ForEachAsync(Engines, async (engine, ct) =>
             {
-                await engine.SynchronizeGames();
+                try
+                {
+                    await engine.SynchronizeGames();
+                }
+                catch(Exception ex)
+                {
+                    //TODO: Think about shortening an overly long error message title
+                    publicApi.ShowMsgError($"GamesLauncher: {engine.PlatformName} failed to synchronize", "Please submit your issue with logs at plugin GitHub page.");
+                    publicApi.LogWarn(engine.GetType().Name, @"If you see this, something bad has happened. Please report your problem using the logs you see below at: https://github.com/KrystianLesniak/Flow.Launcher.Plugin.GamesLauncher/issues");
+                    publicApi.LogException(engine.GetType().Name, ex.Message, ex);
+                }
             });
 
 #if DEBUG

diff --git a/src/GamesLauncher.Platforms/SyncEngines/ShortcutsSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/ShortcutsSyncEngine.cs
@@ -48,7 +48,9 @@ private Func<Task> GetGameRunTask(string fullPath)
         {
             return async () =>
             {
-                publicApi.ShellRun($"start \"\" \"{fullPath}\"");
+                var directory = Path.GetDirectoryName(fullPath);
+                var fileShortcut = Path.GetFileName(fullPath);
+                publicApi.ShellRun($"cd /d \"{directory}\" && start \"\" \"{fileShortcut}\"");
                 await Task.CompletedTask;
             };
         }

diff --git a/src/GamesLauncher/Main.cs b/src/GamesLauncher/Main.cs
@@ -47,11 +47,14 @@ public Task<List<Result>> QueryAsync(Query query, CancellationToken token)
             var games = _platformsManager.AllSynchronizedGames;
 
             var search = query.Search.Trim();
+            var isGlobalKeyword = string.IsNullOrEmpty(query.ActionKeyword);
 
             return Task.FromResult(
             games
                 .Where(x => _hiddenGames.IsHidden(x.InternalGameId) == false)
-                .Select(x => EnrichGameWithQueryAndAction(x, search))
+                .Select(EnrichGameWithActions)
+                .Select(x => EnrichGameWithResultScore(x, search, isGlobalKeyword))
+                .Where(x => x is not null).Select(x => x!)
                 .ToList());
         }
 
@@ -98,7 +101,7 @@ public Control CreateSettingPanel()
             return new SettingsView(_settings, _hiddenGames, _publicApi);
         }
 
-        private Result EnrichGameWithQueryAndAction(Game game, string search)
+        private Game EnrichGameWithActions(Game game)
         {
             game.AsyncAction ??= async (context) =>
             {
@@ -107,8 +110,12 @@ private Result EnrichGameWithQueryAndAction(Game game, string search)
                 return true;
             };
 
-            //Get score
-            if (string.IsNullOrWhiteSpace(search))   //When there is no search query display 10 last played games
+            return game;
+        }
+
+        private Result? EnrichGameWithResultScore(Game game, string search, bool isGlobalKeyword)
+        {
+            if (!isGlobalKeyword && string.IsNullOrWhiteSpace(search))   //When there is no global keyword set and no search query typed prioritze last played games.
             {
                 game.Score = _lastPlayedGames.GetResultScoreByOrder(game.InternalGameId);
                 game.TitleHighlightData = Array.Empty<int>();
@@ -120,7 +127,10 @@ private Result EnrichGameWithQueryAndAction(Game game, string search)
                 game.TitleHighlightData = fuzzySearch.MatchData;
             }
 
-            return game;
+            if (isGlobalKeyword)
+                return game.Score > 0 ? game : null;
+            else
+                return game;
         }
     }
 }
diff --git a/src/GamesLauncher/plugin.json b/src/GamesLauncher/plugin.json
@@ -4,7 +4,7 @@
     "Name": "GamesLauncher",
     "Description": "Search and launch games from multiple platforms like Steam, Epic Games, Xbox etc.",
     "Author": "KrystianLesniak",
-    "Version": "1.7.1",
+    "Version": "1.7.2",
     "Language": "csharp",
     "Website": "https://github.com/KrystianLesniak/Flow.Launcher.Plugin.GamesLauncher",
     "IcoPath": "icon.png",