Merge pull request #218 from microsoft/Fix-for-input-dir-without-glob

Allow scanning of dir without blob expression

Author: munozemilio

packages/chatdown/README.md

@@ -42,6 +42,8 @@ EXAMPLES
      $ bf chatdown --in=./path/to/file/sample.chat --out=./
      $ bf chatdown -i ./path/to/file/*.sample.chat -o ./
      $ bf chatdown -i=./path/to/file/*.sample.chat -o=./
+     $ bf chatdown --in ./path/to/directory
+     $ bf chatdown --in ./path/to/directory/*
      $ (echo user=Joe && [ConversationUpdate=MembersAdded=Joe]) | bf chatdown --static
 ```
 

packages/chatdown/src/commands/chatdown.ts

@@ -41,7 +41,6 @@ export default class Chatdown extends Command {
 
       if (inputIsDirectory) {
         let inputDir = flags.in ? flags.in.trim() : ''
-
         const len = await this.processFiles(inputDir, outputDir)
         if (len === 0) {
           throw new CLIError('No chat files found at: ' + flags.in)
@@ -93,14 +92,36 @@ export default class Chatdown extends Command {
     }
   }
 
+  private getFiles(directoryPath: any) {
+    return new Promise((resolve, reject) => {
+      let fileList: any = []
+      fs.readdir(directoryPath, (err: any, files: any) => {
+        if (err) {
+          reject('Error scanning directory' + err)
+        }
+        fileList = files.map((file: any) => path.join(directoryPath, file))
+        resolve(fileList)
+      })
+    })
+  }
+
   private getFileName(file: any) {
     let fileName = path.basename(file, path.extname(file))
     return fileName
   }
 
   private async processFiles(inputDir: any, outputDir: any) {
     return new Promise(async (resolve, reject) => {
-      let files = glob.sync(inputDir, {ignore: ['**/node_modules/**']})
+      let files: any = []
+      if (inputDir.indexOf('*') > -1) {
+        files = glob.sync(inputDir, {ignore: ['**/node_modules/**']})
+      } else {
+        try {
+          files = await this.getFiles(inputDir)
+        } catch (err) {
+          reject(new CLIError(`Failed to scan directory ${err}`))
+        }
+      }
       /* tslint:disable:prefer-for-of */
       for (let i = 0; i < files.length; i++) {
         try {

packages/chatdown/test/commands/chatdown.test.ts

@@ -44,21 +44,21 @@ describe('chatdown', () => {
     });
 
     it('should read from file when chat file is passed as an argument', done => {
-        cp.exec(`node ./bin/run chatdown --in ./test/utils/cli.sample.chat`, (error, stdout) => {
+        cp.exec(`node ./bin/run chatdown --in "./test/utils/cli.sample.chat"`, (error, stdout) => {
             assert.doesNotThrow(() => JSON.parse(stdout));
             done();
         });
     });
 
     it('should process all files when a glob is passed in with the -i argument, and the -o is passed in for the output directory', done => {
-        cp.exec(`node ./bin/run chatdown -i ./test/utils/*.sample.chat -o ./`, (error, stdout, stderr) => {
+        cp.exec(`node ./bin/run chatdown -i "./test/utils/*.sample.chat" -o ./`, (error, stdout, stderr) => {
             assert(stdout.includes('Successfully wrote'));
             done();
         });
     });
 
     it('should process all files when a glob is passed in with the -i argument', done => {
-        cp.exec(`node ./bin/run chatdown -i ./test/utils/*.sample.chat`, (error, stdout, stderr) => {
+        cp.exec(`node ./bin/run chatdown -i "./test/utils/*.sample.chat"`, (error, stdout, stderr) => {
             assert(stdout.includes('Successfully wrote'));
             done();
         });
@@ -79,7 +79,7 @@ describe('chatdown', () => {
     });
 
     it('throw error if invalid path in argument', done => {
-        cp.exec(`node ./bin/run chatdown --in aaaaa`, (error, stdout, stderr) => {
+        cp.exec(`node ./bin/run chatdown --in 'aaaaa'`, (error, stdout, stderr) => {
             assert(stderr.includes('no such file or directory') || stderr.includes('error'));
             done();
         });