Fix auto-fill message showing on non-GitHub URLs (#544)

microsoft · Aug 7, 2024 · a71cf9a · a71cf9a
1 parent a9411fd
commit a71cf9a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/src/WingetCreateCLI/Commands/NewCommand.cs b/src/WingetCreateCLI/Commands/NewCommand.cs
@@ -237,10 +237,13 @@ public override async Task<bool> Execute()
                     ShiftRootFieldsToInstallerLevel(manifests.InstallerManifest);
                     try
                     {
-                        Logger.InfoLocalized(nameof(Resources.PopulatingGitHubMetadata_Message));
                         if (this.GitHubClient != null)
                         {
-                            await this.GitHubClient.PopulateGitHubMetadata(manifests, this.Format.ToString());
+                            bool populated = await this.GitHubClient.PopulateGitHubMetadata(manifests, this.Format.ToString());
+                            if (populated)
+                            {
+                                Logger.InfoLocalized(nameof(Resources.PopulatingGitHubMetadata_Message));
+                            }
                         }
                     }
                     catch (Octokit.ApiException)

diff --git a/src/WingetCreateCLI/Commands/UpdateCommand.cs b/src/WingetCreateCLI/Commands/UpdateCommand.cs
@@ -467,11 +467,13 @@ public async Task<Manifests> UpdateManifestsAutonomously(Manifests manifests)
                 ResetVersionSpecificFields(manifests);
                 try
                 {
-                    Logger.InfoLocalized(nameof(Resources.PopulatingGitHubMetadata_Message));
-
                     if (this.GitHubClient != null)
                     {
-                        await this.GitHubClient.PopulateGitHubMetadata(manifests, this.Format.ToString());
+                        bool populated = await this.GitHubClient.PopulateGitHubMetadata(manifests, this.Format.ToString());
+                        if (populated)
+                        {
+                            Logger.InfoLocalized(nameof(Resources.PopulatingGitHubMetadata_Message));
+                        }
                     }
                 }
                 catch (Octokit.ApiException)
@@ -934,10 +936,13 @@ private async Task<Manifests> UpdateManifestsInteractively(Manifests manifests)
                 ResetVersionSpecificFields(manifests);
                 try
                 {
-                    Logger.InfoLocalized(nameof(Resources.PopulatingGitHubMetadata_Message));
                     if (this.GitHubClient != null)
                     {
-                        await this.GitHubClient.PopulateGitHubMetadata(manifests, this.Format.ToString());
+                        bool populated = await this.GitHubClient.PopulateGitHubMetadata(manifests, this.Format.ToString());
+                        if (populated)
+                        {
+                            Logger.InfoLocalized(nameof(Resources.PopulatingGitHubMetadata_Message));
+                        }
                     }
                 }
                 catch (Octokit.ApiException)

diff --git a/src/WingetCreateCore/Common/GitHub.cs b/src/WingetCreateCore/Common/GitHub.cs
@@ -236,14 +236,16 @@ public async Task<string> FindPackageId(string packageId)
         /// </summary>
         /// <param name="manifests">Wrapper object for manifest object models to be populated with GitHub metadata.</param>
         /// <param name="serializerFormat">The output format of the manifest serializer.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public async Task PopulateGitHubMetadata(Manifests manifests, string serializerFormat)
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation. The task result is a boolean indicating whether metadata was successfully populated.</returns>
+        public async Task<bool> PopulateGitHubMetadata(Manifests manifests, string serializerFormat)
         {
             // Only populate metadata if we have a valid GitHub token.
             if (this.github.Credentials.AuthenticationType != AuthenticationType.Anonymous)
             {
-                await GitHubManifestMetadata.PopulateManifestMetadata(manifests, serializerFormat, this.github);
+                return await GitHubManifestMetadata.PopulateManifestMetadata(manifests, serializerFormat, this.github);
             }
+
+            return false;
         }
 
         /// <summary>
@@ -499,15 +501,15 @@ private async Task DeletePullRequestBranch(int pullRequestId)
 
         private static class GitHubManifestMetadata
         {
-            public static async Task PopulateManifestMetadata(Manifests manifests, string serializerFormat, GitHubClient client)
+            public static async Task<bool> PopulateManifestMetadata(Manifests manifests, string serializerFormat, GitHubClient client)
             {
                 // Get owner and repo from the installer manifest
                 GitHubUrlMetadata? metadata = GetMetadataFromGitHubUrl(manifests.InstallerManifest);
 
                 if (metadata == null)
                 {
                     // Could not populate GitHub metadata.
-                    return;
+                    return false;
                 }
 
                 string owner = metadata.Value.Owner;
@@ -574,6 +576,8 @@ public static async Task PopulateManifestMetadata(Manifests manifests, string se
                         },
                     };
                 }
+
+                return true;
             }
 
             private static void SetReleaseDate(Manifests manifests, string serializerFormat, Release githubRelease)