From 76cf6533d0f9e743821cc06a2bd36ccfb6b78051 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Tue, 19 Feb 2019 19:12:18 +0100 Subject: [PATCH] luci-app-attendedsysupgrade: update to new api there was a major rewrite of the database structure Signed-off-by: Paul Spooren --- .../resources/attendedsysupgrade.js | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js index b5828a50f..e23414f70 100644 --- a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js +++ b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js @@ -47,8 +47,7 @@ function edit_packages() { // requests to the upgrade server function server_request(request_dict, path, callback) { request_dict.distro = data.release.distribution; - request_dict.target = data.release.target.split("\/")[0]; - request_dict.subtarget = data.release.target.split("\/")[1]; + request_dict.target = data.release.target; var request = new XMLHttpRequest(); request.open("POST", data.url + "/" + path, true); request.setRequestHeader("Content-type", "application/json"); @@ -212,12 +211,10 @@ function upgrade_request() { function upgrade_request_callback(request) { // ready to download var request_json = JSON.parse(request); - data.sysupgrade_url = request_json.sysupgrade; + data.files = request_json.files; + data.sysupgrade = request_json.sysupgrade; - var filename_split = data.sysupgrade_url.split("/") - var filename = filename_split[filename_split.length - 1] - - var info_output = 'Firmware created: ' + filename + '' + var info_output = 'Firmware created: ' + data.sysupgrade+ '' info_output += ' Build log' set_status("info", info_output); @@ -245,7 +242,7 @@ function ping_ubus() { var request = new XMLHttpRequest(); request.open("GET", ubus_url, true); request.addEventListener('error', function(event) { - set_status("warning", "Rebooting device", true); + set_status("warning", "Rebooting device - please wait!", true); setTimeout(ping_ubus, 5000) }); request.addEventListener('load', function(event) { @@ -263,6 +260,7 @@ function ping_ubus() { function upload_image(blob) { // Uploads received blob data to the server using cgi-io + set_status("info", "Uploading firmware to device", true); var request = new XMLHttpRequest(); var form_data = new FormData(); @@ -277,7 +275,7 @@ function upload_image(blob) { }); request.addEventListener('error', function(event) { - set_status("info", "Upload of firmware failed, please retry by reloading web interface") + set_status("danger", "Upload of firmware failed, please retry by reloading web interface") }); request.open('POST', origin + '/cgi-bin/cgi-upload'); @@ -290,7 +288,7 @@ function download_image() { hide("#keep_container"); hide("#upgrade_button"); var download_request = new XMLHttpRequest(); - download_request.open("GET", data.sysupgrade_url); + download_request.open("GET", data.url + data.files + data.sysupgrade); download_request.responseType = "arraybuffer"; download_request.onload = function () { @@ -299,15 +297,14 @@ function download_image() { upload_image(blob) } }; - set_status("info", "Downloading firmware", true); + set_status("info", "Downloading firmware to web browser memory", true); download_request.send(); } function server_request(request_dict, path, callback) { var request_json; request_dict.distro = data.release.distribution; - request_dict.target = data.release.target.split("\/")[0]; - request_dict.subtarget = data.release.target.split("\/")[1]; + request_dict.target = data.release.target; var request = new XMLHttpRequest(); request.open("POST", data.url + "/" + path, true); request.setRequestHeader("Content-type", "application/json"); -- 2.25.1