From abd81ec1c99721fad3bb7fa9a6b77bd00d7f4ccc Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Thu, 14 Jan 2021 03:41:48 +0100
Subject: [PATCH] Fix and improve update_available logic for all plugins (#47)

---
 lib/addons.sh     | 17 ++++-------------
 lib/audio.sh      | 15 ++-------------
 lib/core.sh       |  2 +-
 lib/dns.sh        |  2 +-
 lib/os.sh         | 15 ++-------------
 lib/supervisor.sh | 15 ++-------------
 6 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/lib/addons.sh b/lib/addons.sh
index 9d3deed..9cdbc2a 100644
--- a/lib/addons.sh
+++ b/lib/addons.sh
@@ -438,20 +438,11 @@ function bashio::addon.version_latest() {
 #   $1 Add-on slug (optional, default: self)
 # ------------------------------------------------------------------------------
 function bashio::addon.update_available() {
-    local addon=${1:-'self'}
-    local version
-    local version_latest
-
     bashio::log.trace "${FUNCNAME[0]}" "$@"
-
-    version=$(bashio::addon.version "${addon}")
-    version_latest=$(bashio::addon.version_latest "${addon}")
-
-    if [[ "${version}" = "${version_latest}" ]]; then
-        return "${__BASHIO_EXIT_NOK}"
-    fi
-
-    return "${__BASHIO_EXIT_OK}"
+    bashio::addons \
+        "${slug}" \
+        "addons.${slug}.update_available" \
+        '.update_available // false'
 }
 
 # ------------------------------------------------------------------------------
diff --git a/lib/audio.sh b/lib/audio.sh
index 6ad6165..a0e8c50 100644
--- a/lib/audio.sh
+++ b/lib/audio.sh
@@ -111,19 +111,8 @@ function bashio::audio.version_latest() {
 # Checks if there is an update available for the audio server.
 # ------------------------------------------------------------------------------
 function bashio::audio.update_available() {
-    local version
-    local version_latest
-
-    bashio::log.trace "${FUNCNAME[0]}"
-
-    version=$(bashio::audio.version)
-    version_latest=$(bashio::audio.version_latest)
-
-    if [[ "${version}" = "${version_latest}" ]]; then
-        return "${__BASHIO_EXIT_NOK}"
-    fi
-
-    return "${__BASHIO_EXIT_OK}"
+    bashio::log.trace "${FUNCNAME[0]}" "$@"
+    bashio::audio 'audio.info.update_available' '.update_available // false'
 }
 
 # ------------------------------------------------------------------------------
diff --git a/lib/core.sh b/lib/core.sh
index e9e5b88..1cfb980 100644
--- a/lib/core.sh
+++ b/lib/core.sh
@@ -134,7 +134,7 @@ function bashio::core.version_latest() {
 # ------------------------------------------------------------------------------
 function bashio::core.update_available() {
     bashio::log.trace "${FUNCNAME[0]}" "$@"
-    bashio::cli 'core.info.update_available' '.update_available // false'
+    bashio::core 'core.info.update_available' '.update_available // false'
 }
 
 # ------------------------------------------------------------------------------
diff --git a/lib/dns.sh b/lib/dns.sh
index 9122151..4e8ccca 100644
--- a/lib/dns.sh
+++ b/lib/dns.sh
@@ -120,7 +120,7 @@ function bashio::dns.version_latest() {
 # ------------------------------------------------------------------------------
 function bashio::dns.update_available() {
     bashio::log.trace "${FUNCNAME[0]}" "$@"
-    bashio::cli 'dns.info.update_available' '.update_available // false'
+    bashio::dns 'dns.info.update_available' '.update_available // false'
 }
 
 # ------------------------------------------------------------------------------
diff --git a/lib/os.sh b/lib/os.sh
index ad2ffb9..7c00c1e 100644
--- a/lib/os.sh
+++ b/lib/os.sh
@@ -93,19 +93,8 @@ function bashio::os.version_latest() {
 # Checks if there is an update available for the Supervisor.
 # ------------------------------------------------------------------------------
 function bashio::os.update_available() {
-    local version
-    local version_latest
-
-    bashio::log.trace "${FUNCNAME[0]}"
-
-    version=$(bashio::os.version)
-    version_latest=$(bashio::os.version_latest)
-
-    if [[ "${version}" = "${version_latest}" ]]; then
-        return "${__BASHIO_EXIT_NOK}"
-    fi
-
-    return "${__BASHIO_EXIT_OK}"
+    bashio::log.trace "${FUNCNAME[0]}" "$@"
+    bashio::os 'os.info.update_available' '.update_available // false'
 }
 
 # ------------------------------------------------------------------------------
diff --git a/lib/supervisor.sh b/lib/supervisor.sh
index 129e611..1e4e842 100644
--- a/lib/supervisor.sh
+++ b/lib/supervisor.sh
@@ -110,19 +110,8 @@ function bashio::supervisor.version_latest() {
 # Checks if there is an update available for the Supervisor.
 # ------------------------------------------------------------------------------
 function bashio::supervisor.update_available() {
-    local version
-    local version_latest
-
-    bashio::log.trace "${FUNCNAME[0]}"
-
-    version=$(bashio::supervisor.version)
-    version_latest=$(bashio::supervisor.version_latest)
-
-    if [[ "${version}" = "${version_latest}" ]]; then
-        return "${__BASHIO_EXIT_NOK}"
-    fi
-
-    return "${__BASHIO_EXIT_OK}"
+    bashio::log.trace "${FUNCNAME[0]}" "$@"
+    bashio::supervisor 'supervisor.info.update_available' '.update_available // false'
 }
 
 # ------------------------------------------------------------------------------