Auto skip logo when unavailable

Fixed #120
svrooij · Nov 13, 2024 · 4aa7bcc · 4aa7bcc
1 parent 491ea9f
commit 4aa7bcc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Svrooij.WinTuner.CmdLets/Commands/DeployWtWin32App.cs b/src/Svrooij.WinTuner.CmdLets/Commands/DeployWtWin32App.cs
@@ -225,7 +225,7 @@ protected override async Task ProcessAuthenticatedAsync(IAuthenticationProvider
                     logger?.LogDebug("Loading package info from folder {PackageFolder}", PackageFolder);
                     var packageInfo = await metadataManager!.LoadPackageInfoFromFolderAsync(PackageFolder, cancellationToken);
                     App = metadataManager.ConvertPackageInfoToWin32App(packageInfo);
-                    LogoPath = Path.Combine(PackageFolder, "..", "logo.png");
+                    LogoPath = Path.GetFullPath(Path.Combine(PackageFolder, "..", "logo.png"));
                     IntuneWinFile = metadataManager.GetIntuneWinFileName(PackageFolder, packageInfo);
                 }
             }

diff --git a/src/WingetIntune/Intune/IntuneManager.cs b/src/WingetIntune/Intune/IntuneManager.cs
@@ -445,12 +445,19 @@ private async Task AssignAppAsync(GraphServiceClient graphServiceClient, string
         }
     }
 
-    internal Task DownloadLogoAsync(string packageFolder, string packageId, CancellationToken cancellationToken)
+    internal async Task DownloadLogoAsync(string packageFolder, string packageId, CancellationToken cancellationToken)
     {
         var logoPath = Path.GetFullPath(Path.Combine(packageFolder, "..", "logo.png"));
-        var logoUri = $"https://api.winstall.app/icons/{packageId}.png";//new Uri($"https://winget.azureedge.net/cache/icons/48x48/{packageId}.png");
-        LogDownloadLogo(logoUri);
-        return fileManager.DownloadFileAsync(logoUri, logoPath, throwOnFailure: false, overrideFile: false, cancellationToken: cancellationToken);
+        try
+        {
+            var logoUri = $"https://api.winstall.app/icons/{packageId}.png";//new Uri($"https://winget.azureedge.net/cache/icons/48x48/{packageId}.png");
+            LogDownloadLogo(logoUri);
+            await fileManager.DownloadFileAsync(logoUri, logoPath, throwOnFailure: false, overrideFile: false, cancellationToken: cancellationToken);
+        } catch (Exception e)
+        {
+            logger.LogWarning(e, "Error downloading logo for {PackageId}, place your own logo here: {LogoPath}", packageId, logoPath);
+        }
+
     }
 
     internal async Task<string> DownloadInstallerAsync(string tempPackageFolder, PackageInfo packageInfo, CancellationToken cancellationToken)