diff options
| author | Nate Sesti <33237525+sestinj@users.noreply.github.com> | 2023-09-01 14:03:53 -0700 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-01 14:03:53 -0700 | 
| commit | 07f1a9a4dbbca57c14957eb21ef356adbf803bff (patch) | |
| tree | fafa6ddf7d9d08d314093e798b3cc370332a086c /extension/src/activation | |
| parent | 456a8239f18ac5159fffc2484050f94ac3f36317 (diff) | |
| download | sncontinue-07f1a9a4dbbca57c14957eb21ef356adbf803bff.tar.gz sncontinue-07f1a9a4dbbca57c14957eb21ef356adbf803bff.tar.bz2 sncontinue-07f1a9a4dbbca57c14957eb21ef356adbf803bff.zip  | |
Windows meilisearch (#441)
* feat: :sparkles: first attempt at windows download meilisearch
* Fixed starting meilisearch on windows
* Meilisearch to server/meilisearch
* feat: :sparkles: select custom model to use with edit step
* feat: :art: recursive getDirectoryContents
Diffstat (limited to 'extension/src/activation')
| -rw-r--r-- | extension/src/activation/environmentSetup.ts | 35 | 
1 files changed, 13 insertions, 22 deletions
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts index 7ca87768..3aa536d0 100644 --- a/extension/src/activation/environmentSetup.ts +++ b/extension/src/activation/environmentSetup.ts @@ -74,6 +74,14 @@ function serverVersionPath(): string {    return path.join(serverPath(), "server_version.txt");  } +function serverBinaryPath(): string { +  return path.join( +    serverPath(), +    "exe", +    `run${os.platform() === "win32" ? ".exe" : ""}` +  ); +} +  export function getExtensionVersion() {    const extension = vscode.extensions.getExtension("continue.continue");    return extension?.packageJSON.version || ""; @@ -105,14 +113,7 @@ async function checkOrKillRunningServer(serverUrl: string): Promise<boolean> {          // Try again, on Windows. This time with taskkill          if (os.platform() === "win32") {            try { -            const exePath = path.join( -              getExtensionUri().fsPath, -              "server", -              "exe", -              "run.exe" -            ); - -            await runCommand(`taskkill /F /IM ${exePath}`); +            await runCommand(`taskkill /F /IM run.exe`);            } catch (e: any) {              console.log(                "Failed to kill old server second time on windows with taskkill:", @@ -126,14 +127,9 @@ async function checkOrKillRunningServer(serverUrl: string): Promise<boolean> {        fs.unlinkSync(serverVersionPath());      }      // Also delete the server binary -    const serverBinaryPath = path.join( -      getExtensionUri().fsPath, -      "server", -      "exe", -      `run${os.platform() === "win32" ? ".exe" : ""}` -    ); -    if (fs.existsSync(serverBinaryPath)) { -      fs.unlinkSync(serverBinaryPath); +    const serverBinary = serverBinaryPath(); +    if (fs.existsSync(serverBinary)) { +      fs.unlinkSync(serverBinary);      }    } @@ -213,12 +209,7 @@ export async function startContinuePythonServer(redownload: boolean = true) {          : "mac/run"        : "linux/run"; -  const destination = path.join( -    getExtensionUri().fsPath, -    "server", -    "exe", -    `run${os.platform() === "win32" ? ".exe" : ""}` -  ); +  const destination = serverBinaryPath();    // First, check if the server is already downloaded    let shouldDownload = true;  | 
