Skip to content

Create polished demo videos without editing skills. Mac/Windows/Linux

Cleanup rename and trim handling

webadderalle8afbecb9f1c
diff --git a/electron/ipc/register/project.ts b/electron/ipc/register/project.ts
index b041f7df..29f138dc 100644
--- a/electron/ipc/register/project.ts
+++ b/electron/ipc/register/project.ts
@@ -19,14 +19,17 @@ import {
} from "../state";
import {
getProjectsDir,
+ getProjectThumbnailPath,
isAllowedLocalMediaPath,
isPathInsideDirectory,
isTrustedProjectPath,
listProjectLibraryEntries,
+ loadRecentProjectPaths,
loadProjectFromPath,
persistRecordingsDirectorySetting,
replaceApprovedSessionLocalReadPaths,
rememberRecentProject,
+ saveRecentProjectPaths,
saveProjectThumbnail,
} from "../project/manager";
import {
@@ -354,6 +357,9 @@ export function registerProjectHandlers() {
const projectsDir = await getProjectsDir()
const preparedProject = ensureProjectDataHasProjectId(projectData)
+ const activeProjectPath = isTrustedProjectPath(currentProjectPath)
+ ? currentProjectPath
+ : null
const targetProjectPath = path.join(
projectsDir,
`${normalizedProjectName}.${PROJECT_FILE_EXTENSION}`,
@@ -362,17 +368,44 @@ export function registerProjectHandlers() {
const overwriteCheck = await ensureNamedProjectSaveDoesNotOverwriteDifferentProject(
targetProjectPath,
preparedProject.projectData,
- currentProjectPath,
+ activeProjectPath,
)
if (!overwriteCheck.success) {
return overwriteCheck
}
await fs.writeFile(targetProjectPath, JSON.stringify(preparedProject.projectData, null, 2), 'utf-8')
- setCurrentProjectPath(targetProjectPath)
await saveProjectThumbnail(targetProjectPath, thumbnailDataUrl)
await rememberRecentProject(targetProjectPath)
+ if (activeProjectPath) {
+ const [activeResolvedPath, targetResolvedPath] = await Promise.all([
+ resolveComparablePath(activeProjectPath),
+ resolveComparablePath(targetProjectPath),
+ ])
+
+ if (activeResolvedPath !== targetResolvedPath) {
+ await fs.unlink(activeProjectPath).catch((unlinkError: NodeJS.ErrnoException) => {
+ if (unlinkError.code !== 'ENOENT') {
+ throw unlinkError
+ }
+ })
+ await fs.rm(getProjectThumbnailPath(activeProjectPath), { force: true }).catch(() => undefined)
+
+ const recentProjectPaths = await loadRecentProjectPaths()
+ const filteredRecentProjectPaths: string[] = []
+ for (const recentProjectPath of recentProjectPaths) {
+ const recentResolvedPath = await resolveComparablePath(recentProjectPath)
+ if (recentResolvedPath !== activeResolvedPath) {
+ filteredRecentProjectPaths.push(recentProjectPath)
+ }
+ }
+ await saveRecentProjectPaths(filteredRecentProjectPaths)
+ }
+ }
+
+ setCurrentProjectPath(targetProjectPath)
+
return {
success: true,
path: targetProjectPath,
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 4a944574..f48489c6 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -2932,7 +2932,6 @@ export default function VideoEditor() {
);
setZoomRegions((prev) => removeTrimmedRegions(prev));
setAnnotationRegions((prev) => removeTrimmedRegions(prev));
- setTrimRegions((prev) => removeTrimmedRegions(prev));
setSpeedRegions((prev) => removeTrimmedRegions(prev));
setAudioRegions((prev) => removeTrimmedRegions(prev));
}
@@ -3001,9 +3000,6 @@ export default function VideoEditor() {
setAnnotationRegions((prev) =>
prev.filter((region) => region.endMs <= startMs || region.startMs >= endMs),
);
- setTrimRegions((prev) =>
- prev.filter((region) => region.endMs <= startMs || region.startMs >= endMs),
- );
setSpeedRegions((prev) =>
prev.filter((region) => region.endMs <= startMs || region.startMs >= endMs),
);