DevInfra/github-local-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move regex to static variable

Browse Source 
Signed-off-by: Sanjula Ganepola <sanjulagane@gmail.com>
This commit is contained in:
Sanjula Ganepola
2024-11-24 23:04:46 -05:00
parent eca9244ec9
commit 32d99f8179
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/componentsManager.ts
View File

@@ -32,10 +32,13 @@ export enum ExtensionStatus {
} }
export class ComponentsManager { export class ComponentsManager {
static actVersionRegExp: RegExp = /act version (.+)/;
static dockerVersionRegExp: RegExp = /Client:\n(.+\n)?\sVersion:\s+(.+)/;
async getComponents(): Promise<Component<CliStatus | ExtensionStatus>[]> { async getComponents(): Promise<Component<CliStatus | ExtensionStatus>[]> {
const components: Component<CliStatus | ExtensionStatus>[] = []; const components: Component<CliStatus | ExtensionStatus>[] = [];
const actCliInfo = await this.getCliInfo('act --version', /act version (.+)/, false, false); const actCliInfo = await this.getCliInfo('act --version', ComponentsManager.actVersionRegExp, false, false);
components.push({ components.push({
name: 'nektos/act', name: 'nektos/act',
icon: 'terminal', icon: 'terminal',
@@ -125,7 +128,7 @@ export class ComponentsManager {
} }
}); });
const dockerCliInfo = await this.getCliInfo('docker version', /Client:\n.+\n\sVersion:\s+(.+)/, true, true); const dockerCliInfo = await this.getCliInfo('docker version', ComponentsManager.dockerVersionRegExp, true, true);
const dockerDesktopPath = ConfigurationManager.get<string>(Section.dockerDesktopPath); const dockerDesktopPath = ConfigurationManager.get<string>(Section.dockerDesktopPath);
components.push({ components.push({
name: 'Docker Engine', name: 'Docker Engine',
@@ -183,7 +186,7 @@ export class ComponentsManager {
await delay(4000); await delay(4000);
// Check again for docker status // Check again for docker status
const newDockerCliInfo = await this.getCliInfo('docker version', /Client:\n(.+\n)?\sVersion:\s+(.+)/, true, true); const newDockerCliInfo = await this.getCliInfo('docker version', ComponentsManager.dockerVersionRegExp, true, true);
if (dockerCliInfo.status !== newDockerCliInfo.status) { if (dockerCliInfo.status !== newDockerCliInfo.status) {
componentsTreeDataProvider.refresh(); componentsTreeDataProvider.refresh();
} else { } else {
@@ -237,7 +240,7 @@ export class ComponentsManager {
await delay(4000); await delay(4000);
// Check again for docker status // Check again for docker status
const newDockerCliInfo = await this.getCliInfo('docker version', /Client:\n.+\n\sVersion:\s+(.+)/, true, true); const newDockerCliInfo = await this.getCliInfo('docker version', ComponentsManager.dockerVersionRegExp, true, true);
if (dockerCliInfo.status !== newDockerCliInfo.status) { if (dockerCliInfo.status !== newDockerCliInfo.status) {
componentsTreeDataProvider.refresh(); componentsTreeDataProvider.refresh();
} }