fixed not working cmd command for uploading and executing local scripts

Author: Maximilian Wehrstedt

src/cmd.ts

@@ -2,7 +2,8 @@ import * as os from 'os';
 import * as config from './config';
 import { SDSConnection } from 'node-sds';
 import * as sdsAccess from './sdsAccess';
-
+import * as fs from 'fs';
+import * as path from 'path';
 
 export let cmdvar = 0;
 
@@ -13,27 +14,43 @@ var program = require('commander');
 // set up sdsAccess
 
 
-async function uploadAndRunAll(loginData: config.LoginData, folder: string, prefix: string): Promise<sdsAccess.scriptT[]> {
+async function uploadAndRunAll(loginData: config.LoginData, files: sdsAccess.scriptT[]): Promise<sdsAccess.scriptT[]> {
     return new Promise<sdsAccess.scriptT[]>((resolve, reject) => {
-        let scripts: sdsAccess.scriptT[] = [];
-        sdsAccess.getScriptsFromFolder(folder).then((_upscripts) => {
-            return sdsAccess.sdsSession(loginData, _upscripts, sdsAccess.uploadAll).then(() => {
-                return sdsAccess.getScriptsFromFolder(folder, prefix).then((_runscripts) => {
-                    return sdsAccess.sdsSession(loginData, _runscripts, sdsAccess.runAll).then((retval) => {
-                        for(let i=0; i<retval.length; i++) {
-                            scripts.push(retval[i]);
-                            console.log("script " + i + ":" + os.EOL + retval[i].output);
-                        }
-                        resolve(scripts);
-                    });
-                });
+        return sdsAccess.sdsSession(loginData, files, sdsAccess.uploadAll).then(() => {
+            return sdsAccess.sdsSession(loginData, files, sdsAccess.runAll).then((retval) => {
+                let scripts: sdsAccess.scriptT[] = [];
+
+                for (let i = 0; i < retval.length; i++) {
+                    scripts.push(retval[i]);
+                    console.log("script " + i + ":" + os.EOL + retval[i].output);
+                }
+
+                resolve(scripts);
+            }).catch((reason) => {
+                reject(reason);
             });
         }).catch((reason) => {
-            reject();
+            reject(reason);
         });
     });
 }
 
+function readDirSync(dir: string, rec: boolean = true): string[] {
+    var results: string[] = [];
+    var list = fs.readdirSync(dir);
+
+    list.forEach(function (elem) {
+        elem = path.join(dir, elem);
+
+        if (fs.statSync(elem).isDirectory() && rec) {
+            results = results.concat(readDirSync(elem, rec));
+        } else {
+            results.push(elem);
+        }
+    });
+
+    return results;
+}
 
 // program
 //   .version('0.0.1')
@@ -44,22 +61,117 @@ async function uploadAndRunAll(loginData: config.LoginData, folder: string, pref
 program
     .version('0.0.1')
     .command('test <json> [dir...]')
-    .action(function (json: string, dir: string, filter: string) {
-        console.log('test json %s', json);
-        if (dir) {
-            console.log('test ' + dir[0]);
-            let loginData: config.LoginData = new config.LoginData();
-            // dir[1] == name-prefix
-            let params = [dir[0], dir[1]];
-            uploadAndRunAll(loginData, dir[0], dir[1]);
-            // dir.forEach(function (dir_i) {
-            //     console.log('test ' + dir_i);
-            // });
+    .action(function (json: string, dir: string[]) {
+        console.log("Note:\nIf you you use wildcards in the path to the dir to upload, set the path in quoatmarks.\n");
+        console.log('Params: ' + JSON.stringify({
+            configFile: json,
+            path: dir
+        }, null, "\t"));
+
+        // the commander module resolves wildcards (more or less)
+        // so we have to sourround paths with wildcards with quoatmarks to suppress this behaviour
+        let dirsToUpload: string[] = [];
+
+        if (dir.length < 1) {
+            throw new Error("Dir/file to run/upload missing");
+        } else if (dir.length > 1) {
+            throw new Error("Something went wrong. If you you use wildcards in the path to the dir to upload, set the path in quoatmarks.");
         } else {
-            console.log('test dir missing');
+            // we have only one element in the dir-array:
+            // [0] => path (with or without) wildcards to upload (can be a directory or a file)
+            let uploadPath = dir[0].split("\\").join("/");
+
+            // resolve wildcards in the upload path
+            let indexOf = uploadPath.indexOf("/**/");
+            let recursive = indexOf > -1;
+
+            if (recursive) {
+                uploadPath = uploadPath.replace("/**", "");
+            }
+
+            // if the path contains a wildcard, we have to make sure that wildcards can only be used at the end of a path
+            indexOf = uploadPath.lastIndexOf("/");
+            let wildcardIndex = uploadPath.indexOf("*");
+            let wildcard = "";
+            let wildcardReg: RegExp;
+
+            if (wildcardIndex > -1 && wildcardIndex < indexOf) {
+                throw new Error("Wildcards can only be used at the end of the path: " + wildcard);
+            } else {
+                wildcard = uploadPath.substr(indexOf + 1).split(".").join("\\.").split("*").join(".*");
+                uploadPath = uploadPath.substr(0, indexOf);
+
+                try {
+                    wildcardReg = new RegExp("^" + wildcard + "$");
+                } catch (err) {
+                    throw new Error("Invalid wildcard expression: " + wildcard);
+                }
+            }
+
+            let files = readDirSync(uploadPath, true);
+            let filesToUpload: sdsAccess.scriptT[] = [];
+
+            files.forEach(function (file) {
+                let parsedFile = path.parse(file);
+
+                if (wildcardReg.test(parsedFile.base)) {
+                    filesToUpload.push({
+                        name: parsedFile.name,
+                        path: file,
+                        sourceCode: fs.readFileSync(file).toString()
+                    });
+                }
+            });
+
+            if (filesToUpload.length < 0) {
+                console.log("No files to upload found.");
+            } else {
+                let loginData: config.LoginData = new config.LoginData();
+                loginData.loadConfigFile(json);
+                uploadAndRunAll(loginData, filesToUpload);
+            }
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        // if (dir.length > 0) {
+        //     let loginData: config.LoginData = new config.LoginData();
+        //     loginData.loadConfigFile(json)
+        //     let dirToUpload = dir[0];
+        //     let execPrefix = '';
+
+        //     // dirToUpload has to be a directory
+        //     if (fs.statSync(dirToUpload).isFile()) {
+        //         if (!path.isAbsolute(dirToUpload)) {
+        //             dirToUpload = path.join(process.cwd(), dirToUpload);
+        //         }
+
+        //         let parsedFile = path.parse(dirToUpload);
+        //         dirToUpload = parsedFile.dir;
+        //         execPrefix = parsedFile.base;
+        //     } else if (dir.length > 1) {
+        //         execPrefix = dir[1];
+        //     }
+
+        //     // upload and execute
+        //     console.log(`upload and execute scripts from dir '${dirToUpload}' with file prefix '${execPrefix}'`);
+        //     uploadAndRunAll(loginData, dirToUpload, execPrefix);
+        // } else {
+        //     console.log('Dir/file to run/upload missing');
+        // }
     });
- 
+
 program.parse(process.argv);
 
 // if (process.argv.length > 2) {