From f2fb2c481de76ff54d46bd239d370f489a972110 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Tue, 9 Jun 2020 16:48:23 +0300 Subject: [PATCH] cleanup... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/cli.js | 77 ++----------------------------------- ui (gen4)/package-lock.json | 40 ++++++++++++++----- ui (gen4)/package.json | 6 +-- 3 files changed, 36 insertions(+), 87 deletions(-) diff --git a/ui (gen4)/features/cli.js b/ui (gen4)/features/cli.js index 49bfcc32..ee2ef0bd 100755 --- a/ui (gen4)/features/cli.js +++ b/ui (gen4)/features/cli.js @@ -24,76 +24,6 @@ if(typeof(process) != 'undefined'){ -/*********************************************************************/ - -// setup logger... -// XXX STUB... -var logger = { - root: true, - message: null, - log: null, - ig: null, - - emit: function(e, v){ - var msg = this.message - var log = this.log = this.log || [] - - // XXX HACK... - var ig = this.ig - - // report progress... - // XXX HACK -- need meaningful status... - if(e == 'queued' - || e == 'found'){ - ig.showProgress(msg || ['Progress', e], '+0', '+1') - - } else if(e == 'loaded' || e == 'done' || e == 'written' - || e == 'index'){ - ig.showProgress(msg || ['Progress', e], '+1') - - } else if(e == 'skipping' || e == 'skipped'){ - // XXX if everything is skipped the indicator does not - // get hidden... - //ig.showProgress(msg || ['Progress', e], '+0', '-1') - ig.showProgress(msg || ['Progress', e], '+1') - - // XXX STUB... - } else if(e == 'error' ){ - ig.showProgress(['Error'].concat(msg), '+0', '+1') - console.log(msg ? - ' '+ msg.join(': ') + ':' - : '', ...arguments) - - } else { - // console... - console.log(msg ? - ' '+ msg.join(': ') + ':' - : '', ...arguments) - } - - // XXX - //log.push([msg, e, v]) - }, - - push: function(msg){ - if(msg == null){ - return this - } - - var logger = Object.create(this) - logger.root = false - logger.message = logger.message == null ? [msg] : logger.message.concat([msg]) - logger.log = this.log = this.log || [] - - return logger - }, - pop: function(){ - return !this.__proto__.root ? this.__proto__ : this - }, -} - - - /*********************************************************************/ // XXX what we need here is: // - base introspection @@ -199,6 +129,7 @@ var CLIActions = actions.Actions({ }) +// XXX move this to the argv parser used in object.js var CLI = module.CLI = core.ImageGridFeatures.Feature({ title: '', @@ -206,7 +137,8 @@ module.CLI = core.ImageGridFeatures.Feature({ tag: 'commandline', depends: [ - 'lifecycle' + 'lifecycle', + 'logger', ], // XXX should this be ONLY node??? @@ -225,9 +157,6 @@ module.CLI = core.ImageGridFeatures.Feature({ function(){ var that = this - this.logger = logger - logger.ig = that - // get the arguments... if(this.runtime.nw){ var argv = nw.App.argv diff --git a/ui (gen4)/package-lock.json b/ui (gen4)/package-lock.json index 39bed3ff..fd9ca9bf 100755 --- a/ui (gen4)/package-lock.json +++ b/ui (gen4)/package-lock.json @@ -966,9 +966,9 @@ } }, "ig-object": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.0.2.tgz", - "integrity": "sha512-fRfaR11KrUMd2/2glHOmqwHwbkx9K0zwyV7H8MYn5LvWtmCfHaBA7bzWiguuG0UCQEps15/a4jbZVIopknOq0g==" + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.0.8.tgz", + "integrity": "sha512-zGY4xyotQUSjKdu5dJzZM+VCTOYUzhz0MIq3H5YCTEwfph0Lf9OP1yPcVc3rEgXb3VZlWOPrO9CI7Eor/0sqZA==" }, "image-size": { "version": "0.5.5", @@ -1088,17 +1088,17 @@ } }, "less": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/less/-/less-3.11.1.tgz", - "integrity": "sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==", + "version": "3.11.3", + "resolved": "https://registry.npmjs.org/less/-/less-3.11.3.tgz", + "integrity": "sha512-VkZiTDdtNEzXA3LgjQiC3D7/ejleBPFVvq+aRI9mIj+Zhmif5TvFPM244bT4rzkvOCvJ9q4zAztok1M7Nygagw==", "dev": true, "requires": { "clone": "^2.1.2", "errno": "^0.1.1", "graceful-fs": "^4.1.2", "image-size": "~0.5.0", + "make-dir": "^2.1.0", "mime": "^1.4.1", - "mkdirp": "^0.5.0", "promise": "^7.1.1", "request": "^2.83.0", "source-map": "~0.6.0", @@ -1159,6 +1159,26 @@ "signal-exit": "^3.0.0" } }, + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "optional": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "dependencies": { + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "optional": true + } + } + }, "map-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", @@ -2277,9 +2297,9 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, "v8-compile-cache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", - "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz", + "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==" }, "validate-npm-package-license": { "version": "3.0.4", diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index ceff9306..4393441b 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -29,13 +29,13 @@ "guarantee-events": "^1.0.0", "ig-actions": "^3.24.11", "ig-features": "^3.4.2", - "ig-object": "^5.0.2", + "ig-object": "^5.0.8", "moment": "^2.26.0", "requirejs": "^2.3.6", "requirejs-plugins": "^1.0.2", "sharp": "^0.25.3", "strip-json-comments": "^2.0.1", - "v8-compile-cache": "^2.1.0", + "v8-compile-cache": "^2.1.1", "wildglob": "^0.1.1" }, "dependencies-disabled": { @@ -54,7 +54,7 @@ "devDependencies": { "asar": "^3.0.1", "electron-rebuild": "^1.11.0", - "less": "^3.11.1" + "less": "^3.11.3" }, "bin": { "ig": "ig.js"