From e14ff52d450fe3c78e22b325eaacfeda4dfa1d28 Mon Sep 17 00:00:00 2001 From: John Sohn Date: Fri, 7 May 2021 21:38:10 -0400 Subject: [PATCH] Updated 3rd party request script to get rid of issues with download added comparator tool housed in private git. --- index.js | 3 ++ node_modules/request/request.js | 17 +++++++++- pcbs.js | 60 +++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 pcbs.js diff --git a/index.js b/index.js index e44d941..24fb8f1 100644 --- a/index.js +++ b/index.js @@ -358,6 +358,9 @@ async function startJob(destfilename, storeitem, authToken) { console.log(err); }); + + + var pipe = request.get(url + '=d' + storeitem.voption); pipe.on('error', function(err) { diff --git a/node_modules/request/request.js b/node_modules/request/request.js index 198b760..76459e8 100644 --- a/node_modules/request/request.js +++ b/node_modules/request/request.js @@ -40,6 +40,7 @@ var globalCookieJar = cookies.jar() var globalPool = {} + function filterForNonReserved (reserved, options) { // Filter out properties that are not reserved. // Reserved values are passed in at call site. @@ -706,6 +707,8 @@ Request.prototype.getNewAgent = function () { } Request.prototype.start = function () { + + console.log('Called start()'); // start() is called once we are ready to send the outgoing HTTP request. // this is usually called on the first write(), end() or on nextTick() var self = this @@ -878,6 +881,9 @@ Request.prototype.onRequestError = function (error) { } Request.prototype.onRequestResponse = function (response) { + + console.log("In OnRequestResponse"); + var self = this if (self.timing) { @@ -885,6 +891,7 @@ Request.prototype.onRequestResponse = function (response) { } debug('onRequestResponse', self.uri.href, response.statusCode, response.headers) + response.on('end', function () { if (self.timing) { self.timings.end = now() - self.startTimeNow @@ -1096,6 +1103,9 @@ Request.prototype.onRequestResponse = function (response) { } Request.prototype.readResponseBody = function (response) { + + console.log("reached read response."); + var self = this debug("reading response's body") var buffers = [] @@ -1124,7 +1134,9 @@ Request.prototype.readResponseBody = function (response) { if (bufferLength) { debug('has body', self.uri.href, bufferLength) response.body = Buffer.concat(buffers, bufferLength) - if (self.encoding !== null) { + if (self.encoding !== null && !self.piped) { + console.log("trouble point hit for uri: "+self.href); + console.log('method: '+self.method); response.body = response.body.toString(self.encoding) } // `buffer` is defined in the parent scope and used in a closure it exists for the life of the Request. @@ -1465,6 +1477,9 @@ Request.prototype.jar = function (jar) { // Stream API Request.prototype.pipe = function (dest, opts) { + console.log('Pipe Called.') + this.piped = true; + var self = this if (self.response) { diff --git a/pcbs.js b/pcbs.js new file mode 100644 index 0000000..7f1aee3 --- /dev/null +++ b/pcbs.js @@ -0,0 +1,60 @@ + +const fs = require('fs'); + +var count =0 + + +function recursepath(path) { + var files = []; + + var dir = fs.readdirSync(path, { withFileTypes: true }); + + for (var i in dir) { + + var name = dir[i].name.toString(); + + if (dir[i].isFile() && name!=".gitignore'") { + files.push(path + '\\' + dir[i].name.toString()); + } + else { + if (name!=".git" && name !='bin' && name !='obj' && name!="node_modules" ) + { + files = files.concat(recursepath(path + '\\' + dir[i].name)); + } + } + } + + return files; +} + +var txt = fs.readFileSync("m.txt").toString(); + +var words = txt.split(/\s/); + +var files = recursepath("C:\\Users\\John\\Documents\\CensusProject\\QrCode"); +var pcfiles = []; +var oldfiles =[]; +for (var i in files) +{ + pcfiles.push ('git mv \"'+files[i]+'\" \"'+files[i]+'bs\"'); + oldfiles.push ('git mv \"'+files[i]+'bs\" \"'+files[i]+'\"'); + +} + +var s=""; + +for (var p in pcfiles) +{ + s+=pcfiles[p]+"\n"; +} + +fs.writeFileSync('remscript.txt',s); + + s=""; + +for (var o in oldfiles) +{ + s+=oldfiles[o]+"\n"; +} + +fs.writeFileSync('oldscript.txt',s); \ No newline at end of file