feat: deduplicate log (#275)

When adding a package the app will warn if the version inside ProjectVersion.txt is malformed. If multiple packages are added it will make this warning for each package. This seems a bit redundant. Probably we should only log the warning once at the beginning of the add operation.
openupm · Apr 22, 2024 · 31e7f42 · 31e7f42
1 parent 7d795d9
commit 31e7f42
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/src/cli/cmd-add.ts b/src/cli/cmd-add.ts
@@ -108,6 +108,12 @@ export function makeAddCmd(
     if (envResult.isErr()) return envResult;
     const env = envResult.value;
 
+    if (typeof env.editorVersion === "string")
+      log.warn(
+        "editor.version",
+        `${env.editorVersion} is unknown, the editor version check is disabled`
+      );
+
     const tryAddToManifest = async function (
       manifest: UnityProjectManifest,
       pkg: PackageReference
@@ -173,31 +179,27 @@ export function makeAddCmd(
           const targetEditorVersion = targetEditorVersionResult.value;
 
           // verify editor version
-          if (targetEditorVersion !== null) {
-            if (typeof env.editorVersion === "string") {
-              log.warn(
-                "editor.version",
-                `${env.editorVersion} is unknown, the editor version check is disabled`
-              );
-            } else if (
-              compareEditorVersion(env.editorVersion, targetEditorVersion) < 0
-            ) {
-              log.warn(
-                "editor.version",
-                `requires ${targetEditorVersion} but found ${stringifyEditorVersion(
-                  env.editorVersion
-                )}`
+          if (
+            targetEditorVersion !== null &&
+            typeof env.editorVersion !== "string" &&
+            compareEditorVersion(env.editorVersion, targetEditorVersion) < 0
+          ) {
+            log.warn(
+              "editor.version",
+              `requires ${targetEditorVersion} but found ${stringifyEditorVersion(
+                env.editorVersion
+              )}`
+            );
+            if (!options.force) {
+              log.notice(
+                "suggest",
+                `upgrade the editor to ${targetEditorVersion}, or run with option -f to ignore the warning`
               );
-              if (!options.force) {
-                log.notice(
-                  "suggest",
-                  `upgrade the editor to ${targetEditorVersion}, or run with option -f to ignore the warning`
-                );
-                return Err(new EditorIncompatibleError());
-              }
+              return Err(new EditorIncompatibleError());
             }
           }
         }
+
         // pkgsInScope
         if (!isUpstreamPackage) {
           log.verbose(