mainIndex.json update...

vMarkus · Sep 19, 2018 · 8d8b912 · 8d8b912
1 parent 88d8254
commit 8d8b912
Show file tree

Hide file tree

Showing 5 changed files with 15,402 additions and 14,600 deletions.
diff --git a/lib/get-file.js b/lib/get-file.js
@@ -13,6 +13,10 @@ module.exports = getFile;
 self.getFile = function(url, file) {
 	return new Promise(function(resolve, reject) {
 		// get totalBytes and build progress bar
+
+		// testing
+		//url = 'http://localhost/' + file;
+
 		let bar;
 		let label = 0;
 		let fileName;

diff --git a/getSolution.js → lib/get-solution.js b/getSolution.js → lib/get-solution.js
@@ -2,11 +2,9 @@
 var fs = require('fs');
 var FileCookieStore = require('tough-cookie-filestore');
 var rq = require('request');
-var request = require('request-promise');
 var Session = require('./utils.js').session;
-var myVmw = require('./getIndex.js');
+var myVmw = require('./get-index.js');
 const PQueue = require('p-queue');
-const got = require('got');
 const queue = new PQueue({concurrency: 16});
 const timer = console.time('timer');
 
@@ -25,6 +23,7 @@ let slugSession;
 let groupSession;
 let indexSession;
 let baseName;
+let request;
 
 var filesDir = __dirname;
 var stateDir = __dirname;
@@ -34,19 +33,20 @@ if(process.env.VMWFILESDIR) {
 if(process.env.VMWSTATEDIR) {
 	stateDir = process.env.VMWSTATEDIR;
 }
+
 let solutions = [
-	//'VMware vSphere',
+	'VMware vSphere',
 	//'VMware vSAN',
-	//'VMware vRealize Network Insight',
-	//'VMware NSX Cloud',
-	//'VMware NSX Data Center for vSphere',
-	//'VMware NSX-T Data Center',
-	//'VMware Pivotal Container Service',
-	//'VMware vSphere Integrated Containers',
-	//'VMware Integrated OpenStack',
-	'VMware Workspace ONE',
-	'VMware Workspace',
-	'VMware vSphere Hypervisor (ESXi)'
+	'VMware vRealize Network Insight',
+	'VMware NSX Cloud',
+	'VMware NSX Data Center for vSphere',
+	'VMware NSX-T Data Center',
+	'VMware Pivotal Container Service',
+	'VMware vSphere Integrated Containers',
+	'VMware Integrated OpenStack'
+	//'VMware Workspace ONE',
+	//'VMware Workspace',
+	//'VMware vSphere Hypervisor (ESXi)'
 ];
 main();
 
@@ -71,9 +71,8 @@ async function main() {
 		//solutions = buildSolutions();
 
 		// execute logic
-		let jar = rq.jar(new FileCookieStore(stateDir + '/cookies.json'));
-		request = request.defaults({
-			'jar': jar
+		request = rq.defaults({
+			'jar': rq.jar(new FileCookieStore(stateDir + '/cookies.json'))
 		});
 		startSol(solutions.pop());
 	} else {
@@ -148,7 +147,11 @@ function getPage(linkList, solutions)  {
 			let url = baseVmw + link;
 			console.log('FETCH: ' + url);
 			urlCache[link] = 1;
-			return request.get({url});
+			return new Promise(function(resolve, reject) {
+				request.get({url}, (err, resp, data) => {
+					resolve(data)
+				});
+			});
 		}).then((data) => {
 			// find all links, versions and groups
 			let versions = findVersions(link, data);

diff --git a/lib/vmw-api.js b/lib/vmw-api.js
@@ -62,7 +62,7 @@ self.loadFile = function() {
 		if(fs.existsSync(fileIndex)) {
 			let files = require(fileIndex);
 			self.loadMain().then((main) => {
-				console.log('Loading available solutions in [fileIndex.json] ...');
+				console.error('Loading available solutions in [fileIndex.json] ...');
 				for(let solName in main) {
 					let cache = {};
 					for(let solVer in main[solName]) {