WIP, debugging

Cogru · Jul 2, 2024 · a20042f · a20042f
1 parent d7d65f0
commit a20042f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/handler/room.rs b/src/handler/room.rs
@@ -151,12 +151,13 @@ pub mod add_file {
 
         file.save();
 
+        let rel_filename = rel_filename.unwrap();
         let contents = file.buffer();
 
         room.broadcast_json_except(
             &serde_json::json!({
                 "method": METHOD,
-                "file": rel_filename.unwrap(),
+                "file": rel_filename,
                 "contents": contents,
                 "status": ST_SUCCESS,
             }),
@@ -204,10 +205,12 @@ pub mod delete_file {
             return;
         }
 
+        let rel_filename = rel_filename.unwrap();
+
         room.broadcast_json_except(
             &serde_json::json!({
                 "method": METHOD,
-                "file": rel_filename.unwrap(),
+                "file": rel_filename,
                 "status": ST_SUCCESS,
             }),
             addr,
@@ -254,6 +257,12 @@ pub mod rename_file {
 
         let file = room.rename_file(&filename, &newname);
 
+        let rel_filename = rel_filename.unwrap();
+        let rel_newname = rel_newname.unwrap();
+
+        println!("file: {}", rel_filename);
+        println!("rel_newname: {}", rel_newname);
+
         // Failed to rename file.
         if file.is_none() {
             general_error(
@@ -268,8 +277,8 @@ pub mod rename_file {
         room.broadcast_json_except(
             &serde_json::json!({
                 "method": METHOD,
-                "file": rel_filename.unwrap(),
-                "newname": rel_newname.unwrap(),
+                "file": rel_filename,
+                "newname": rel_newname,
                 "status": ST_SUCCESS,
             }),
             addr,

diff --git a/src/server/error.rs b/src/server/error.rs
@@ -27,7 +27,7 @@ pub async fn general_error(channel: &mut Channel, method: &str, msg: &str) {
     channel
         .send_json(&serde_json::json!({
             "method": method,
-            "messag": format!("⛔ {}", msg),
+            "message": format!("⛔ {}", msg),
             "status": ST_FAILURE,
         }))
         .await;