remove no reference function
This commit is contained in:
parent
986848fea9
commit
46a70a15ac
@ -3,27 +3,10 @@
|
|||||||
import { UiUtilWrapper } from "../util/uiUtil";
|
import { UiUtilWrapper } from "../util/uiUtil";
|
||||||
import { runCommand } from "../util/commonUtil";
|
import { runCommand } from "../util/commonUtil";
|
||||||
import { logger } from "../util/logger";
|
import { logger } from "../util/logger";
|
||||||
import path from "path";
|
|
||||||
|
|
||||||
let pipxPathStatus = '';
|
|
||||||
let devchatStatus = '';
|
let devchatStatus = '';
|
||||||
|
|
||||||
function locateCommand(command): string | undefined {
|
export function checkDevChatDependency(showError: boolean = true): boolean {
|
||||||
try {
|
|
||||||
// split lines and choose first line
|
|
||||||
const binPaths = runCommand(`where ${command}`).toString().trim().split('\n');
|
|
||||||
return binPaths[0].trim();
|
|
||||||
} catch (error) {
|
|
||||||
try {
|
|
||||||
const binPaths = runCommand(`which ${command}`).toString().trim().split('\n');
|
|
||||||
return binPaths[0].trim();
|
|
||||||
} catch (error) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function checkDevChatDependency(pythonCommand: string, showError: boolean = true): boolean {
|
|
||||||
let devChat: string | undefined = UiUtilWrapper.getConfiguration('DevChat', 'DevChatPath');
|
let devChat: string | undefined = UiUtilWrapper.getConfiguration('DevChat', 'DevChatPath');
|
||||||
if (!devChat) {
|
if (!devChat) {
|
||||||
return false;
|
return false;
|
||||||
@ -52,63 +35,4 @@ export function checkDevChatDependency(pythonCommand: string, showError: boolean
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getDefaultPythonCommand(): string | undefined {
|
|
||||||
try {
|
|
||||||
runCommand('python3 -V');
|
|
||||||
return locateCommand('python3');
|
|
||||||
} catch (error) {
|
|
||||||
try {
|
|
||||||
const version = runCommand('python -V');
|
|
||||||
if (version.includes('Python 3')) {
|
|
||||||
return locateCommand('python');
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
} catch (error) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getValidPythonCommand(): string | undefined {
|
|
||||||
try {
|
|
||||||
const pythonCommand = UiUtilWrapper.getConfiguration('DevChat', 'PythonPath');
|
|
||||||
if (pythonCommand) {
|
|
||||||
return pythonCommand;
|
|
||||||
}
|
|
||||||
|
|
||||||
const defaultPythonCommand = getDefaultPythonCommand();
|
|
||||||
if (defaultPythonCommand) {
|
|
||||||
UiUtilWrapper.updateConfiguration('DevChat', 'PythonPath', defaultPythonCommand);
|
|
||||||
}
|
|
||||||
|
|
||||||
return defaultPythonCommand;
|
|
||||||
} catch (error) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getPipxEnvironmentPath(pythonCommand: string): string | undefined {
|
|
||||||
// Get pipx environment
|
|
||||||
try {
|
|
||||||
const pipxEnvOutput = runCommand(`"${pythonCommand}" -m pipx environment`).toString();
|
|
||||||
const binPathRegex = /PIPX_BIN_DIR=\s*(.*)/;
|
|
||||||
|
|
||||||
// Get BIN path from pipx environment
|
|
||||||
const match = pipxEnvOutput.match(binPathRegex);
|
|
||||||
if (match && match[1]) {
|
|
||||||
return match[1];
|
|
||||||
} else {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateEnvironmentPath(binPath: string): void {
|
|
||||||
// Add BIN path to PATH
|
|
||||||
if (process.env.PATH?.indexOf(binPath) === undefined || process.env.PATH?.indexOf(binPath) < 0) {
|
|
||||||
process.env.PATH = `${binPath}:${process.env.PATH}`;
|
|
||||||
logger.channel()?.info(`Added ${binPath} to PATH.`);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user