Auto replace if vanity urls are used (#447)

microsoft · Sep 13, 2023 · 769665c · 769665c
1 parent a71c11d
commit 769665c
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 0 deletions.
diff --git a/src/WingetCreateCLI/Commands/UpdateCommand.cs b/src/WingetCreateCLI/Commands/UpdateCommand.cs
@@ -239,6 +239,20 @@ await this.UpdateManifestsInteractively(initialManifests) :
                         return false;
                     }
 
+                    if (!this.Replace)
+                    {
+                        // Updated manifests will always be in multi-manifest format so no need to check for singleton manifest.
+                        string updatedVersion = updatedManifests.VersionManifest.PackageVersion;
+                        string originalVersion = originalManifests.VersionManifest != null ? originalManifests.VersionManifest.PackageVersion : originalManifests.SingletonManifest.PackageVersion;
+
+                        if (WinGetUtil.CompareVersions(updatedVersion, originalVersion) != 0 && AreInstallerUrlsVanityUrls(originalManifests, updatedManifests))
+                        {
+                            Logger.InfoLocalized(nameof(Resources.AutoReplacingPreviousVersion_Message));
+                            Console.WriteLine();
+                            this.Replace = true;
+                        }
+                    }
+
                     return await this.LoadGitHubClient(true)
                         ? (commandEvent.IsSuccessful = await this.GitHubSubmitManifests(
                             updatedManifests,
@@ -638,6 +652,27 @@ private static void DisplayManifestsAsMenuSelection(Manifests manifests)
             }
         }
 
+        private static bool AreInstallerUrlsVanityUrls(Manifests baseManifest, Manifests newManifest)
+        {
+            List<Installer> newInstallers = newManifest.InstallerManifest.Installers;
+
+            // All installer URLs in the new manifest must have a matching installer URL in the base manifest.
+            foreach (Installer installer in newInstallers)
+            {
+                if (baseManifest.InstallerManifest != null && !baseManifest.InstallerManifest.Installers.Any(i => i.InstallerUrl == installer.InstallerUrl))
+                {
+                    return false;
+                }
+
+                if (baseManifest.SingletonManifest != null && !baseManifest.SingletonManifest.Installers.Any(i => i.InstallerUrl == installer.InstallerUrl))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         private string ObtainMatchingRelativeFilePath(string oldRelativeFilePath, string directory, string archiveName)
         {
             string fileName = Path.GetFileName(oldRelativeFilePath);

diff --git a/src/WingetCreateCLI/Properties/Resources.Designer.cs b/src/WingetCreateCLI/Properties/Resources.Designer.cs
diff --git a/src/WingetCreateCLI/Properties/Resources.resx b/src/WingetCreateCLI/Properties/Resources.resx
@@ -1118,4 +1118,7 @@
   <data name="UseOverrides_ErrorMessage" xml:space="preserve">
     <value>Try using the architecture and/or scope overrides to uniquely match new URLs to existing installer nodes in the manifest.</value>
   </data>
+  <data name="AutoReplacingPreviousVersion_Message" xml:space="preserve">
+    <value>Vanity URL detected. The submission will automatically replace the previous version.</value>
+  </data>
 </root>