From 88d0ad7d67a1719c6e83a9ec2a7f04a16181ad32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Mon, 23 Jul 2018 15:39:34 +0200 Subject: [PATCH] Fix codacy issues in build.js --- code/gulpfile.js | 164 ++++++++++++++++++++++------------------------- 1 file changed, 77 insertions(+), 87 deletions(-) diff --git a/code/gulpfile.js b/code/gulpfile.js index 0f4bceaf..61e5c216 100644 --- a/code/gulpfile.js +++ b/code/gulpfile.js @@ -19,35 +19,39 @@ along with this program. If not, see . */ -/*eslint quotes: ["error", "single"]*/ +/*eslint quotes: ['error', 'single']*/ /*eslint-env es6*/ // ----------------------------------------------------------------------------- // Dependencies // ----------------------------------------------------------------------------- -const fs = require('fs'); const gulp = require('gulp'); +const runSequence = require('run-sequence'); +const through = require('through2'); + const htmlmin = require('gulp-htmlmin'); const uglify = require('gulp-uglify'); -const gzip = require('gulp-gzip'); const inline = require('gulp-inline'); const inlineImages = require('gulp-css-base64'); const favicon = require('gulp-base64-favicon'); +const crass = require('gulp-crass'); + const htmllint = require('gulp-htmllint'); const csslint = require('gulp-csslint'); -const crass = require('gulp-crass'); + +const rename = require('gulp-rename'); const replace = require('gulp-replace'); const remover = require('gulp-remove-code'); -const map = require('map-stream'); -const rename = require('gulp-rename'); -const runSequence = require('run-sequence'); +const gzip = require('gulp-gzip'); const path = require('path'); // ----------------------------------------------------------------------------- // Configuration // ----------------------------------------------------------------------------- +const htmlFolder = 'html/'; +const configFolder = 'espurna/config/'; const dataFolder = 'espurna/data/'; const staticFolder = 'espurna/static/'; @@ -55,51 +59,39 @@ const staticFolder = 'espurna/static/'; // Methods // ----------------------------------------------------------------------------- -var buildHeaderFile = function() { - - String.prototype.replaceAll = function(search, replacement) { - var target = this; - return target.split(search).join(replacement); - }; +var toHeader = function(name, debug) { - return map(function(file, cb) { + return through.obj(function (source, encoding, callback) { - var parts = file.path.split(path.sep); + var parts = source.path.split(path.sep); var filename = parts[parts.length - 1]; - var destination = staticFolder + filename + ".h"; - var safename = "webui_image"; - - var wstream = fs.createWriteStream(destination); - wstream.on('error', function (err) { - console.error(err); - }); - - var data = fs.readFileSync(file.path); - - wstream.write('#define ' + safename + '_len ' + data.length + '\n'); - wstream.write('const uint8_t ' + safename + '[] PROGMEM = {'); - - for (var i=0; i 0) output += ','; + if (0 === (i % 20)) output += '\n'; + output += '0x' + ('00' + source.contents[i].toString(16)).slice(-2); } + output += '\n};'; - wstream.write('\n};'); - wstream.end(); + // clone the contents + var destination = source.clone(); + destination.path = source.path + '.h'; + destination.contents = Buffer.from(output); - var fstat = fs.statSync(file.path); - console.log("Created '" + filename + "' size: " + fstat.size + " bytes"); + if (debug) { + console.info('Image ' + filename + ' \tsize: ' + source.contents.length + ' bytes'); + } - cb(0, destination); + callback(null, destination); }); -} +}; var htmllintReporter = function(filepath, issues) { if (issues.length > 0) { @@ -119,17 +111,17 @@ var htmllintReporter = function(filepath, issues) { var buildWebUI = function(module) { - var modules = {"light": false, "sensor": false, "rfbridge": false, "rfm69": false}; - if ("all" == module) { - modules["light"] = true; - modules["sensor"] = true; - modules["rfbridge"] = false; // we will never be adding this except when building RFBRIDGE - modules["rfm69"] = false; // we will never be adding this except when building RFM69GW - } else if ("small" != module) { + var modules = {'light': false, 'sensor': false, 'rfbridge': false, 'rfm69': false}; + if ('all' === module) { + modules['light'] = true; + modules['sensor'] = true; + modules['rfbridge'] = false; // we will never be adding this except when building RFBRIDGE + modules['rfm69'] = false; // we will never be adding this except when building RFM69GW + } else if ('small' !== module) { modules[module] = true; } - return gulp.src('html/*.html'). + return gulp.src(htmlFolder + '*.html'). pipe(htmllint({ 'failOnError': true, 'rules': { @@ -139,7 +131,7 @@ var buildWebUI = function(module) { }, htmllintReporter)). pipe(favicon()). pipe(inline({ - base: 'html/', + base: htmlFolder, js: [], css: [crass, inlineImages], disabledTypes: ['svg', 'img'] @@ -153,8 +145,10 @@ var buildWebUI = function(module) { })). pipe(replace('pure-', 'p-')). pipe(gzip()). - pipe(rename("index." + module + ".html.gz")). - pipe(gulp.dest(dataFolder)); + pipe(rename('index.' + module + '.html.gz')). + pipe(gulp.dest(dataFolder)). + pipe(toHeader('webui_image', true)). + pipe(gulp.dest(staticFolder)); }; @@ -162,55 +156,51 @@ var buildWebUI = function(module) { // Tasks // ----------------------------------------------------------------------------- -gulp.task('build_certs', function() { +gulp.task('certs', function() { gulp.src(dataFolder + 'server.*'). - pipe(buildHeaderFile()); + pipe(toHeader(debug=false)). + pipe(gulp.dest(staticFolder)); }); gulp.task('csslint', function() { - gulp.src('html/*.css'). + gulp.src(htmlFolder + '*.css'). pipe(csslint({ids: false})). pipe(csslint.formatter()); }); -gulp.task('build_webui_small', function() { - return buildWebUI("small"); -}) +gulp.task('webui_small', function() { + return buildWebUI('small'); +}); -gulp.task('build_webui_sensor', function() { - return buildWebUI("sensor"); -}) +gulp.task('webui_sensor', function() { + return buildWebUI('sensor'); +}); -gulp.task('build_webui_light', function() { - return buildWebUI("light"); -}) +gulp.task('webui_light', function() { + return buildWebUI('light'); +}); -gulp.task('build_webui_rfbridge', function() { - return buildWebUI("rfbridge"); -}) +gulp.task('webui_rfbridge', function() { + return buildWebUI('rfbridge'); +}); -gulp.task('build_webui_rfm69', function() { - return buildWebUI("rfm69"); -}) +gulp.task('webui_rfm69', function() { + return buildWebUI('rfm69'); +}); -gulp.task('build_webui_all', function() { - return buildWebUI("all"); -}) +gulp.task('webui_all', function() { + return buildWebUI('all'); +}); -gulp.task('buildfs_inline', function(cb) { +gulp.task('webui', function(cb) { runSequence([ - 'build_webui_small', - 'build_webui_sensor', - 'build_webui_light', - 'build_webui_rfbridge', - 'build_webui_rfm69', - 'build_webui_all' + 'webui_small', + 'webui_sensor', + 'webui_light', + 'webui_rfbridge', + 'webui_rfm69', + 'webui_all' ], cb); }); -gulp.task('buildfs_embeded', ['buildfs_inline'], function() { - gulp.src(dataFolder + 'index.*'). - pipe(buildHeaderFile()); -}); - -gulp.task('default', ['buildfs_embeded']); +gulp.task('default', ['webui']);