Merge branch 'master' into issue943

meilisearch-http/src/routes/backup.rs

@@ -1,64 +0,0 @@
-use std::fs::File;
-use std::path::Path;
-
-use actix_web::{get, post};
-use actix_web::{HttpResponse, web};
-use serde::{Deserialize, Serialize};
-
-use crate::backup::{BackupInfo, BackupStatus, compressed_backup_folder, init_backup_process};
-use crate::Data;
-use crate::error::{Error, ResponseError};
-use crate::helpers::Authentication;
-
-pub fn services(cfg: &mut web::ServiceConfig) {
-    cfg.service(trigger_backup)
-        .service(get_backup_status);
-}
-
-#[post("/backups", wrap = "Authentication::Private")]
-async fn trigger_backup(
-    data: web::Data<Data>,
-) -> Result<HttpResponse, ResponseError> {
-    let backup_folder = Path::new(&data.backup_folder);
-    match init_backup_process(&data, &backup_folder) {
-        Ok(resume) => Ok(HttpResponse::Accepted().json(resume)),
-        Err(e) => Err(e.into())
-    }
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct BackupStatusResponse {
-    status: String,
-}
-
-#[derive(Deserialize)]
-struct BackupParam {
-    backup_uid: String,
-}
-
-#[get("/backups/{backup_uid}/status", wrap = "Authentication::Private")]
-async fn get_backup_status(
-    data: web::Data<Data>,
-    path: web::Path<BackupParam>,
-) -> Result<HttpResponse, ResponseError> {
-    let backup_folder = Path::new(&data.backup_folder);
-    let backup_uid = &path.backup_uid;
-
-    if let Some(resume) = BackupInfo::get_current() {
-        if &resume.uid == backup_uid {
-            return Ok(HttpResponse::Ok().json(resume));
-        }
-    }
-
-    if File::open(compressed_backup_folder(Path::new(backup_folder), backup_uid)).is_ok() {
-        let resume = BackupInfo::new(
-            backup_uid.into(),
-            BackupStatus::Done
-        );
-
-        Ok(HttpResponse::Ok().json(resume))
-    } else {
-        Err(Error::not_found("backup does not exist").into())
-    }
-}

meilisearch-http/src/routes/dump.rs

@@ -0,0 +1,64 @@
+use std::fs::File;
+use std::path::Path;
+
+use actix_web::{get, post};
+use actix_web::{HttpResponse, web};
+use serde::{Deserialize, Serialize};
+
+use crate::dump::{DumpInfo, DumpStatus, compressed_dumps_folder, init_dump_process};
+use crate::Data;
+use crate::error::{Error, ResponseError};
+use crate::helpers::Authentication;
+
+pub fn services(cfg: &mut web::ServiceConfig) {
+    cfg.service(trigger_dump)
+        .service(get_dump_status);
+}
+
+#[post("/dumps", wrap = "Authentication::Private")]
+async fn trigger_dump(
+    data: web::Data<Data>,
+) -> Result<HttpResponse, ResponseError> {
+    let dumps_folder = Path::new(&data.dumps_folder);
+    match init_dump_process(&data, &dumps_folder) {
+        Ok(resume) => Ok(HttpResponse::Accepted().json(resume)),
+        Err(e) => Err(e.into())
+    }
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct DumpStatusResponse {
+    status: String,
+}
+
+#[derive(Deserialize)]
+struct DumpParam {
+    dump_uid: String,
+}
+
+#[get("/dumps/{dump_uid}/status", wrap = "Authentication::Private")]
+async fn get_dump_status(
+    data: web::Data<Data>,
+    path: web::Path<DumpParam>,
+) -> Result<HttpResponse, ResponseError> {
+    let dumps_folder = Path::new(&data.dumps_folder);
+    let dump_uid = &path.dump_uid;
+
+    if let Some(resume) = DumpInfo::get_current() {
+        if &resume.uid == dump_uid {
+            return Ok(HttpResponse::Ok().json(resume));
+        }
+    }
+
+    if File::open(compressed_dumps_folder(Path::new(dumps_folder), dump_uid)).is_ok() {
+        let resume = DumpInfo::new(
+            dump_uid.into(),
+            DumpStatus::Done
+        );
+
+        Ok(HttpResponse::Ok().json(resume))
+    } else {
+        Err(Error::not_found("dump does not exist").into())
+    }
+}

meilisearch-http/src/routes/mod.rs

@@ -10,7 +10,7 @@ pub mod setting;
 pub mod stats;
 pub mod stop_words;
 pub mod synonym;
-pub mod backup;
+pub mod dump;
 
 #[derive(Deserialize)]
 pub struct IndexParam {