Samod integration (#95)

Replaces automerge-repo-rs with samod. 

---------

Co-authored-by: nikitalita <[email protected]>

Author: LilithSilver

Cargo.lock

@@ -546,14 +546,26 @@ void PatchworkEditor::refresh_after_source_change() {
 		Main::iteration();
 	}
 
+	auto current_scene = EditorInterface::get_singleton()->get_edited_scene_root();
+
 	auto open_scenes = EditorInterface::get_singleton()->get_open_scenes();
 	for (auto &scene : open_scenes) {
+		if (current_scene != nullptr && scene == current_scene->get_scene_file_path()) {
+			continue;
+		}
 		while (is_changing_scene()) {
 			OS::get_singleton()->delay_usec(10000);
 			Main::iteration();
 		}
 		EditorInterface::get_singleton()->reload_scene_from_path(scene);
 	}
+	if (current_scene != nullptr) {
+		while (is_changing_scene()) {
+			OS::get_singleton()->delay_usec(10000);
+			Main::iteration();
+		}
+		EditorInterface::get_singleton()->reload_scene_from_path(current_scene->get_scene_file_path());
+	}
 }
 
 Callable PatchworkEditor::steal_close_current_script_tab_file_callback() {

editor/patchwork_editor.cpp

@@ -21,9 +21,6 @@ automerge_0_6 = []
 
 [dependencies]
 automerge = "0.7.2"
-automerge_repo = { version = "0.3.0", features = [
-  "tokio",
-] }
 autosurgeon = "0.10.1"
 futures = "0.3.31"
 godot = "0.4.3"
@@ -56,6 +53,8 @@ rlimit = "0.10.2"
 tracing = "0.1.40"
 tracing-appender = "0.2.2"
 chrono = "0.4.31"
+samod = { git="https://github.com/LilithSilver/samod.git", branch="patchwork", features = ["tokio", "threadpool"] }
+rayon = "1.11.0"
 
 [build-dependencies]
 cbindgen = "^0.27"

rust/Cargo.toml

@@ -5,7 +5,7 @@ use std::path::{PathBuf};
 use std::str;
 use automerge::{Automerge, ChangeHash, ObjType, ReadDoc};
 use automerge::ObjId;
-use automerge_repo::{DocumentId};
+use samod::{DocumentId};
 use ya_md5::{Md5Hasher};
 use crate::helpers::doc_utils::SimpleDocReader;
 use crate::helpers::utils::{ToShortForm, parse_automerge_url};
@@ -81,7 +81,10 @@ impl FileContent {
 			let scene = parse_scene(&string);
 			if scene.is_ok() {
 				return FileContent::Scene(scene.unwrap());
+			} else if let Err(e) = scene {
+				tracing::error!("Error parsing scene: {:?}", e);
 			}
+
 		}
 		FileContent::String(string)
 	}

rust/src/fs/file_utils.rs

@@ -1,5 +1,5 @@
 use automerge::ChangeHash;
-use automerge_repo::{DocHandle, DocumentId};
+use samod::{DocHandle, DocumentId};
 use autosurgeon::{Hydrate, Reconcile};
 use std::collections::{HashMap, HashSet};
 

rust/src/helpers/branch.rs

@@ -37,14 +37,16 @@ pub fn initialize_tracing() {
         .with_writer(CustomStdoutWriter::custom_stdout)
         .with_filter(EnvFilter::new("info")
         .add_directive("patchwork_rust_core=debug".parse().unwrap())
-        .add_directive("automerge_repo=info".parse().unwrap()));
+        .add_directive("samod=info".parse().unwrap())
+		.add_directive("samod_core=info".parse().unwrap()));
     let file_layer = tracing_subscriber::fmt::layer()
         .with_line_number(true)
 		.with_ansi(false)
         .with_writer(non_blocking_file_writer.clone())
         .with_filter(EnvFilter::new("info")
         .add_directive("patchwork_rust_core=trace".parse().unwrap())
-        .add_directive("automerge_repo=debug".parse().unwrap()));
+        .add_directive("samod=info".parse().unwrap())
+		.add_directive("samod_core=info".parse().unwrap()));
     if let Err(e) = tracing_subscriber::registry()
         // stdout writer
         .with(stdout_layer)

rust/src/helpers/tracing.rs

@@ -6,7 +6,7 @@ use crate::{diff::differ::ProjectDiff, helpers::{branch::BranchState, doc_utils:
 use automerge::{
     Automerge, Change, ChangeHash, Patch, PatchLog, ROOT, ReadDoc, transaction::{CommitOptions, Transaction}
 };
-use automerge_repo::{DocHandle, DocumentId};
+use samod::{DocHandle, DocumentId};
 use chrono::{DateTime, Local};
 use serde::{Deserialize, Serialize};
 
@@ -73,7 +73,7 @@ pub(crate) fn get_linked_docs_of_branch(
     branch_doc_handle: &DocHandle,
 ) -> HashMap<String, DocumentId> {
     // Collect all linked doc IDs from this branch
-    branch_doc_handle.with_doc(|d| {
+    branch_doc_handle.with_document(|d| {
         let files = match d.get_obj_id(ROOT, "files") {
             Some(files) => files,
             None => {
@@ -215,6 +215,7 @@ impl From<&Change> for CommitInfo {
 	}
 }
 
+
 #[derive(Debug)]
 pub struct BranchWrapper {
 	pub state: BranchState,

rust/src/helpers/utils.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 use std::{fmt::Display};
 use automerge::{ChangeHash};
-use automerge_repo::{DocumentId};
+use samod::{DocumentId};
 use godot::meta::{ArgPassing, ByValue, GodotType, ToArg};
 use godot::{prelude::*, meta::ToGodot, meta::GodotConvert};
 use crate::fs::file_utils::FileContent;

rust/src/interop/godot_helpers.rs

@@ -5,7 +5,7 @@ use crate::project::project::{Project, GodotProjectSignal};
 use automerge::ChangeHash;
 use godot::classes::editor_plugin::DockSlot;
 use ::safer_ffi::prelude::*;
-use automerge_repo::{DocumentId};
+use samod::{DocumentId};
 use godot::classes::resource_loader::CacheMode;
 use godot::classes::{ConfirmationDialog, Control};
 use godot::classes::EditorInterface;

rust/src/interop/godot_project.rs

@@ -715,7 +715,7 @@ pub fn parse_scene(source: &String) -> Result<GodotScene, String> {
                     // Check if node has a patchwork_id in metadata
                     let node_id_num = match heading.get("unique_id") {
                         Some(unique_id) => unique_id.parse::<i32>().unwrap_or(UNIQUE_SCENE_ID_UNASSIGNED),
-                        None => return Err("Missing required 'unique_id' attribute in node section".to_string())
+                        None => -1
                     };
 					parsed_node_ids.insert(node_id_num);