fix: parse full semver string

the semver-regex package only captures the core version number
project-slippi · Nov 1, 2023 · 05a0c22 · 05a0c22
1 parent 5888f15
commit 05a0c22
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/dolphin/install/ishiiInstallation.ts b/src/dolphin/install/ishiiInstallation.ts
@@ -8,7 +8,6 @@ import * as fs from "fs-extra";
 import os from "os";
 import path from "path";
 import { lt } from "semver";
-import semverRegex from "semver-regex";
 
 import type { DolphinInstallation } from "../types";
 import { DolphinLaunchType } from "../types";
@@ -19,6 +18,10 @@ const log = electronLog.scope("dolphin/ishiiInstallation");
 
 const isLinux = process.platform === "linux";
 
+// taken from https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+const semverRegex =
+  /(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(?:-((?:0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?/;
+
 export class IshiirukaDolphinInstallation implements DolphinInstallation {
   public readonly installationFolder: string;
   constructor(private readonly dolphinLaunchType: DolphinLaunchType) {
@@ -219,7 +222,7 @@ export class IshiirukaDolphinInstallation implements DolphinInstallation {
     try {
       const dolphinPath = await this.findDolphinExecutable();
       const dolphinVersionOut = spawnSync(dolphinPath, ["--version"]).stdout.toString();
-      const match = dolphinVersionOut.match(semverRegex());
+      const match = dolphinVersionOut.match(semverRegex);
       return match?.[0] ?? null;
     } catch (err) {
       return null;

diff --git a/src/dolphin/install/mainlineInstallation.ts b/src/dolphin/install/mainlineInstallation.ts
@@ -8,7 +8,6 @@ import * as fs from "fs-extra";
 import os from "os";
 import path from "path";
 import { lt } from "semver";
-import semverRegex from "semver-regex";
 
 import type { DolphinInstallation } from "../types";
 import { DolphinLaunchType } from "../types";
@@ -19,6 +18,10 @@ const log = electronLog.scope("dolphin/mainlineInstallation");
 
 const isLinux = process.platform === "linux";
 
+// taken from https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+const semverRegex =
+  /(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(?:-((?:0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?/;
+
 export class MainlineDolphinInstallation implements DolphinInstallation {
   public readonly installationFolder: string;
   constructor(private readonly dolphinLaunchType: DolphinLaunchType, private readonly betaSuffix: string) {
@@ -230,10 +233,9 @@ export class MainlineDolphinInstallation implements DolphinInstallation {
   public async getDolphinVersion(): Promise<string | null> {
     try {
       const dolphinPath = await this.findDolphinExecutable();
-      log.warn(`dolphinPath = ${dolphinPath}`);
       const dolphinVersionOut = spawnSync(dolphinPath, ["--version"]).stdout.toString();
       log.warn(`dolphinVersionOut = ${dolphinVersionOut}`);
-      const match = dolphinVersionOut.match(semverRegex());
+      const match = dolphinVersionOut.match(semverRegex);
       return match?.[0] ?? null;
     } catch (err) {
       return null;