Skip to content

Commit

Permalink
Fix love records (#6889)
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Bykhov <[email protected]>
  • Loading branch information
BykhovDenis authored Oct 11, 2024
1 parent 211f4ed commit 00d8cf2
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions services/love/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ export const main = async (): Promise<void> => {
const data = dataByUUID.get(res.filename)
if (data !== undefined) {
const client = await WorkspaceClient.create(data.workspace)
await storageAdapter.syncBlobFromStorage(ctx, data.workspaceId, res.filename, storageConfig?.name)
await client.saveFile(res.filename, data.name)
const prefix = rootPrefix(storageConfig, data.workspaceId)
const filename = stripPrefix(prefix, res.filename)
await storageAdapter.syncBlobFromStorage(ctx, data.workspaceId, filename, storageConfig?.name)
await client.saveFile(filename, data.name)
await client.close()
dataByUUID.delete(res.filename)
} else {
Expand Down Expand Up @@ -203,6 +205,17 @@ function getDocumentKey (storageConfig: any, workspace: WorkspaceId, name: strin
return storageConfig.rootBucket === undefined ? name : `${getBucketFolder(workspace)}/${name}`
}

function stripPrefix (prefix: string | undefined, key: string): string {
if (prefix !== undefined && key.startsWith(prefix)) {
return key.slice(prefix.length)
}
return key
}

function rootPrefix (storageConfig: any, workspaceId: WorkspaceId): string | undefined {
return storageConfig.rootBucket !== undefined ? getBucketFolder(workspaceId) + '/' : undefined
}

const startRecord = async (
storageConfig: StorageConfig | undefined,
egressClient: EgressClient,
Expand Down

0 comments on commit 00d8cf2

Please sign in to comment.