From 9fa044b66dc7a7e23d8360a4dad01cd1d719f328 Mon Sep 17 00:00:00 2001 From: Moises Sacal Date: Thu, 3 Mar 2022 15:36:55 +1100 Subject: [PATCH] state was being built with filenames without the path --- lib/ocflObject-filesystem-backend.spec.js | 2 +- lib/ocflObject-s3-backend.spec.js | 2 +- lib/ocflObject.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ocflObject-filesystem-backend.spec.js b/lib/ocflObject-filesystem-backend.spec.js index b2d1d8a..a28a28d 100644 --- a/lib/ocflObject-filesystem-backend.spec.js +++ b/lib/ocflObject-filesystem-backend.spec.js @@ -564,7 +564,7 @@ describe("Testing object manipulation functionality - object with one version", let version = await object.getLatestVersion(); - let file = version.state["file_0.txt"].pop(); + let file = version.state["sample/file_0.txt"].pop(); file = object.resolveFilePath({ filePath: file.path }); expect(file).toMatch(/v1\/content\/sample\/file_0.txt/); }); diff --git a/lib/ocflObject-s3-backend.spec.js b/lib/ocflObject-s3-backend.spec.js index 3df94b9..bd9b649 100644 --- a/lib/ocflObject-s3-backend.spec.js +++ b/lib/ocflObject-s3-backend.spec.js @@ -672,7 +672,7 @@ describe("Testing object manipulation functionality - object with one version", let version = await object.getLatestVersion(); - let file = version.state["file_0.txt"].pop(); + let file = version.state["sample/file_0.txt"].pop(); file = object.resolveFilePath({ filePath: file.path }); expect(file).toMatch(/v1\/content\/sample\/file_0.txt/); await object.bucket.removeObjects({ prefix: id }); diff --git a/lib/ocflObject.js b/lib/ocflObject.js index e3da96e..5857961 100644 --- a/lib/ocflObject.js +++ b/lib/ocflObject.js @@ -236,7 +236,7 @@ class OcflObject { files.push( items.map((item) => { return { - name: item.split("/").pop(), + name: item.replace(/^v\d+\/content\//, ''), path: item, hash, version: parseInt(item.split("/").shift().replace("v", "")),