From patchwork Sat Feb 24 14:00:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1903835 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=h+whoWOY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::140; helo=mail-lf1-x140.google.com; envelope-from=swupdate+bncbaabbipn46xamgqetvnf2qi@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lf1-x140.google.com (mail-lf1-x140.google.com [IPv6:2a00:1450:4864:20::140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ThpSk6g1mz23q6 for ; Sun, 25 Feb 2024 01:01:10 +1100 (AEDT) Received: by mail-lf1-x140.google.com with SMTP id 2adb3069b0e04-50e55470b49sf2775336e87.0 for ; Sat, 24 Feb 2024 06:01:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708783267; cv=pass; d=google.com; s=arc-20160816; b=GGCwwUeg0EBX4FUHT1G+kAyzt8AxJicZQp7w46ArSANkwIvGixaOqeiCnVCJGJE1CG lZDeCFxm1Yx0umQEo2Ndj5d54oJW2cj5F0DaIWxsaLYgf7t1K+fzek6PLoLYNb+uJmgx NtyrnW/lhadErK5qP8leu/fMsbuGvbM9Ubwd726PNE4XuaHYPU4QJtAvghknw+d/H6AO 5nVW3NszqGgVHYdGCxPfiddHBvGXBYcNA0USWO2Wn7tTONsNpAVH4Rx6TUB23O9D9K6t QOPG/Bcw8mUTUvPbo2X41tzFpj7PlCwVxpK22e+BcRjG0CGx4CL4XKw2bAwhb2udK+Fu ai2w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=3mi2G16TTDaI9oy1PruzZx4xCV9fNwqT0Ygayd3Ga/w=; fh=18OhZ5Dp9O5dio5xyzjyoBjvsKgmMIY8NBN+wQopz+U=; b=orpXup8tV1WCddocDUBx8AALbOEuNg/HiTRKZEE7F0mqatvm/tEeqGcqKjGIjT23Wa lMxxAYOdSG+yxrYEcR8qQxh1g0x+xctq0WokzOoprZ7x5k1pYr2HXH6MpWCAjQHOdkYt LfFy1Scd5062bB3qy+EAv6wwx9ASALWMAXipxLju/aosBxOVTi+X+2iNT8CMA4prEGPY vnZfL/0lknlUI+4u1KsiJwbg9/vVTE9Py/D6U2oJJOJpuz87MT3/D1yip6fw/f1q9TpN Ih9NgS2m4mwkb05i1VvmEsoss9aiZqu2gLusWdIaI9Uy0vl5pWuJnffbOqU7F/G/wFuU JuQA==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=temperror (no key for signature) header.i=@braunwarth.dev header.s=uberspace header.b=mqe9ttWL; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1708783267; x=1709388067; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=3mi2G16TTDaI9oy1PruzZx4xCV9fNwqT0Ygayd3Ga/w=; b=h+whoWOYQrWsjidLa69Sx0fo3nfMGIEzcizUds1hTJeewfFV3Z0taxraHOWzt0X5LH 73EgdPwqk3fEOy7Z0wfyhAwWnmDdYE4gUHtqSN89Ic/lH5P9Oe899UJeS82xAiMQzpbh VPZb/1Y2h40uY4ko3YgPW4vQNd20YPd5iiO/D4d7dJbPsQeVYlABReMC6GQnfzZ5/p5U jBQhwEApSD2Y+v78YoWLxy6AYAx/5z9ehGPEBMuVlnLPwdIXrumBvrDZj/VDO/uFQQM5 rKBDSdSOgMVpdVt4Clr4OtGfbQkTVTMqjCOoE2uobuU70lXdhoNeNs9pmjHDc1DomWlC uotA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708783267; x=1709388067; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=3mi2G16TTDaI9oy1PruzZx4xCV9fNwqT0Ygayd3Ga/w=; b=UDzC6GbMVgruv1kFyaNhGZeKfBE631AzVZ7BebXolBfOOrznhYLr9aIJJc9refNFmE 33P+barZDWLVIi5du+uVbU7GrhjmMbOp7aYaFXXv6eeDHXscagf6q0Q/bGGzRibH7AON XPQm3YUVlduUNkQZsxi+HMgefRYB4o4nooq9ZHvBC5DcWA8l3xf+3NVJz4bA7GStjkdv sdPhY0DLrpYXjaNuLo0UwWpYVzI3I60SDXGrRa4yOUHy4Q2Fvt2QKHV/+auo7K6VNfRb aDiWiG4gUErf7LkP/s+JBOr1lrfErKWpTcArbl/OfpzQOJzgBUn3a7JyQCYKvcfVd+Js wIyw== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXciEhtLA7gFkRHV/piM8ulUJafTG+yRKc3bnSVdS2bdl6lsIpUX05h6EkrK+C1jNg/vjCLa1s9ywsPm3GF+rq2+j/hUV66pikU+58icQ== X-Gm-Message-State: AOJu0YyM5g+UIM7MNxV1DJbE0rPgP2vLHeDfMJ8o5hd34mGXjJ/uFhfZ cEcyjUbbnJyeXtJQjHdPWTfHvWy3e5Smt79hWeiAaT2lEnQCdgZY X-Google-Smtp-Source: AGHT+IH3W3+r/dhQWLBoJ8AhUfA3oUiVjoCuxMYItbRtlc0YgMKbZxnNmNfA8tAiK7u1IejRAKL7Hw== X-Received: by 2002:ac2:4e06:0:b0:512:b041:d6cc with SMTP id e6-20020ac24e06000000b00512b041d6ccmr2052307lfr.29.1708783266477; Sat, 24 Feb 2024 06:01:06 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6512:4026:b0:512:cb07:f4c2 with SMTP id br38-20020a056512402600b00512cb07f4c2ls512736lfb.2.-pod-prod-06-eu; Sat, 24 Feb 2024 06:01:04 -0800 (PST) X-Received: by 2002:ac2:44c2:0:b0:512:f336:1bd6 with SMTP id d2-20020ac244c2000000b00512f3361bd6mr708766lfm.31.1708783264499; Sat, 24 Feb 2024 06:01:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708783264; cv=none; d=google.com; s=arc-20160816; b=mGzCm/5zq1PWaDSCCVseyEwUhf/GcyOExcXYnh7Ss7KREaqRtodUUrTWaVo+9sXD/J NlxlrIiKao/s/mJXSmzv1HaWXpH9SBrn86JdEQtBBt2qFK/a6r3afTrWgE0srgdiQDpb k2I5TDVSoXHGNMoTJT1FD62yOFlEWZEYzTS1KzwxLRSZiP95W5PK8ZouBcZbHjYbq3oc wlaUvyscnP++nZj+1QwZLUt6EYPa+mpfRYH9ktO872AIhT70vT96A9IO6uT5cFFeWJxV 2Lv2ekYJxkQdf/l7UrHPKYB3EM7c8KgHIUZpm8w8OPD2DirADwAVxK9g9L5piOS19OLE rscQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=dkim-signature:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=GRnb5zDjSTkXRdqcj06P+J8KdvXyTzvekrfs7/DPc74=; fh=BXlwH+1nWuAxJAQnM3fjgjZkXNBtIKsJ4sRu0kRLMwA=; b=jarXA63fh+m7YYBsi/WCgq7txc1n6KkX6Doa2WsgVCSz9ROKpys6g3d9higy+P1Up9 Hk2Zn1iEZkw17iPMJjMan6sTaA90aY58pxGQbxdq61yK2iKsMboNo5LAf2uufQy30ErL ytpjAg/hwUJS2T0DQlicXE2NVuZh2gEj1vnETARgBqdisZuiXQY1FEit6uEQZBeojBFJ Hg7Y+hKG1LIk/dru9MFv3/gs3V1JnmCUX7udfmAQtdpUm+nBfDG2/B+QjhSpn8lVM0DG F1AYgnLsflDIlA/LjfDfFla7iy6emz4ectQvCtkawjY1BelEx5AyKGbVOJxFPI+4xGg8 JcjQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=temperror (no key for signature) header.i=@braunwarth.dev header.s=uberspace header.b=mqe9ttWL; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id dx6-20020a0565122c0600b00512ed835a49si84232lfb.1.2024.02.24.06.01.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Feb 2024 06:01:04 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 21550 invoked by uid 989); 24 Feb 2024 14:01:03 -0000 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/3.0.1) with ESMTPSA; Sat, 24 Feb 2024 15:01:03 +0100 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: Daniel Braunwarth Subject: [swupdate] [PATCH 3/5] web-app: apply "standard" fixes Date: Sat, 24 Feb 2024 14:00:29 +0000 Message-ID: <20240224140031.9888-4-daniel@braunwarth.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240224140031.9888-1-daniel@braunwarth.dev> References: <20240224140031.9888-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: REPLY(-4) BAYES_HAM(-2.963416) MID_CONTAINS_FROM(1) MIME_GOOD(-0.1) R_MISSING_CHARSET(0.5) X-Rspamd-Score: -5.563416 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; dkim=temperror (no key for signature) header.i=@braunwarth.dev header.s=uberspace header.b=mqe9ttWL; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Daniel Braunwarth --- web-app/gulpfile.js | 34 +++++++++++++++++----------------- web-app/js/swupdate.js | 36 ++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/web-app/gulpfile.js b/web-app/gulpfile.js index d8c7380..a698e81 100755 --- a/web-app/gulpfile.js +++ b/web-app/gulpfile.js @@ -5,27 +5,27 @@ * SPDX-License-Identifier: MIT */ -var cleanCSS = require('gulp-clean-css') -var del = require('del') -var gulp = require('gulp') -var gzip = require('gulp-gzip') -var imagemin = require('gulp-imagemin') -var filter = require('gulp-filter') -var htmlmin = require('gulp-htmlmin') -var minify = require('gulp-minify') -var rename = require('gulp-rename') -var replace = require('gulp-replace') -var sass = require('gulp-sass')(require('sass')) -var tar = require('gulp-tar') -var useref = require('gulp-useref') -var minimist = require('minimist') +const cleanCSS = require('gulp-clean-css') +const del = require('del') +const gulp = require('gulp') +const gzip = require('gulp-gzip') +const imagemin = require('gulp-imagemin') +const filter = require('gulp-filter') +const htmlmin = require('gulp-htmlmin') +const minify = require('gulp-minify') +const rename = require('gulp-rename') +const replace = require('gulp-replace') +const sass = require('gulp-sass')(require('sass')) +const tar = require('gulp-tar') +const useref = require('gulp-useref') +const minimist = require('minimist') -var knownOptions = { +const knownOptions = { string: 'output', default: { output: 'swupdate-www' } } -var options = minimist(process.argv.slice(2), knownOptions) +const options = minimist(process.argv.slice(2), knownOptions) gulp.task('sass', async function () { return gulp.src('scss/*.scss') @@ -114,7 +114,7 @@ gulp.task('resize-images', async function () { }) gulp.task('package', function () { - var name = options.output.replace('.tar', '').replace('.gz', '') + const name = options.output.replace('.tar', '').replace('.gz', '') return gulp.src('dist/**') .pipe(tar(name + '.tar')) .pipe(gzip()) diff --git a/web-app/js/swupdate.js b/web-app/js/swupdate.js index 6661d0a..ae65a1e 100755 --- a/web-app/js/swupdate.js +++ b/web-app/js/swupdate.js @@ -14,9 +14,9 @@ const StatusEnum = { SUCCESS: 'SUCCESS', FAILURE: 'FAILURE', DONE: 'DONE' -}; +} -function isStatusInEnum(status){ +function isStatusInEnum (status) { return (status in StatusEnum) } @@ -45,7 +45,7 @@ function tryReload () { } function updateStatus (status) { - if(!isStatusInEnum(status)) return; + if (!isStatusInEnum(status)) return $('#swu-idle').hide() $('#swu-success').hide() $('#swu-failure').hide() @@ -74,11 +74,11 @@ function updateStatus (status) { } } -var updateProgressBarStatus = (function (status) { - var s = '' +const updateProgressBarStatus = (function (status) { + let s = '' return function (status) { - if(!isStatusInEnum(status)) return; + if (!isStatusInEnum(status)) return $('#swu-progress-bar') .removeClass('bg-danger bg-success progress-bar-animated') $('#swu-progress-spinner') @@ -127,13 +127,13 @@ Dropzone.options.dropzone = { } window.onload = function () { - var protocol + let protocol $('#swu-restart').click(restart) if (window.location.protocol === 'https:') { protocol = 'wss:' } else { protocol = 'ws:' } - var ws = new WebSocket(protocol + '//' + window.location.host + window.location.pathname.replace(/\/[^/]*$/, '') + '/ws') + const ws = new WebSocket(protocol + '//' + window.location.host + window.location.pathname.replace(/\/[^/]*$/, '') + '/ws') ws.onopen = function (event) { updateStatus(StatusEnum.IDLE) @@ -144,28 +144,32 @@ window.onload = function () { } ws.onmessage = function (event) { - var msg = JSON.parse(event.data) + const msg = JSON.parse(event.data) switch (msg.type) { - case 'message': - var p = $('

') + case 'message': { + const p = $('

') p.text(msg.text) p.addClass('mb-1') if (msg.level <= 3) { p.addClass('text-danger') } $('#messages').append(p) break - case 'status': + } + case 'status': { updateStatus(msg.status) updateProgressBarStatus(msg.status) break - case 'source': + } + case 'source': { break - case 'step': - var percent = Math.round((100 * (Number(msg.step) - 1) + Number(msg.percent)) / Number(msg.number)) - var value = percent + '%' + ' (' + msg.step + ' of ' + msg.number + ')' + } + case 'step': { + const percent = Math.round((100 * (Number(msg.step) - 1) + Number(msg.percent)) / Number(msg.number)) + const value = percent + '%' + ' (' + msg.step + ' of ' + msg.number + ')' updateProgressBar(percent, msg.name, value) break + } } } }