Skip to content

Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.

fix(delete): offer a permanent delete only when the Trash refused, and never strand a project

Marc Diazddf074d15c4e
diff --git a/electron/ai-edition/document-service.ts b/electron/ai-edition/document-service.ts
index 178947a39..acbc81bd6 100644
--- a/electron/ai-edition/document-service.ts
+++ b/electron/ai-edition/document-service.ts
@@ -587,6 +587,28 @@ export class DocumentService {
}
}
+ /**
+ * Deletes the project once `removeMedia` has run. The file is moved aside first, so a project
+ * that cannot be deleted fails before anything irreversible, and it comes back if
+ * `removeMedia` throws.
+ */
+ async deleteProjectAfter(projectId: string, removeMedia: () => Promise<void>): Promise<void> {
+ const filePath = this.fileFor(projectId);
+ const parked = `${filePath}.deleting`;
+ await renameWithRetry(filePath, parked);
+ try {
+ await removeMedia();
+ } catch (error) {
+ await renameWithRetry(parked, filePath);
+ throw error;
+ }
+ // The project is gone from every list already: a parked file left behind is only clutter.
+ await fs
+ .rm(parked, { force: true })
+ .catch((error) => console.warn(`[ai-edition] could not remove ${parked}:`, error));
+ await this.deleteProject(projectId);
+ }
+
async addAsset(projectId: string, input: AddAssetInput): Promise<AxcutDocument> {
const doc = await this.getProject(projectId);
const unsupported = unsupportedAssetPath(input);
diff --git a/electron/native-bridge/services/aiEditionService.deleteRecordings.test.ts b/electron/native-bridge/services/aiEditionService.deleteRecordings.test.ts
index 28acd0026..21f1b22b4 100644
--- a/electron/native-bridge/services/aiEditionService.deleteRecordings.test.ts
+++ b/electron/native-bridge/services/aiEditionService.deleteRecordings.test.ts
@@ -90,6 +90,27 @@ describe("AiEditionService — deleting a project's recordings", () => {
await expect(documents.getProject(projectId)).resolves.toBeDefined();
});
+ it("does not offer a permanent delete when the scan failed, not the Trash", async () => {
+ vi.spyOn(documents, "readAllProjectsReport").mockRejectedValueOnce(new Error("EACCES"));
+
+ const result = await service().deleteProject(projectId, "trash");
+ expect(result).toMatchObject({ success: false });
+ expect(result.trashFailed).toBeFalsy();
+ expect(trashItem).not.toHaveBeenCalled();
+ });
+
+ it("removes no recording when the project file cannot be deleted", async () => {
+ // A directory in the way makes moving the project file aside fail.
+ await fs.mkdir(path.join(root, "projects", `${projectId}.openscreen.deleting`));
+
+ const result = await service().deleteProject(projectId, "trash");
+ expect(result).toMatchObject({ success: false });
+ expect(result.trashFailed).toBeFalsy();
+ expect(trashItem).not.toHaveBeenCalled();
+ await expect(fs.access(video)).resolves.toBeUndefined();
+ await expect(documents.getProject(projectId)).resolves.toBeDefined();
+ });
+
it("keeps everything when the Trash refuses, then deletes permanently on request", async () => {
trashItem.mockRejectedValueOnce(new Error("no trash on this filesystem"));
diff --git a/electron/native-bridge/services/aiEditionService.ts b/electron/native-bridge/services/aiEditionService.ts
index 7692df620..69c3165a5 100644
--- a/electron/native-bridge/services/aiEditionService.ts
+++ b/electron/native-bridge/services/aiEditionService.ts
@@ -190,9 +190,10 @@ export class AiEditionService {
disposal: AiEditionRecordingsDisposal = "keep",
): Promise<AiEditionDeleteResult> {
const recordings = this.options.recordings;
- // The recordings go first: a project whose files could not be removed is kept, so
- // the user can retry, instead of leaving takes that nothing points at any more.
+ // The recordings go before the project: a project whose files could not be removed is
+ // kept, so the user can retry, instead of leaving takes that nothing points at any more.
if (disposal !== "keep" && recordings) {
+ let removing = false;
try {
const { owned, unreadable } = await findProjectRecordings(
projectId,
@@ -207,7 +208,13 @@ export class AiEditionService {
error: `${unreadable} project file(s) could not be read, so recordings they may use were not deleted`,
};
}
- await removeRecordingSets(owned, disposal, recordings.trashItem);
+ // The project file is moved aside before any recording goes, so a project that
+ // cannot be deleted never ends up pointing at recordings that are gone.
+ await this.options.documents.deleteProjectAfter(projectId, async () => {
+ removing = true;
+ await removeRecordingSets(owned, disposal, recordings.trashItem);
+ removing = false;
+ });
await forgetMediaLinks(
recordings.registryDir(),
owned.flatMap((set) => set.files),
@@ -215,18 +222,20 @@ export class AiEditionService {
} catch (error) {
return {
success: false,
- trashFailed: disposal === "trash",
+ // Only the Trash refusing earns the offer to delete permanently, not a failed scan.
+ trashFailed: removing && disposal === "trash",
+ error: error instanceof Error ? error.message : String(error),
+ };
+ }
+ } else {
+ try {
+ await this.options.documents.deleteProject(projectId);
+ } catch (error) {
+ return {
+ success: false,
error: error instanceof Error ? error.message : String(error),
};
}
- }
- try {
- await this.options.documents.deleteProject(projectId);
- } catch (error) {
- return {
- success: false,
- error: error instanceof Error ? error.message : String(error),
- };
}
try {
await this.options.deleteChatHistory?.(projectId);