Merge pull request #2753 from marticliment/better-async

Asynchronicity improvements

Author: marticliment

scripts/apply_versions.py

@@ -39,6 +39,8 @@ def fileReplaceLinesWith(filename: str, list: dict[str, str], encoding="utf-8"):
         "[assembly: AssemblyVersion(\"": f"{versionISS}\")]\n",
         "[assembly: AssemblyFileVersion(\"": f"{versionISS}\")]\n",
         "[assembly: AssemblyInformationalVersion(\"": f"{versionName}\")]\n",
+        "[assembly: AssemblyInformationalVersionAttribute(\"": f"{versionName}\")]\n",
+        "[assembly: AssemblyVersionAttribute(\"": f"{versionISS}\")]\n",
         # Your replacement dictionary here
     }, encoding="utf-8-sig")
 

src/UniGetUI.Core.LanguageEngine/LanguageData.cs

@@ -55,7 +55,7 @@ public static ReadOnlyDictionary<string, string> TranslationPercentages
 
         private static ReadOnlyDictionary<string, string> LoadTranslationPercentages()
         {
-            if (JsonObject.Parse(File.ReadAllText(Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Data", "TranslatedPercentages.json"))) is JsonObject val)
+            if (JsonNode.Parse(File.ReadAllText(Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Data", "TranslatedPercentages.json"))) is JsonObject val)
             {
                 return new(val.ToDictionary(x => x.Key, x => (x.Value ?? ("404%" + x.Key)).ToString()));
             }
@@ -65,7 +65,7 @@ private static ReadOnlyDictionary<string, string> LoadTranslationPercentages()
 
         private static ReadOnlyDictionary<string, string> LoadLanguageReference()
         {
-            if (JsonObject.Parse(File.ReadAllText(Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Data", "LanguagesReference.json"))) is JsonObject val)
+            if (JsonNode.Parse(File.ReadAllText(Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Data", "LanguagesReference.json"))) is JsonObject val)
             {
                 return new(val.ToDictionary(x => x.Key, x => (x.Value ?? ("NoNameLang_" + x.Key)).ToString()));
             }

src/UniGetUI.Core.Tools.Tests/ToolsTests.cs

@@ -34,15 +34,15 @@ public void TranslateFunctionTester(string textEntry, bool TranslationExists)
         [Fact]
         public async Task TestWhichFunctionForExistingFile()
         {
-            Tuple<bool, string> result = await CoreTools.Which("cmd.exe");
+            Tuple<bool, string> result = await CoreTools.WhichAsync("cmd.exe");
             Assert.True(result.Item1);
             Assert.True(File.Exists(result.Item2));
         }
 
         [Fact]
         public async Task TestWhichFunctionForNonExistingFile()
         {
-            Tuple<bool, string> result = await CoreTools.Which("nonexistentfile.exe");
+            Tuple<bool, string> result = await CoreTools.WhichAsync("nonexistentfile.exe");
             Assert.False(result.Item1);
             Assert.Equal("", result.Item2);
         }

src/UniGetUI.Core.Tools/Tools.cs

@@ -43,6 +43,7 @@ public static string Translate(string text, params object[] values)
             {
                 dict.Add(index.ToString(), item);
             }
+
             return Translate(text, dict);
         }
 
@@ -75,7 +76,12 @@ public static void RelaunchProcess()
         /// </summary>
         /// <param name="command">The executable alias to find</param>
         /// <returns>A tuple containing: a boolean hat represents whether the path was found or not; the path to the file if found.</returns>
-        public static async Task<Tuple<bool, string>> Which(string command)
+        public static async Task<Tuple<bool, string>> WhichAsync(string command)
+        {
+            return await Task.Run(() => Which(command));
+        }
+
+        public static Tuple<bool, string> Which(string command)
         {
             command = command.Replace(";", "").Replace("&", "").Trim();
             Logger.Debug($"Begin \"which\" search for command {command}");
@@ -95,18 +101,14 @@ public static async Task<Tuple<bool, string>> Which(string command)
             };
             process.StartInfo = UpdateEnvironmentVariables(process.StartInfo);
             process.Start();
-            string? line = await process.StandardOutput.ReadLineAsync();
+            string? line = process.StandardOutput.ReadLine();
             string output;
-            if (line == null)
-            {
-                output = "";
-            }
-            else
-            {
-                output = line.Trim();
-            }
 
-            await process.WaitForExitAsync();
+            if (line is null) output = "";
+            else output = line.Trim();
+
+            process.WaitForExit();
+
             if (process.ExitCode != 0 || output == "")
             {
                 Logger.ImportantInfo($"Command {command} was not found on the system");
@@ -243,6 +245,11 @@ public static async Task<double> GetFileSizeAsync(Uri? url)
             return await GetFileSizeAsyncAsLong(url) / 1048576d;
         }
 
+        public static double GetFileSize(Uri? url)
+        {
+            return GetFileSizeAsyncAsLong(url).GetAwaiter().GetResult() / 1048576d;
+        }
+
         public static async Task<long> GetFileSizeAsyncAsLong(Uri? url)
         {
             if (url == null)
@@ -434,7 +441,7 @@ public static long HashStringAsLong(string inputString)
         /// </summary>
         /// <param name="linkPath">The location of the link to be created</param>
         /// <param name="targetPath">The location of the real folder where to point</param>
-        public static async Task CreateSymbolicLinkDir(string linkPath, string targetPath)
+        public static void CreateSymbolicLinkDir(string linkPath, string targetPath)
         {
             var startInfo = new ProcessStartInfo
             {
@@ -449,7 +456,7 @@ public static async Task CreateSymbolicLinkDir(string linkPath, string targetPat
             Process? p = Process.Start(startInfo);
             if (p is not null)
             {
-                await p.WaitForExitAsync();
+                p.WaitForExit();
             }
 
             if (p is null || p.ExitCode != 0)

src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs

@@ -303,7 +303,7 @@ public void BuildV1WidgetsApi()
                 IPackage? package = PEInterface.UpgradablePackagesLoader.GetPackageForId(Request.Query.@packageId, Request.Query.@packageSource);
                 if (package != null)
                 {
-                    Uri iconUrl = await package.GetIconUrl();
+                    Uri iconUrl = await Task.Run(package.GetIconUrl);
                     if (iconUrl.ToString() != "ms-appx:///Assets/Images/package_color.png")
                     {
                         iconPath = Path.Join(CoreData.UniGetUICacheDirectory_Icons, package.Manager.Name, $"{package.Id}.{iconUrl.ToString().Split('.')[^1]}");
@@ -321,7 +321,15 @@ public void BuildV1WidgetsApi()
                     ContentType = $"image/{iconPath.Split('.')[^1]}",
                     Contents = (stream) =>
                     {
-                        stream.Write(fileContents, 0, fileContents.Length);
+                        try
+                        {
+                            stream.Write(fileContents, 0, fileContents.Length);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.Warn($"Unable to load icon to path {iconPath}");
+                            Logger.Warn(ex);
+                        }
                     }
                 };
 

src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs

@@ -73,12 +73,12 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
         /// After calling this method, the returned URL points to a location on the local machine
         /// </summary>
         /// <returns>An always-valid URI object, pointing to a file:// or to a ms-appx:// URL</returns>
-        public Task<Uri> GetIconUrl();
+        public Uri GetIconUrl();
 
         /// <summary>
         /// Retrieves a list og URIs representing the available screenshots for this package.
         /// </summary>
-        public Task<Uri[]> GetPackageScreenshots();
+        public IEnumerable<Uri> GetScreenshots();
 
 
         /// <summary>
@@ -136,7 +136,7 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
         /// </summary>
         public bool NewerVersionIsInstalled();
 
-        public Task<SerializablePackage_v1> AsSerializable();
+        public SerializablePackage_v1 AsSerializable();
 
         public SerializableIncompatiblePackage_v1 AsSerializable_Incompatible();
     }

src/UniGetUI.PAckageEngine.Interfaces/IPackageManager.cs

@@ -23,7 +23,7 @@ public interface IPackageManager : ISourceProvider, IPackageDetailsProvider, IOp
         /// <summary>
         /// Initializes the Package Manager (asynchronously). Must be run before using any other method of the manager.
         /// </summary>
-        public Task InitializeAsync();
+        public void Initialize();
 
         /// <summary>
         /// Returns true if the manager is enabled, false otherwise
@@ -39,25 +39,25 @@ public interface IPackageManager : ISourceProvider, IPackageDetailsProvider, IOp
         /// Returns an array of Package objects that the manager lists for the given query. Depending on the manager, the list may
         /// also include similar results. This method is fail-safe and will return an empty array if an error occurs.
         /// </summary>
-        public Task<IPackage[]> FindPackages(string query);
+        public IEnumerable<IPackage> FindPackages(string query);
 
         /// <summary>
         /// Returns an array of UpgradablePackage objects that represent the available updates reported by the manager.
         /// This method is fail-safe and will return an empty array if an error occurs.
         /// </summary>
-        public Task<IPackage[]> GetAvailableUpdates();
+        public IEnumerable<IPackage> GetAvailableUpdates();
 
         /// <summary>
         /// Returns an array of Package objects that represent the installed reported by the manager.
         /// This method is fail-safe and will return an empty array if an error occurs.
         /// </summary>
-        public Task<IPackage[]> GetInstalledPackages();
+        public IEnumerable<IPackage> GetInstalledPackages();
 
         /// <summary>
         /// Refreshes the Package Manager sources/indexes
         /// Each manager MUST implement this method.
         /// </summary>
-        public Task RefreshPackageIndexes();
+        public void RefreshPackageIndexes();
 
         public IManagerSource GetSourceOrDefault(string SourceName);
         public IManagerSource? GetSourceIfExists(string SourceName);

src/UniGetUI.PAckageEngine.Interfaces/ManagerProviders/IOperationProvider.cs

@@ -8,7 +8,7 @@ public interface IOperationProvider
     /// that the requested operation is performed over the given package, with its corresponding
     /// installation options.
     /// </summary>
-    public abstract IEnumerable<string> GetOperationParameters(
+    public IEnumerable<string> GetOperationParameters(
         IPackage package,
         IInstallationOptions options,
         OperationType operation
@@ -18,7 +18,7 @@ OperationType operation
     /// Returns the veredict of the given package operation, given the package, the operation type,
     /// the corresponding output and the return code.
     /// </summary>
-    public abstract OperationVeredict GetOperationResult(
+    public OperationVeredict GetOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

src/UniGetUI.PAckageEngine.Interfaces/ManagerProviders/IPackageDetailsProvider.cs

@@ -11,7 +11,7 @@ public interface IPackageDetailsProvider
         /// </summary>
         /// <param name="details">The PackageDetails instance to load</param>
         /// <returns>A PackageDetails object</returns>
-        public abstract Task GetPackageDetails(IPackageDetails details);
+        public void GetPackageDetails(IPackageDetails details);
 
         /// <summary>
         /// Returns the available versions to install for the given package.
@@ -20,28 +20,28 @@ public interface IPackageDetailsProvider
         /// </summary>
         /// <param name="package">The package from which to load its versions</param>
         /// <returns>An array of stings containing the found versions, an empty array if none.</returns>
-        public abstract Task<string[]> GetPackageVersions(IPackage package);
+        public IEnumerable<string> GetPackageVersions(IPackage package);
 
         /// <summary>
         /// Returns an Uri pointing to the icon of this package.
         /// The uri may be either a ms-appx:/// url or a http(s):// protocol url
         /// </summary>
         /// <param name="package">The package from which to load the icon</param>
         /// <returns>A full path to a valid icon file</returns>
-        public abstract Task<CacheableIcon?> GetPackageIconUrl(IPackage package);
+        public CacheableIcon? GetPackageIconUrl(IPackage package);
 
         /// <summary>
         /// Returns the URLs to the screenshots (if any) of this package.
         /// </summary>
         /// <param name="package">The package from which to load the screenshots</param>
         /// <returns>An array with valid URIs to the screenshots</returns>
-        public abstract Task<Uri[]> GetPackageScreenshotsUrl(IPackage package);
+        public IEnumerable<Uri> GetPackageScreenshotsUrl(IPackage package);
 
         /// <summary>
         /// Returns the location where the package is installed, or null if the location cannot be loaded.
         /// </summary>
         /// <param name="package">The package for which to get the location</param>
         /// <returns>A valid path in the form of a string or a null object</returns>
-        public abstract string? GetPackageInstallLocation(IPackage package);
+        public string? GetPackageInstallLocation(IPackage package);
     }
 }

src/UniGetUI.PAckageEngine.Interfaces/ManagerProviders/ISourceProvider.cs

@@ -11,14 +11,14 @@ public interface ISourceProvider
         /// </summary>
         /// <param name="source">The source to add</param>
         /// <returns>An array containing the parameters to pass to the manager executable</returns>
-        public abstract string[] GetAddSourceParameters(IManagerSource source);
+        public string[] GetAddSourceParameters(IManagerSource source);
 
         /// <summary>
         /// Returns the command-line parameters required to remove the given source from the manager.
         /// </summary>
         /// <param name="source">The source to remove</param>
         /// <returns>An array containing the parameters to pass to the manager executable</returns>
-        public abstract string[] GetRemoveSourceParameters(IManagerSource source);
+        public string[] GetRemoveSourceParameters(IManagerSource source);
 
         /// <summary>
         /// Checks the result of attempting to add a source
@@ -27,7 +27,7 @@ public interface ISourceProvider
         /// <param name="ReturnCode">The return code of the operation</param>
         /// <param name="Output">the command-line output of the operation</param>
         /// <returns>An OperationVeredict value</returns>
-        public abstract OperationVeredict GetAddSourceOperationVeredict(IManagerSource source, int ReturnCode, string[] Output);
+        public OperationVeredict GetAddSourceOperationVeredict(IManagerSource source, int ReturnCode, string[] Output);
 
         /// <summary>
         /// Checks the result of attempting to remove a source
@@ -36,12 +36,12 @@ public interface ISourceProvider
         /// <param name="ReturnCode">The return code of the operation</param>
         /// <param name="Output">the command-line output of the operation</param>
         /// <returns>An OperationVeredict value</returns>
-        public abstract OperationVeredict GetRemoveSourceOperationVeredict(IManagerSource source, int ReturnCode, string[] Output);
+        public OperationVeredict GetRemoveSourceOperationVeredict(IManagerSource source, int ReturnCode, string[] Output);
 
         /// <summary>
         /// Returns the available sources
         /// </summary>
         /// <returns>An array of ManagerSource objects</returns>
-        public abstract Task<IManagerSource[]> GetSources();
+        public IEnumerable<IManagerSource> GetSources();
     }
 }