Fix migrator (#105)

Kruemmelspalter · Feb 2, 2024 · b1f1e0d · b1f1e0d
1 parent 0abf02e
commit b1f1e0d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src-tauri/src/bin/migrator.rs b/src-tauri/src/bin/migrator.rs
@@ -57,12 +57,16 @@ async fn main() -> Result<()> {
         .await?;
 
         let docdir = filespider::document::get_document_directory(&id)?;
-        let old_id = r.get::<Uuid, &str>("id");
+        let old_id = Uuid::try_parse(&r.get::<String, &str>("id"))?;
+        let ext = match r.get::<Option<String>, &str>("fileExtension") {
+            Some(s) => format!(".{}", s),
+            None => String::new(),
+        };
         if !Command::new("sh")
             .arg("-c")
             .arg(format!(
-                "cp -r {}/{}/* {} && mv {}/{} {}/{}",
-                args.document_directory, old_id, docdir, docdir, old_id, docdir, id
+                "mkdir {}/{}; cp -r {}/{}/* {} && mv {}/{}{} {}/{}{}",
+                docdir, id, args.document_directory, old_id, docdir, docdir, old_id, ext, docdir, id, ext,
             ))
             .spawn()?
             .wait()