Skip to content

Commit

Permalink
Make exported asset file names unique to avoid collisions
Browse files Browse the repository at this point in the history
  • Loading branch information
JiriLojda authored and IvanKiral committed Dec 11, 2023
1 parent 1cbfd05 commit 458779f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/commands/importExportEntities/entities/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { serially } from "../../../utils/requests.js";
import { EntityDefinition, ImportContext } from "../entityDefinition.js";

const assetsBinariesFolderName = "assets";
const createFileName = (asset: AssetContracts.IAssetModelContract) => `${asset.id}-${asset.file_name}`;

type AssetWithElements = AssetContracts.IAssetModelContract & { readonly elements: ReadonlyArray<unknown> };

Expand Down Expand Up @@ -45,12 +46,12 @@ export const assetsEntity: EntityDefinition<ReadonlyArray<AssetWithElements>> =

const saveAsset = async (zip: JSZip, asset: AssetContracts.IAssetModelContract) => {
const file = await fetch(asset.url).then(res => res.blob()).then(res => res.arrayBuffer());
zip.file(asset.file_name, file);
zip.file(createFileName(asset), file);
};

const createImportAssetFetcher = (zip: JSZip, client: ManagementClient, context: ImportContext) =>
(fileAsset: AssetContracts.IAssetModelContract) => async (): Promise<readonly [string, string]> => {
const binary = await zip.file(fileAsset.file_name)?.async("nodebuffer");
const binary = await zip.file(createFileName(fileAsset))?.async("nodebuffer");

if (!binary) {
throw new Error(`Failed to load a binary file "${fileAsset.file_name}" for asset "${fileAsset.id}".`);
Expand Down

0 comments on commit 458779f

Please sign in to comment.