Skip to content

Commit

Permalink
Merge pull request #51 from yoan-m/patch-1
Browse files Browse the repository at this point in the history
Avoid multi z2m version messages
  • Loading branch information
zoic21 authored Jan 6, 2025
2 parents b3feb1b + 42b7d16 commit 0212e68
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions core/class/z2m.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,17 @@ public static function cronDaily() {
if ($package['version'] !='') {
$releaseVersion = file_get_contents('https://raw.githubusercontent.com/Koenkk/zigbee2mqtt/master/package.json');
if ($releaseVersion !== false) {
$releaseVersion = json_decode($releaseVersion, true);
if (is_array($releaseVersion) && json_last_error() == '' && isset($releaseVersion['version']) && $package['version'] !== $releaseVersion['version']) {
log::add('z2m', 'info', 'Nouvelle version de Zigbee2MQTT disponible : '.$releaseVersion['version'].' (Relancez les dépendances du plugin Jeezigbee pour effectuer la mise à jour)');
message::add('z2m', __('Nouvelle version de Zigbee2MQTT disponible' ,__FILE__) . ' : '.$releaseVersion['version'].' (Relancez les dépendances du plugin Jeezigbee pour effectuer la mise à jour)', null, null);
$releaseVersion = json_decode($releaseVersion, true);
$lastZigbee2mqttVersion = config::byKey('lastZigbee2mqttVersion', 'z2m');
if (is_array($releaseVersion) && json_last_error() == '' && isset($releaseVersion['version']) && $package['version'] !== $releaseVersion['version'] && $lastZigbee2mqttVersion != $releaseVersion['version']) {
config::save('lastZigbee2mqttVersion', $package['version'], 'z2m');
log::add('z2m', 'info', 'Nouvelle version de Zigbee2MQTT disponible : '.$releaseVersion['version'].' (Relancez les dépendances du plugin Jeezigbee pour effectuer la mise à jour)');
message::add('z2m', __('Nouvelle version de Zigbee2MQTT disponible' ,__FILE__) . ' : '.$releaseVersion['version'].' (Relancez les dépendances du plugin Jeezigbee pour effectuer la mise à jour)', null, null);
}
}
}
}
}
}
}

public static function cron() {
foreach (eqLogic::byType('z2m', true) as $eqLogic) {
Expand Down

0 comments on commit 0212e68

Please sign in to comment.