[ISSUE#21]: refactor

Signed-off-by: ashish <[email protected]>

Signed-off-by: ashish <[email protected]>

Author: pateash

src/commands/crypto.ts

@@ -3,7 +3,7 @@ import * as CryptoJS from 'crypto-js'
 
 import Logger from '../utilities/logger'
 
-import Hash from './hash'
+import Utilities from '../utilities/utilities'
 
 export default class Crypto extends Command {
   static ENCRYPTION = 'encryption'
@@ -25,7 +25,7 @@ export default class Crypto extends Command {
   async run() {
     const {args, flags} = this.parse(Crypto)
 
-    args.string = Hash.getInputString(this, flags, args) //always add input to args
+    args.string = Utilities.getInputString(this, flags, args) //always add input to args
     args.type = flags.encryption ? flags.encryption : flags.decryption //type like AES,DES
 
     this.checkParameters(flags, args)

src/utilities/utilities.ts

@@ -27,4 +27,16 @@ export default class Utilities {
     }
   }
 
+  public static getInputString(thisRef: any , flags: any, args: any) { //need to make it static so Crypto can use this
+    // if -s or -f is not passed we will take it from args
+    if (flags.string) //if -s given
+      return flags.string
+    else if (flags.file) {
+      Logger.info(thisRef, `reading file: ${flags.file}`)
+      return Utilities.getStringFromFile(thisRef, flags.file)
+    } else
+      return args.string
+  }
+
+
 }