feat: 点击按钮后在后台更新程序（git）

assets/custom.css

@@ -112,6 +112,9 @@ footer {
 .btn-update-group.hideK {
     display: none;
 }
+span.hideK {
+    display: none;
+}
 /* user_info */
 #user_info.block {
     white-space: nowrap;

assets/custom.js

@@ -23,6 +23,7 @@ var sendBtn = null;
 var cancelBtn = null;
 var sliders = null;
 var updateChuanhuBtn = null;
+var statusDisplay = null;
 
 var userLogged = false;
 var usernameGotten = false;
@@ -37,7 +38,7 @@ var language = navigator.language.slice(0,2);
 var currentTime = new Date().getTime();
 
 // i18n
-var forView_i18n = {
+const forView_i18n = {
     'zh': "仅供查看",
     'en': "For viewing only",
     'ja': "閲覧専用",
@@ -47,14 +48,14 @@ var forView_i18n = {
     'sv': "Endast för visning",
 };
 
-var deleteConfirm_i18n_pref = {
+const deleteConfirm_i18n_pref = {
     'zh': "你真的要删除 ",
     'en': "Are you sure you want to delete ",
     'ja': "本当に ",
     'ko': "정말로 ",
     'sv': "Är du säker på att du vill ta bort "
 };
-var deleteConfirm_i18n_suff = {
+const deleteConfirm_i18n_suff = {
     'zh': " 吗？",
     'en': " ?",
     'ja': " を削除してもよろしいですか？",
@@ -64,7 +65,7 @@ var deleteConfirm_i18n_suff = {
 var deleteConfirm_msg_pref = "Are you sure you want to delete ";
 var deleteConfirm_msg_suff = " ?";
 
-var usingLatest_i18n = {
+const usingLatest_i18n = {
     'zh': "您使用的就是最新版！",
     'en': "You are using the latest version!",
     'ja': "最新バージョンを使用しています！",
@@ -72,6 +73,21 @@ var usingLatest_i18n = {
     'sv': "Du använder den senaste versionen!"
 };
 
+const updateSuccess_i18n = {
+    'zh': "更新成功，请重启本程序。",
+    'en': "Updated successfully, please restart this program.",
+    'ja': "更新が成功しました、このプログラムを再起動してください。",
+    'ko': "업데이트 성공, 이 프로그램을 재시작 해주세요.",
+    'sv': "Uppdaterat framgångsrikt, starta om programmet."
+}
+const updateFailure_i18n = {
+    'zh': '更新失败，请尝试<a href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新" target="_blank">手动更新</a>。',
+    'en': 'Update failed, please try <a href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新" target="_blank">manually updating</a>.',
+    'ja': '更新に失敗しました、<a href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新" target="_blank">手動での更新</a>をお試しください。',
+    'ko': '업데이트 실패, <a href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新" target="_blank">수동 업데이트</a>를 시도하십시오.',
+    'sv': 'Uppdateringen misslyckades, prova att <a href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新" target="_blank">uppdatera manuellt</a>.'
+}
+
 // gradio 页面加载好了么??? 我能动你的元素了么??
 function gradioLoaded(mutations) {
     for (var i = 0; i < mutations.length; i++) {
@@ -89,6 +105,7 @@ function gradioLoaded(mutations) {
             cancelBtn = document.getElementById("cancel_btn");
             sliders = document.querySelectorAll('input[type="range"]');
             updateChuanhuBtn = document.getElementById("update_chuanhu_btn");
+            statusDisplay = document.querySelector('#status_display');
 
             if (loginUserForm) {
                 localStorage.setItem("userLogged", true);
@@ -117,6 +134,9 @@ function gradioLoaded(mutations) {
                 setChatbotScroll();
                 mObserver.observe(chatbotWrap, { attributes: true, childList: true, subtree: true, characterData: true});
             }
+            if (statusDisplay) {
+                // statusObserver.observe(statusDisplay, { childList: true, subtree: true, characterData: true});
+            }
             if (sliders) {
                 setSlider();
             }
@@ -507,6 +527,22 @@ var submitObserver = new MutationObserver(function (mutationsList) {
     saveHistoryHtml();
 });
 
+var statusObserver = new MutationObserver(function (mutationsList) {
+    for (const mutation of mutationsList) {
+        if (mutation.type === 'attributes' || mutation.type === 'childList') {
+            if (statusDisplay.innerHTML.includes('<span id="update-status"')) {
+                if (getUpdateStatus() === "success") {
+                    releaseNoteElement.innerHTML = updateSuccess_i18n.hasOwnProperty(language) ? updateSuccess_i18n[language] : updateSuccess_i18n['en'];
+                } else if (getUpdateStatus() === "failure") {
+                    releaseNoteElement.innerHTML = updateFailure_i18n.hasOwnProperty(language) ? updateFailure_i18n[language] : updateFailure_i18n['en'];
+                } else {
+                    releaseNoteElement.innerHTML = getUpdateStatus();
+                }
+            }
+        }
+    }
+});
+
 var loadhistorytime = 0; // for debugging
 function saveHistoryHtml() {
     var historyHtml = document.querySelector('#chuanhu_chatbot>.wrapper>.wrap');
@@ -570,7 +606,7 @@ async function getLatestRelease() {
             console.log(`Error: ${response.status} - ${response.statusText}`);
             updateInfoGotten = true;
             return null;
-          }
+        }
         const data = await response.json();
         updateInfoGotten = true;
         return data;
@@ -580,10 +616,12 @@ async function getLatestRelease() {
         return null;
     }
 }
+
+var releaseNoteElement = document.getElementById('release-note-content');
 async function updateLatestVersion() {
     const currentVersionElement = document.getElementById('current-version');
     const latestVersionElement = document.getElementById('latest-version-title');
-    const releaseNoteElement = document.getElementById('release-note-content');
+    releaseNoteElement = document.getElementById('release-note-content');
     const currentVersion = currentVersionElement.textContent;
     const versionTime = document.getElementById('version-time').innerText;
     const localVersionTime = versionTime !== "unknown" ? (new Date(versionTime)).getTime() : 0;
@@ -611,10 +649,16 @@ async function updateLatestVersion() {
         console.error(error);
     }
 }
-function getUpdate() {
+function getUpdateInfo() {
     window.open('https://github.com/gaizhenbiao/chuanhuchatgpt/releases/latest', '_blank');
     closeUpdateToast();
 }
+function bgUpdateChuanhu() {
+    updateChuanhuBtn.click();
+    releaseNoteElement = document.getElementById('release-note-content');
+    releaseNoteElement.innerHTML = '<p>正在尝试更新...</p>';
+    statusObserver.observe(statusDisplay, { childList: true, subtree: true, characterData: true});
+}
 function cancelUpdate() {
     closeUpdateToast();
 }
@@ -645,6 +689,15 @@ function noUpdate() {
     gotoUpdateBtn.classList.add('hideK');
     closeUpdateBtn.classList.remove('hideK');
 }
+function getUpdateStatus() {
+    const updateStatus = statusDisplay.querySelector("#update-status")
+    if (updateStatus) {
+        return updateStatus.innerText
+    } else {
+        return "unknown"
+    }
+}
+
 function setUpdateWindowHeight() {
     if (!showingUpdateInfo) {return;}
     const scrollPosition = window.scrollY;

assets/html/update.html

@@ -14,11 +14,11 @@
             </div>
         </div>
         <div id="goto-update-btn" class="btn-update-group">
-            <button class="btn-update lg secondary svelte-1ipelgc" id="cancel-button" onclick="cancelUpdate()">{cancel_btn}</button>
-            <button class="btn-update lg primary svelte-1ipelgc" id="update-button" onclick="getUpdate(); updateChuanhuBtn.click();">{update_btn}</button>
+            <button class="btn-update lg secondary svelte-1jrzxu" id="cancel-button" onclick="cancelUpdate()">{cancel_btn}</button>
+            <button class="btn-update lg primary svelte-1jrzxu" id="update-button" onclick="bgUpdateChuanhu()">{update_btn}</button>
         </div>
         <div id="close-update-btn" class="btn-update-group hideK">
-            <button class="btn-update lg secondary svelte-1jrzxu" id="update-button" onclick="getUpdate()">{seenew_btn}</button>
+            <button class="btn-update lg secondary svelte-1jrzxu" id="update-button" onclick="getUpdateInfo()">{seenew_btn}</button>
             <button class="btn-update lg primary svelte-1jrzxu" id="cancel-button" onclick="cancelUpdate()">{ok_btn}</button>
         </div>
     </div>

modules/utils.py

@@ -594,11 +594,13 @@ def update_chuanhu():
     git = os.environ.get('GIT', "git")
     try:
         run(f"{git} fetch --all && {git} stash && {git} pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f && {git} stash pop")
-        logging.info("更新成功，重启中……")
-        return gr.Markdown.update(value="更新成功，重启中……")
+        logging.info("Successfully updated")
+        status = '<span id="update-status" class="hideK">success</span>'
+        return gr.Markdown.update(value=i18n("更新成功，请重启本程序")+status)
     except Exception:
-        logging.info("更新失败")
-        return gr.Markdown.update(value="更新失败")
+        logging.info("Failed to update")
+        status = '<span id="update-status" class="hideK">failure</span>'
+        return gr.Markdown.update(value=i18n("更新失败，请尝试[手动更新](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)")+status)
 
 def get_html(filename):
     path = os.path.join(shared.chuanhu_path, "assets", "html", filename)