frodovdr/raspberrymatic-addon-rmupdate
1
0
Fork 0
mirror of https://github.com/j-a-n/raspberrymatic-addon-rmupdate.git synced 2023-10-10 11:37:40 +00:00
Code Issues Releases Wiki Activity

Check latest supported firmware version

Browse Source
This commit is contained in:
Jan Schneider
2018-03-18 16:54:55 +01:00
parent f8005e3b75
commit 6ef8c2359a
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
addon/lib/rmupdate.tcl
View File

@@ -17,6 +17,7 @@
#
namespace eval rmupdate {
variable support_file_url "https://github.com/j-a-n/raspberrymatic-addon-rmupdate/raw/master/support.json"
variable release_url "https://github.com/jens-maus/RaspberryMatic/releases"
variable addon_dir "/usr/local/addons/rmupdate"
variable rc_dir "/usr/local/etc/config/rc.d"
@@ -958,8 +959,8 @@ proc ::rmupdate::get_current_firmware_version {} {
proc ::rmupdate::get_available_firmware_downloads {} {
variable release_url
set rpi_version [get_rpi_version]
set download_urls [list]
set rpi_version [get_rpi_version]
set data [exec /usr/bin/wget "${release_url}" --no-check-certificate -q -O-]
foreach d [split $data ">"] {
set href ""
@@ -1059,6 +1060,14 @@ proc ::rmupdate::get_version_from_filename {filename} {
proc ::rmupdate::get_firmware_info {} {
variable release_url
variable support_file_url
set data [exec /usr/bin/wget "${support_file_url}" --no-check-certificate -q -O-]
if { ! [regexp {\"latest_supported_version\"\s*:\s*\"([^\"]+)\"} $data match latest_supported_version] } {
write_log 1 "Failed to get latest supported version from ${support_file_url}"
return "\[\]"
}
set current [get_current_firmware_version]
set versions [list $current]
foreach e [get_available_firmware_downloads] {
@@ -1084,12 +1093,16 @@ proc ::rmupdate::get_firmware_info {} {
if {$v == $current} {
set installed "true"
}
set supported "false"
if {[compare_versions $latest_supported_version $v] >= 0} {
set supported "true"
}
set image ""
catch { set image $images($v) }
set url ""
catch { set url $downloads($v) }
set info_url "${release_url}/tag/${v}"
append json "\{\"version\":\"${v}\",\"installed\":${installed},\"latest\":${latest}\,\"url\":\"${url}\"\,\"info_url\":\"${info_url}\",\"image\":\"${image}\"\},"
append json "\{\"version\":\"${v}\",\"installed\":${installed},\"latest\":${latest},\"supported\":${supported},\"url\":\"${url}\",\"info_url\":\"${info_url}\",\"image\":\"${image}\"\},"
set latest "false"
}
if {[llength versions] > 0} {

15
addon/www/index.html
View File

@@ -245,13 +245,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
$('#dimmer-firmware-info').addClass('active');
rest("GET", "/get_firmware_info", null, function(data) {
$('#firmware-info tbody').empty();
var latest_firmware_supported = false;
data.forEach(function(fw) {
if (fw.latest) latest_firmware = fw.version;
if (fw.latest) {
latest_firmware = fw.version;
latest_firmware_supported = fw.supported;
}
if (fw.installed) current_firmware = fw.version;
var color = 'yellow';
if (fw.latest) color = 'green';
if (fw.installed) color = 'gray';
var disabled = (fw.image || fw.url ? '' : 'disabled');
var disabled = ((fw.image || fw.url) && fw.supported ? '' : 'disabled');
var binstall = $('<div class="ui '+ color +' basic '+ disabled +' button">').attr('data-install-firmware-version', fw.version).append($('<i class="sign in icon">'), i18next.t('install'));
binstall.click(function() {
install_firmware(this.getAttribute('data-install-firmware-version'));
@@ -265,6 +269,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
});
var available = (fw.url ? 'checked=""' : '')
var supported = (fw.supported ? 'checked=""' : '')
var downloaded = (fw.image ? 'checked=""' : '')
var cls = '';
if (fw.installed) cls = ' class="warning"';
@@ -272,6 +277,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
$("#firmware-info tbody").append($('<tr' + cls + '>').append(
$('<td>').append($('<a>', {text: fw.version, title: i18next.t('open_release_info'), href: fw.info_url, target: "_blank"})),
$('<td class="center aligned">').append($('<div class="ui disabled checkbox">').append($('<input type="checkbox" disabled="disabled" '+available+'>'),$('<label></label>'))),
$('<td class="center aligned">').append($('<div class="ui disabled checkbox">').append($('<input type="checkbox" disabled="disabled" '+supported+'>'),$('<label></label>'))),
$('<td class="center aligned">').append($('<div class="ui disabled checkbox">').append($('<input type="checkbox" disabled="disabled" '+downloaded+'>'),$('<label></label>'))),
$('<td class="center aligned">').append(bdelete, binstall)
));
@@ -285,7 +291,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
$('<div class="ui item">').html(i18next.t('current_installed_version') + ': <span style="color:'+ color +'">' + current_firmware + '</span>'),
$('<div class="ui item">').html(i18next.t('latest_available_version') + ': ' + latest_firmware)
);
if (current_firmware != latest_firmware) {
if (latest_firmware_supported && current_firmware != latest_firmware) {
$("#firmware-summary").append(
$('<div id="install-latest-firmware-button" class="ui green basic button" style="margin-top:20px; margin-bottom:20px;">').click(install_latest_firmware).append($('<i class="sign in icon">'), i18next.t('install_latest_firmware'))
);
@@ -670,6 +676,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
loading: 'Loading',
version: 'Version',
available: 'Available',
supported: 'Supported',
downloaded: 'Downloaded',
action: 'Action',
delete_download: 'Delete download',
@@ -748,6 +755,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
loading: 'Lade',
version: 'Version',
available: 'Verfügbar',
supported: 'Unterstützt',
downloaded: 'Heruntergeladen',
action: 'Aktion',
delete_download: 'Download löschen',
@@ -911,6 +919,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tr>
<th data-i18n="version"></th>
<th class="center aligned" data-i18n="available"></th>
<th class="center aligned" data-i18n="supported"></th>
<th class="center aligned" data-i18n="downloaded"></th>
<th class="center aligned" data-i18n="action"></th>
</tr>