Merge pull request #37 from QuantStack/fixCount

Fix counting functionality for directory rename

src/s3.ts

@@ -373,14 +373,15 @@ export const checkS3Object = async (
   s3Client: S3Client,
   bucketName: string,
   root: string,
-  path?: string
+  path?: string,
+  isDir?: boolean
 ): Promise<void> => {
   // checking the existance of an S3 object
   if (path) {
     await s3Client.send(
       new HeadObjectCommand({
         Bucket: bucketName,
-        Key: PathExt.join(root, path)
+        Key: PathExt.join(root, path) + (isDir === true ? '/' : '')
       })
     );
   }
@@ -657,8 +658,12 @@ export const countS3ObjectNameAppearances = async (
 
     if (Contents) {
       Contents.forEach(c => {
-        const fileName = c
-          .Key!.replace((root ? root + '/' : '') + (path ? path + '/' : ''), '')
+        let fileName =
+          c.Key![c.Key!.length - 1] === '/'
+            ? c.Key!.substring(0, c.Key!.length - 1)
+            : c.Key!;
+        fileName = fileName
+          .replace((root ? root + '/' : '') + (path ? path + '/' : ''), '')
           .split('/')[0];
         if (
           fileName.substring(0, originalName.length + 1).includes(originalName)

src/s3contents.ts

@@ -430,7 +430,13 @@ export class Drive implements Contents.IDrive {
     );
 
     try {
-      await checkS3Object(this._s3Client, this._name, this._root, newLocalPath);
+      await checkS3Object(
+        this._s3Client,
+        this._name,
+        this._root,
+        newLocalPath,
+        isDir
+      );
       newFileName = await this.incrementName(newLocalPath, this._name, isDir);
     } catch (error) {
       // HEAD request failed for this file name, continue, as name doesn't already exist.
@@ -471,7 +477,10 @@ export class Drive implements Contents.IDrive {
 
     // check if we are dealing with a directory
     if (isDir === true) {
-      localPath = localPath.substring(0, localPath.length - 1);
+      localPath =
+        localPath[localPath.length - 1] === '/'
+          ? localPath.substring(0, localPath.length - 1)
+          : localPath;
       originalName = PathExt.basename(localPath);
     }
     // dealing with a file