From a9bfef7c2717b7920af0fc1e65397bb9be43a2b6 Mon Sep 17 00:00:00 2001
From: "karl.hudgell" <karl.hudgell@bjss.com>
Date: Sat, 25 Apr 2020 23:07:43 +0100
Subject: [PATCH] finally a working download order
---
lib/files.js | 40 +++-------------------------------------
package-lock.json | 8 ++++++++
package.json | 1 +
pages/pages.js | 14 +++++++++++---
4 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/lib/files.js b/lib/files.js
index f0c23d8..8834bce 100644
--- a/lib/files.js
+++ b/lib/files.js
@@ -1,9 +1,7 @@
const fs = require('fs');
const path = require('path');
-// const dl = require('download-file-with-progressbar');
-const {
- DownloaderHelper
-} = require('node-downloader-helper');
+const dl = require('download-file-with-progressbar');
+var download = require('download-file')
module.exports = {
@@ -31,37 +29,5 @@ module.exports = {
} catch (err) {
console.log(err)
}
- },
- 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 86c6bbb..ab7e523 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -248,6 +248,14 @@
"path-type": "^4.0.0"
}
},
+ "download-file": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/download-file/-/download-file-0.1.5.tgz",
+ "integrity": "sha1-ylC6ZNkJSwyHAu+f/5LSGJ4UERc=",
+ "requires": {
+ "mkdirp": "^0.5.0"
+ }
+ },
"download-file-with-progressbar": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/download-file-with-progressbar/-/download-file-with-progressbar-1.2.3.tgz",
diff --git a/package.json b/package.json
index c055056..6057b83 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
"chalk": "^4.0.0",
"clear": "^0.1.0",
"clui": "^0.3.6",
+ "download-file": "^0.1.5",
"download-file-with-progressbar": "^1.2.3",
"figlet": "^1.3.0",
"foreachasync": "^5.1.3",
diff --git a/pages/pages.js b/pages/pages.js
index 1076bc9..160d62b 100644
--- a/pages/pages.js
+++ b/pages/pages.js
@@ -5,6 +5,11 @@ const shellExec = require('shell-exec')
const files = require('../lib/files')
const fs = require('fs')
const adb = require('../lib/adb')
+const {
+ DownloaderHelper
+} = require('node-downloader-helper');
+
+
module.exports = {
compatibleApps: async () => {
common.header('Install Compatible Apps')
@@ -14,12 +19,15 @@ module.exports = {
for (let element of value.removeAppsList) {
for (let element2 of compatibleApps) {
if (element === element2.name) {
- files.downloadFile(element2)
+ const options = {
+ override: true,
+ }
+ const dl = new DownloaderHelper(element2.url, './data/apps/', options);
+ dl.on('end', () => console.log('Downloading Latest ' + element2.name + ' Complete'))
+ await dl.start();
}
}
- // console.log(element)
}
- // await adb.installApk()
console.log('finished')
},
removeApps: async () => {