[no ci]fix flush

storytellerF · Oct 20, 2024 · 53722fb · 53722fb
1 parent 5980d25
commit 53722fb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -26,7 +26,6 @@ dependencies {
     api(libs.exposed.json)
     api(libs.exposed.money)
     implementation(projects.shared)
-    implementation(libs.bcprov.jdk18on)
     implementation(libs.minio)
     implementation(libs.elasticsearch.java)
     implementation(libs.jackson.module.kotlin)

diff --git a/backend/src/main/kotlin/com/storyteller_f/Backend.kt b/backend/src/main/kotlin/com/storyteller_f/Backend.kt
@@ -71,7 +71,6 @@ private fun mediaService(map: Map<out Any, Any>): MediaService {
 private fun topicDocumentService(
     map: Map<out Any, Any>,
 ): TopicDocumentService {
-    val path = Paths.get("../deploy/lucene_data/index")
     return when (val type = map["SEARCH_SERVICE"]) {
         "elastic" -> {
             val certFile = map["CERT_FILE"] as String
@@ -80,7 +79,7 @@ private fun topicDocumentService(
             val pass = map["ELASTIC_PASSWORD"] as String
             ElasticTopicDocumentService(ElasticConnection(url, certFile, name, pass))
         }
-        "lucene" -> LuceneTopicDocumentService(path)
+        "lucene" -> LuceneTopicDocumentService(Paths.get("../deploy/lucene_data/index"))
         else -> throw UnsupportedOperationException("unsupported search service type [$type]")
     }
 }

diff --git a/scripts/flush-database-singleton.sh b/scripts/flush-database-singleton.sh
@@ -3,9 +3,18 @@ cli_path=$1
 base=$2
 sh $cli_path clean
 
-# Traverse and add all JSON files from the directory
+index=0
+
 for json_file in "$base"/*.json; do
   if [ -f "$json_file" ]; then
-    sh $cli_path add "$json_file"
+    filename=$(basename -- "$json_file")
+
+    file_index=$(echo "$filename" | grep -o '^[0-9]\+')
+
+    if [ "$file_index" -eq "$index" ]; then
+      sh "$cli_path" add "$json_file"
+    fi
+
+    index=$((index + 1))
   fi
-done
+done
diff --git a/scripts/flush-database.sh b/scripts/flush-database.sh
@@ -2,11 +2,4 @@ set -e
 sh gradlew cli:installDist
 cli_path=cli/build/install/cli/bin/cli
 base=$1
-sh $cli_path clean
-
-# Traverse and add all JSON files from the "$base/data" directory
-for json_file in "$base/data"/*.json; do
-  if [ -f "$json_file" ]; then
-    sh $cli_path add "$json_file"
-  fi
-done
+sh flush-database-singleton.sh $cli_path $base