From 7464f9b4e9140030603067b14df5c93817e174b8 Mon Sep 17 00:00:00 2001
From: "karl.hudgell" <karl.hudgell@bjss.com>
Date: Sat, 25 Apr 2020 21:28:13 +0100
Subject: [PATCH] still not fixed

---
 lib/adb.js        | 18 ++++++++++++++++
 lib/files.js      | 55 ++++++++++++++++++++++++++++++++---------------
 package-lock.json | 10 +++++++++
 package.json      |  2 ++
 pages/pages.js    |  8 +++++--
 5 files changed, 74 insertions(+), 19 deletions(-)
 create mode 100644 lib/adb.js

diff --git a/lib/adb.js b/lib/adb.js
new file mode 100644
index 0000000..bb52f78
--- /dev/null
+++ b/lib/adb.js
@@ -0,0 +1,18 @@
+const gfin = require('get-files-in')
+const shellExec = require('shell-exec')
+
+module.exports = {
+  getListOfAPk: () => {
+   this.apkListToInstall = gfin('./data/apps', matchFiletypes = ["apk"], checkSubDirectories = false)
+  },
+  installApk: async () => {
+    await module.exports.getListOfAPk()
+    for (let element of this.apkListToInstall) {
+      await shellExec('adb install -r ' + element).then(function (result) {
+        console.log('Installing ' + element + ' - ' + result.stdout);
+      });
+    }
+    // console.log(chalk.green('Removal Complete'))
+  },
+
+};
\ No newline at end of file
diff --git a/lib/files.js b/lib/files.js
index cf304ef..f0c23d8 100644
--- a/lib/files.js
+++ b/lib/files.js
@@ -1,6 +1,10 @@
 const fs = require('fs');
 const path = require('path');
-const dl = require('download-file-with-progressbar');
+// const dl = require('download-file-with-progressbar');
+const {
+  DownloaderHelper
+} = require('node-downloader-helper');
+
 
 module.exports = {
   getCurrentDirectoryBase: () => {
@@ -28,19 +32,36 @@ module.exports = {
       console.log(err)
     }
   },
-  downloadFile: async (element) => {
-    option = {
-      dir: './data/apps',
-      onDone: (info)=>{
-          console.log('Latest ' + element.name + ' Downloaded')
-      },
-      onError: (err) => {
-          console.log('error', err);
-      },
-      onProgress: (curr, total) => {
-      },
-  }
-  
-  var dd = dl(element.url, option);
-  }
-};
\ No newline at end of file
+  downloadFile: (element) => {
+    //     option = {
+    //       dir: './data/apps',
+    //       onDone: (info) => {
+    //         console.log('Latest ' + element.name + ' Downloaded')
+    //       },
+    //       onError: (err) => {
+    //         console.log('error', err);
+    //       },
+    //       onProgress: (curr, total) => {},
+    //     }
+    //     dl(element.url, option);
+    // }
+    // const options = {
+    //   override: true,
+    // }
+    // const dl = new DownloaderHelper(element.url, './data/apps', options);
+
+    // dl.on('end', () => console.log('Download Completed'))
+
+    // dl.start();
+    var promise = new Promise(function (resolve, reject) {
+      setTimeout(function () {
+        resolve('hello world');
+      }, 2000);
+    });
+
+    promise.then(function (data) {
+      console.log(data);
+    });
+
+  },
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index b9dedf6..86c6bbb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -547,6 +547,11 @@
         "universalify": "^0.1.0"
       }
     },
+    "get-files-in": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-files-in/-/get-files-in-1.2.0.tgz",
+      "integrity": "sha512-bufY50S4KnOmEVG9yeioI1QTBAIb1B3c6Ks+1ysu0zScfrld8dmhdGB7Fw/rQSTE6ryVrra+AkznvgiR3H4zRA=="
+    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -857,6 +862,11 @@
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
     },
+    "node-downloader-helper": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.12.tgz",
+      "integrity": "sha512-2t3h3g3xK5kxhRbwD+0WgKotHyoVEQlE+V93rn97tqzUtbw8cFpHn0uhsc2LeKkDlsQI1iy5XZoS3vACzBdW8A=="
+    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
diff --git a/package.json b/package.json
index cb5cb1f..c055056 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,11 @@
     "figlet": "^1.3.0",
     "foreachasync": "^5.1.3",
     "fs": "0.0.1-security",
+    "get-files-in": "^1.2.0",
     "inquirer": "^7.1.0",
     "lodash": "^4.17.15",
     "minimist": "^1.2.5",
+    "node-downloader-helper": "^1.0.12",
     "path": "^0.12.7",
     "path-exists": "^4.0.0",
     "pkg": "^4.4.7",
diff --git a/pages/pages.js b/pages/pages.js
index 7d4a496..1076bc9 100644
--- a/pages/pages.js
+++ b/pages/pages.js
@@ -4,19 +4,23 @@ const inquirer = require('../lib/inquirer');
 const shellExec = require('shell-exec')
 const files = require('../lib/files')
 const fs = require('fs')
-
+const adb = require('../lib/adb')
 module.exports = {
     compatibleApps: async () => {
         common.header('Install Compatible Apps')
         const compatibleApps = JSON.parse(fs.readFileSync('./data/compatibleApps.json', 'utf8'));
         const value = await inquirer.compatibleApps();
+
         for (let element of value.removeAppsList) {
             for (let element2 of compatibleApps) {
                 if (element === element2.name) {
-                   await files.downloadFile(element2)
+                    files.downloadFile(element2)
                 }
             }
+            // console.log(element)
         }
+        // await adb.installApk()
+        console.log('finished')
     },
     removeApps: async () => {
         common.header('Remove Apps')