From 67a5c2e480bc5a8f22b9a48f4a9e72f0bfc55f16 Mon Sep 17 00:00:00 2001
From: kirillius <keryax@yandex.ru>
Date: Tue, 24 Dec 2024 14:53:04 +0300
Subject: [PATCH] Fixing updates

---
 utils/assets/index.html | 27 +++++++++++++++++++++++----
 utils/server.php        | 14 ++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/utils/assets/index.html b/utils/assets/index.html
index cb36a3f..431ad0d 100644
--- a/utils/assets/index.html
+++ b/utils/assets/index.html
@@ -7,10 +7,11 @@
 </head>
 <body>
 <span id="loading">Loading...</span>
+
 <div style="display: none" id="panel">
 
     <div id="update-panel">Checking for updates...</div>
-
+    <hr>
     Selected networks:
     <table id="net-table">
         <tr>
@@ -93,7 +94,7 @@
                 self.prop("disabled", true);
                 (async function () {
                     try {
-                       alert( await JSONRPC.__invoke("restart_quagga"));
+                        alert(await JSONRPC.__invoke("restart_quagga"));
                     } finally {
                         setTimeout(() => {
                             self.prop("disabled", false);
@@ -103,8 +104,26 @@
                 })();
             }
         });
-        (async function(){
-            alert(await JSONRPC.__invoke("checkUpdates"));
+        (async function () {
+            let state = (await JSONRPC.__invoke("checkUpdates"));
+            if (state === null) {
+                $("#update-panel").html(`<span style="color:red;">Error checking updates</span>`);
+            } else if (state === false) {
+                $("#update-panel").html(`<span style="color:black;">There is no updates</span>`);
+            } else if (state === true) {
+                $("#update-panel").html(`<span style="color:green;">Some updates are available</span>&nbsp;<button>Update</button>`);
+                $("#update-panel button").click(async function () {
+                    $("#panel").hide();
+                    $("#loading").show().text("Installing updates...");
+                    try {
+                        console.log(await JSONRPC.__invoke("installUpdates"));
+                    } finally {
+                        setTimeout(() => location.reload(), 10000);
+                    }
+                });
+
+
+            }
         })();
     });
 </script>
diff --git a/utils/server.php b/utils/server.php
index 38b3d15..7e237c5 100644
--- a/utils/server.php
+++ b/utils/server.php
@@ -68,8 +68,18 @@ try {
         public function checkUpdates()
         {
             $this->checkAuth();
-            $data = shell_exec("git --no-pager fetch --dry-run --porcelain --verbose 2>&1");
-            return $data;
+            $data = str_replace("=","",@shell_exec("git --no-pager fetch --dry-run --porcelain --verbose 2>&1 | grep refs"));
+            $parts = explode(" ", trim($data));
+            if(count($parts) < 3){
+                return null;
+            }
+
+            return $parts[0] != $parts[1];
+        }
+
+        public function installUpdates()
+        {
+            return @shell_exec("git --no-pager pull --verbose 2>&1");
         }
 
 
