Skip to content

Craft Anything: understand how any software works, and craft your own.

Rust

List new projects in the sidebar immediately and attach existing folders (#987)

BFlatbe198476be93
diff --git a/crates/ai/src/rebuild/project.rs b/crates/ai/src/rebuild/project.rs
index 2fd72bc3..3e4e88ff 100644
--- a/crates/ai/src/rebuild/project.rs
+++ b/crates/ai/src/rebuild/project.rs
@@ -57,7 +57,13 @@ pub fn new_project(
let mut ws = match place {
Place::Projects => Workspace::create(&settings.projects_dir(), &name, request, target_ref)?,
Place::In(dir) => Workspace::create(dir, &name, request, target_ref)?,
- Place::At(folder, existing) => Workspace::create_at(folder, &name, request, target_ref, existing)?,
+ Place::At(folder, existing) => {
+ if folder.join(craft_anything_engine::workspace::MANIFEST).is_file() {
+ Workspace::open(folder)?
+ } else {
+ Workspace::create_at(folder, &name, request, target_ref, existing)?
+ }
+ }
};
if let Some(s) = stack {
ws.manifest.stack = s.name.clone();
diff --git a/crates/ai/src/rebuild/tests.rs b/crates/ai/src/rebuild/tests.rs
index 3d50e349..824928d5 100644
--- a/crates/ai/src/rebuild/tests.rs
+++ b/crates/ai/src/rebuild/tests.rs
@@ -2681,6 +2681,19 @@ fn a_project_started_in_a_picked_folder_stays_in_the_list() {
assert!(listed.iter().any(|w| w.root == ws.root));
}
+#[test]
+fn starting_a_project_at_existing_project_folder_attaches_to_it() {
+ let session = craft_anything_engine::testing::session();
+ let d = tempfile::tempdir().unwrap();
+ let folder = d.path().join("mine");
+ let ws = project::new_project(&session.settings, "-", "Initial app", project::Place::At(&folder, None), None, false, None).unwrap();
+ assert_eq!(ws.root, folder);
+ // Starting again at the same folder attaches to the existing project rather than failing or duplicating
+ let reattached = project::new_project(&session.settings, "-", "Follow up", project::Place::At(&folder, None), None, false, None).unwrap();
+ assert_eq!(reattached.root, folder);
+ assert_eq!(reattached.manifest.name, ws.manifest.name);
+}
+
#[test]
fn a_project_edited_in_place_keeps_what_its_files_are_built_with() {
use craft_anything_engine::workspace::ExistingFiles::{Edit, StartFrom};
diff --git a/crates/ai/src/rebuild/tools.rs b/crates/ai/src/rebuild/tools.rs
index b25bab2d..9b65612f 100644
--- a/crates/ai/src/rebuild/tools.rs
+++ b/crates/ai/src/rebuild/tools.rs
@@ -309,7 +309,9 @@ fn rebuild_start(ctx: &mut Ctx<'_>, params: Value) -> Result<ToolOutput, ToolErr
if p.generate_assets {
return Err(ToolError::invalid("generate_assets is for new projects.").with_remediation("Use project_assets_allow for an existing project."));
}
- (open(dir)?, (!p.resume).then(|| p.request.clone()))
+ let ws = open(dir)?;
+ ctx.session.remember_project(&ws.root)?;
+ (ws, (!p.resume).then(|| p.request.clone()))
}
None if p.resume => return Err(ToolError::invalid("resume is for an existing project.").with_remediation("Pass its folder as `project`.")),
None => {
@@ -321,7 +323,7 @@ fn rebuild_start(ctx: &mut Ctx<'_>, params: Value) -> Result<ToolOutput, ToolErr
(None, None) => project::Place::Projects,
};
let ws = project::new_project(settings, target, &p.request, place, p.build_with.as_deref(), p.generate_assets, p.backend.as_deref())?;
- if p.project_folder.is_some() {
+ if p.project_folder.is_some() || matches!(place, project::Place::At(..)) {
ctx.session.remember_project(&ws.root)?;
}
(ws, None)
diff --git a/crates/ui-egui/src/folders.rs b/crates/ui-egui/src/folders.rs
index 8edeafe4..eca61737 100644
--- a/crates/ui-egui/src/folders.rs
+++ b/crates/ui-egui/src/folders.rs
@@ -215,8 +215,8 @@ impl CraftApp {
pub fn remember_project(&mut self, root: &std::path::Path) {
if self.settings.remember_project(root) {
self.settings_changed();
- self.refresh_projects();
}
+ self.refresh_projects();
}
/// Settings: list projects from another folder too.
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index a64510e4..fad42a4b 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -1409,7 +1409,12 @@ impl CraftApp {
};
match done {
Done::Nothing => {}
- Done::Projects(p) => {
+ Done::Projects(mut p) => {
+ if let Some(ws) = &self.workspace
+ && !p.iter().any(|w| w.root == ws.root)
+ {
+ p.insert(0, ws.clone());
+ }
self.projects = p;
self.refresh_pins();
}
diff --git a/crates/ui-egui/src/project.rs b/crates/ui-egui/src/project.rs
index e0311b90..96ac0e01 100644
--- a/crates/ui-egui/src/project.rs
+++ b/crates/ui-egui/src/project.rs
@@ -100,6 +100,7 @@ impl CraftApp {
// network drive must not freeze the window); `created` starts the build.
self.creating = Some(self.jobs.spawn(tr("Create the project"), false, move |_| {
let created = match &draft.folder {
+ Some(folder) if folder.join(craft_anything_engine::workspace::MANIFEST).is_file() => Workspace::open(folder),
Some(folder) => Workspace::create_at(folder, &name, &request, target, draft.existing),
None => Workspace::create(&projects_dir, &name, &request, target),
};
@@ -128,6 +129,8 @@ impl CraftApp {
}
// A project in a folder of its own stays in the list.
self.remember_project(&ws.root);
+ self.projects.retain(|p| p.root != ws.root);
+ self.projects.insert(0, ws.clone());
// Make is cleared for the next one, unless the person has started on it meanwhile (a
// project that waited for Ghidra).
if self.state.make.request.trim() == request {
@@ -203,7 +206,11 @@ impl CraftApp {
};
self.load_asked(&ws);
}
- self.workspace = Some(ws);
+ self.workspace = Some(ws.clone());
+ if !self.projects.iter().any(|p| p.root == ws.root) {
+ self.projects.insert(0, ws);
+ }
+ self.remember_project(&root);
self.refresh_side_panel();
self.state.screen = Screen::Project;
// A Send pressed before its picture checks finished, on a project they left: send now.
@@ -2452,6 +2459,30 @@ mod tests {
assert!(matches!(feed.last(), Some(FeedItem::Paused)));
assert_eq!(feed.iter().filter(|f| matches!(f, FeedItem::Error { .. })).count(), 1, "a pause adds no error");
}
+
+ /// #966: a newly created project appears in app.projects immediately so the sidebar lists it.
+ #[test]
+ fn created_project_appears_in_projects_list_immediately() {
+ let d = tempfile::tempdir().unwrap();
+ let ws = Workspace::create(d.path(), "Notes", "A notes app", TargetRef::None).unwrap();
+ let mut app = crate::demo::app(crate::demo::engine(craft_anything_engine::Mode::Beginner, true));
+ assert!(app.projects.is_empty());
+ app.created(ws.clone(), "A notes app".into(), "test-backend".into(), None);
+ assert!(!app.projects.is_empty(), "project is added to app.projects immediately");
+ assert_eq!(app.projects[0].root, ws.root);
+ }
+
+ /// #966: opening a project ensures it is listed in app.projects immediately.
+ #[test]
+ fn opening_project_adds_to_projects_list() {
+ let d = tempfile::tempdir().unwrap();
+ let ws = Workspace::create(d.path(), "Timer", "A timer app", TargetRef::None).unwrap();
+ let mut app = crate::demo::app(crate::demo::engine(craft_anything_engine::Mode::Beginner, true));
+ assert!(app.projects.is_empty());
+ app.open_workspace(ws.clone());
+ assert!(!app.projects.is_empty(), "open project is listed in app.projects");
+ assert_eq!(app.projects[0].root, ws.root);
+ }
}
#[cfg(test)]