From 7edf95f0530fb65069049c996f56f7159a3cafa3 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 25 Jul 2023 13:55:32 -0700
Subject: more reliably install meilisearch
---
.../src/continuedev/server/meilisearch_server.py | 39 +++++++++++++++++-----
1 file changed, 30 insertions(+), 9 deletions(-)
(limited to 'continuedev/src')
diff --git a/continuedev/src/continuedev/server/meilisearch_server.py b/continuedev/src/continuedev/server/meilisearch_server.py
index 419f081f..232b6243 100644
--- a/continuedev/src/continuedev/server/meilisearch_server.py
+++ b/continuedev/src/continuedev/server/meilisearch_server.py
@@ -1,19 +1,44 @@
import os
+import shutil
import subprocess
import meilisearch
from ..libs.util.paths import getServerFolderPath
-def check_meilisearch_installed() -> bool:
+def ensure_meilisearch_installed():
"""
Checks if MeiliSearch is installed.
"""
-
serverPath = getServerFolderPath()
meilisearchPath = os.path.join(serverPath, "meilisearch")
+ dumpsPath = os.path.join(serverPath, "dumps")
+ dataMsPath = os.path.join(serverPath, "data.ms")
+
+ paths = [meilisearchPath, dumpsPath, dataMsPath]
- return os.path.exists(meilisearchPath)
+ existing_paths = set()
+ non_existing_paths = set()
+ for path in paths:
+ if os.path.exists(path):
+ existing_paths.add(path)
+ else:
+ non_existing_paths.add(path)
+
+ if len(non_existing_paths) > 0:
+ # Clear the meilisearch binary
+ if meilisearchPath in existing_paths:
+ os.remove(meilisearchPath)
+ non_existing_paths.remove(meilisearchPath)
+
+ # Clear the existing directories
+ for p in existing_paths:
+ shutil.rmtree(p, ignore_errors=True)
+
+ # Download MeiliSearch
+ print("Downloading MeiliSearch...")
+ subprocess.run(
+ f"curl -L https://install.meilisearch.com | sh", shell=True, check=True, cwd=serverPath)
def check_meilisearch_running() -> bool:
@@ -42,12 +67,8 @@ def start_meilisearch():
serverPath = getServerFolderPath()
- # Check if MeiliSearch is installed
- if not check_meilisearch_installed():
- # Download MeiliSearch
- print("Downloading MeiliSearch...")
- subprocess.run(
- f"curl -L https://install.meilisearch.com | sh", shell=True, check=True, cwd=serverPath)
+ # Check if MeiliSearch is installed, if not download
+ ensure_meilisearch_installed()
# Check if MeiliSearch is running
if not check_meilisearch_running():
--
cgit v1.2.3-70-g09d2