ivabus/gui
1
0
Fork 0
mirror of https://github.com/ivabus/gui synced 2025-04-23 14:07:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle failures better when parsing package versions (#385)

Browse source 
partial fix for #383
This commit is contained in:
ABevier 2023-04-03 19:49:54 -04:00 committed by GitHub
parent 8931aa8f72
commit 526e902333
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/desktop/electron/libs/tea-dir.ts
View file

@ -2,7 +2,7 @@
import fs from "fs";
import path from "path";
import { app } from "electron";
import semver from "semver";
import semver, { SemVer } from "semver";
import * as log from "electron-log";
import type { InstalledPackage } from "../../src/libs/types";
import semverCompare from "semver/functions/compare";
@ -14,6 +14,8 @@ type Dir = {
children?: Dir[];
};
type ParsedVersion = { version: SemVer; full_name: string };
export const getTeaPath = () => {
const homePath = app.getPath("home");
const teaPath = path.join(homePath, "./.tea");
@ -28,7 +30,7 @@ export const getGuiPath = () => {
export async function getInstalledPackages(): Promise<InstalledPackage[]> {
const pkgsPath = getTeaPath();
log.info("recusively reading:", pkgsPath);
log.info("recursively reading:", pkgsPath);
const folders = await deepReadDir({
dir: pkgsPath,
continueDeeper: (name: string) => !semver.valid(name),
@ -37,14 +39,8 @@ export async function getInstalledPackages(): Promise<InstalledPackage[]> {
const bottles = folders
.map((p: string) => p.split(".tea/")[1])
.map((p: string) => {
const path = p.trim().split("/");
const version = path.pop();
return {
version: semver.clean(version || "") || "",
full_name: path.join("/")
};
})
.map(parseVersionFromPath)
.filter((v): v is ParsedVersion => !!v)
.sort((a, b) => semverCompare(b.version, a.version));
log.info("installed bottles:", bottles.length);
@ -63,6 +59,20 @@ export async function getInstalledPackages(): Promise<InstalledPackage[]> {
}, []);
}
const parseVersionFromPath = (versionPath: string): ParsedVersion | null => {
try {
const path = versionPath.trim().split("/");
const version = path.pop();
return {
version: new SemVer(semver.clean(version || "") || ""),
full_name: path.join("/")
};
} catch (e) {
log.error("error parsing version from path: ", versionPath);
return null;
}
};
const semverTest =
/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/g;