Merge pull request #2142 from SanjulaGanepola/fix/count-files-when-empty

Fix `countFiles` when directory does not exist
codefori · Jul 1, 2024 · fea4a69 · fea4a69
2 parents e789fc3 + 4ebced1
commit fea4a69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/api/IBMiContent.ts b/src/api/IBMiContent.ts
@@ -947,6 +947,6 @@ export default class IBMiContent {
   }
 
   async countFiles(directory: string) {
-    return Number((await this.ibmi.sendCommand({ command: `ls | wc -l`, directory })).stdout.trim());
+    return Number((await this.ibmi.sendCommand({ command: `cd ${directory} && (ls | wc -l)` })).stdout.trim());
   }
 }
diff --git a/src/testing/connection.ts b/src/testing/connection.ts
@@ -1,6 +1,7 @@
 import assert from "assert";
 import { TestSuite } from ".";
 import { instance } from "../instantiate";
+import { Tools } from "../api/Tools";
 
 export const ConnectionSuite: TestSuite = {
   name: `Connection tests`,
@@ -275,7 +276,7 @@ export const ConnectionSuite: TestSuite = {
       name: `Test withTempDirectory and countFiles`, test: async () => {
         const connection = instance.getConnection()!;
         const content = instance.getContent()!;
-        let temp;        
+        let temp;
 
         await connection.withTempDirectory(async tempDir => {
           temp = tempDir;
@@ -291,6 +292,9 @@ export const ConnectionSuite: TestSuite = {
           }
 
           assert.strictEqual(await content.countFiles(tempDir), toCreate);
+
+          //Directory does not exist
+          assert.strictEqual(await content.countFiles(`${tempDir}/${Tools.makeid(20)}`), 0);
         });
 
         if (temp) {