Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix: keep pending Loom conversions pointed at the owner's original

Richie McIlroy4c921b4c4a55
diff --git a/apps/web/__tests__/unit/loom-import-backfill.test.ts b/apps/web/__tests__/unit/loom-import-backfill.test.ts
index d8ec6f3aa..ce34f61b9 100644
--- a/apps/web/__tests__/unit/loom-import-backfill.test.ts
+++ b/apps/web/__tests__/unit/loom-import-backfill.test.ts
@@ -301,6 +301,46 @@ describe("backfillLoomImport", () => {
expect(mocks.reassign).not.toHaveBeenCalled();
});
+ it("repairs a pending conversion left on the previous owner's path", async () => {
+ mocks.selects = [
+ [
+ video({
+ ownerId: "zephyaaaaaaaaaa",
+ metadata: {
+ loomDeferredProcessing: {
+ status: "pending",
+ rawFileKey: "lukeaaaaaaaaaaa/videoaaaaaaaaaa/raw-upload.webm",
+ },
+ },
+ }),
+ ],
+ [lukeFolder("folderaaaaaaaaa")],
+ ];
+ await expect(
+ backfillLoomImport(org, { videoId: "videoaaaaaaaaaa" }),
+ ).resolves.toMatchObject({ status: "updated", changes: ["original"] });
+ expect(mocks.updates).toHaveLength(1);
+ });
+
+ it("leaves a conversion already on the owner's path alone", async () => {
+ mocks.selects = [
+ [
+ video({
+ metadata: {
+ loomDeferredProcessing: {
+ status: "pending",
+ rawFileKey: "lukeaaaaaaaaaaa/videoaaaaaaaaaa/raw-upload.webm",
+ },
+ },
+ }),
+ ],
+ [lukeFolder("folderaaaaaaaaa")],
+ ];
+ await expect(
+ backfillLoomImport(org, { videoId: "videoaaaaaaaaaa" }),
+ ).resolves.toMatchObject({ status: "unchanged" });
+ });
+
it("reports moves it could not make or finish cleaning up", async () => {
mocks.selects = [[video()], [lukeFolder("folderaaaaaaaaa")]];
mocks.reassign.mockResolvedValue({
diff --git a/apps/web/__tests__/unit/loom-operator-tools.test.ts b/apps/web/__tests__/unit/loom-operator-tools.test.ts
index 98738ee1b..f1eead701 100644
--- a/apps/web/__tests__/unit/loom-operator-tools.test.ts
+++ b/apps/web/__tests__/unit/loom-operator-tools.test.ts
@@ -1,4 +1,6 @@
import type { HttpApi } from "@effect/platform";
+import type { SQL } from "drizzle-orm";
+import { MySqlDialect } from "drizzle-orm/mysql-core";
import { Effect, type Layer as EffectLayer, Option } from "effect";
import { NextRequest } from "next/server";
import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -293,7 +295,11 @@ describe("reassignLoomImport", () => {
],
]);
expect(mocks.updates).toEqual([
- { ownerId: ids.to, public: false, folderId: null },
+ expect.objectContaining({
+ ownerId: ids.to,
+ public: false,
+ folderId: null,
+ }),
]);
expect(mocks.deletes).toBe(2);
expect(mocks.removed).toEqual([mocks.objects.map(({ Key }) => Key)]);
@@ -310,6 +316,19 @@ describe("reassignLoomImport", () => {
[importedVideo({ source: { type: "webMP4", outputKey: "edited.mp4" } })],
"edited video",
],
+ [
+ [
+ importedVideo({
+ metadata: {
+ loomDeferredProcessing: {
+ status: "started",
+ rawFileKey: `${ids.from}/${ids.video}/raw-upload.webm`,
+ },
+ },
+ }),
+ ],
+ "conversion running",
+ ],
[[importedVideo(), []], "new owner not a member"],
])("leaves unsafe moves alone: %#", async (selects, reason) => {
mocks.selects = (selects as unknown[]).map((row) =>
@@ -341,6 +360,21 @@ describe("reassignLoomImport", () => {
expect(mocks.claims).toHaveLength(2);
});
+ it("points a pending conversion at the new owner's copy", async () => {
+ mocks.selects = [[importedVideo()], [{ userId: ids.to }]];
+ await reassignLoomImport(input);
+ const query = new MySqlDialect().sqlToQuery(
+ mocks.updates[0]?.metadata as SQL,
+ );
+ expect(query.sql).toContain("'$.loomDeferredProcessing.rawFileKey'");
+ expect(query.params).toEqual(
+ expect.arrayContaining([
+ `${ids.from}/${ids.video}/%`,
+ `${ids.to}/${ids.video}/`,
+ ]),
+ );
+ });
+
it("keeps sharing and visibility when asked", async () => {
mocks.selects = [[importedVideo()], [{ userId: ids.to }]];
await expect(
@@ -350,8 +384,9 @@ describe("reassignLoomImport", () => {
}),
).resolves.toMatchObject({ status: "moved" });
expect(mocks.updates).toEqual([
- { ownerId: ids.to, folderId: "folderaaaaaaaaa" },
+ expect.objectContaining({ ownerId: ids.to, folderId: "folderaaaaaaaaa" }),
]);
+ expect(mocks.updates[0]).not.toHaveProperty("public");
expect(mocks.deletes).toBe(0);
});
diff --git a/apps/web/lib/loom-import-backfill.ts b/apps/web/lib/loom-import-backfill.ts
index f7bee4584..5df357863 100644
--- a/apps/web/lib/loom-import-backfill.ts
+++ b/apps/web/lib/loom-import-backfill.ts
@@ -58,6 +58,7 @@ export async function backfillLoomImport(
ownerId: videos.ownerId,
folderId: videos.folderId,
effectiveCreatedAt: videos.effectiveCreatedAt,
+ metadata: videos.metadata,
orgOwnerId: organizations.ownerId,
})
.from(videos)
@@ -153,6 +154,32 @@ export async function backfillLoomImport(
changes.push("folder");
}
+ const deferredKey = video.metadata?.loomDeferredProcessing?.rawFileKey;
+ const ownerPrefix = `${ownerId}/${item.videoId}/`;
+ if (
+ ownerId === video.ownerId &&
+ video.metadata?.loomDeferredProcessing?.status === "pending" &&
+ typeof deferredKey === "string" &&
+ !deferredKey.startsWith(ownerPrefix)
+ ) {
+ const fileName = deferredKey.split("/").slice(2).join("/");
+ if (deferredKey.split("/")[1] === item.videoId && fileName) {
+ await db()
+ .update(videos)
+ .set({
+ metadata: sql`JSON_SET(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey', ${`${ownerPrefix}${fileName}`})`,
+ })
+ .where(
+ and(
+ eq(videos.id, id),
+ eq(videos.ownerId, ownerId),
+ sql`JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey')) = ${deferredKey}`,
+ ),
+ );
+ changes.push("original");
+ }
+ }
+
if (date && video.effectiveCreatedAt?.getTime() !== date.getTime()) {
await db()
.update(videos)
diff --git a/apps/web/lib/loom-import-reassign.ts b/apps/web/lib/loom-import-reassign.ts
index 4e5c9a7a2..f9c9cf82b 100644
--- a/apps/web/lib/loom-import-reassign.ts
+++ b/apps/web/lib/loom-import-reassign.ts
@@ -104,6 +104,7 @@ export async function reassignLoomImport({
ownerId: videos.ownerId,
orgId: videos.orgId,
source: videos.source,
+ metadata: videos.metadata,
bucketId: videos.bucket,
storageIntegrationId: videos.storageIntegrationId,
uploadPhase: videoUploads.phase,
@@ -132,6 +133,8 @@ export async function reassignLoomImport({
return { videoId, status: "skipped", reason: "import not finished" };
if (video.source && "outputKey" in video.source && video.source.outputKey)
return { videoId, status: "skipped", reason: "edited video" };
+ if (video.metadata?.loomDeferredProcessing?.status === "started")
+ return { videoId, status: "skipped", reason: "conversion running" };
const [member] = await db()
.select({ userId: organizationMembers.userId })
@@ -273,6 +276,7 @@ async function moveClaimedVideo({
const result = await tx
.update(videos)
.set({
+ metadata: sql`IF(JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey')) LIKE ${`${fromUserId}/${videoId}/%`}, JSON_SET(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey', CONCAT(${`${toUserId}/${videoId}/`}, SUBSTRING(JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomDeferredProcessing.rawFileKey')), ${`${fromUserId}/${videoId}/`.length + 1}))), ${videos.metadata})`,
ownerId: User.UserId.make(toUserId),
folderId: options.folderId
? Folder.FolderId.make(options.folderId)