feat: add loading check

core/app.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/vrischmann/userdir"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"res-downloader/core/shared"
@@ -25,6 +26,7 @@ type App struct {
 	PublicCrt   []byte `json:"-"`
 	PrivateKey  []byte `json:"-"`
 	IsProxy     bool   `json:"IsProxy"`
+	IsReset     bool   `json:"-"`
 }
 
 var (
@@ -51,6 +53,7 @@ func GetApp(assets embed.FS, wjs string) *App {
 			Version:     version,
 			Description: "res-downloader是一款集网络资源嗅探 + 高速下载功能于一体的软件，高颜值、高性能和多样化，提供个人用户下载自己上传到各大平台的网络资源功能！",
 			Copyright:   "Copyright © 2023~" + strconv.Itoa(time.Now().Year()),
+			IsReset:     false,
 			PublicCrt: []byte(`-----BEGIN CERTIFICATE-----
 MIIDwzCCAqugAwIBAgIUFAnC6268dp/z1DR9E1UepiWgWzkwDQYJKoZIhvcNAQEL
 BQAwcDELMAkGA1UEBhMCQ04xEjAQBgNVBAgMCUNob25ncWluZzESMBAGA1UEBwwJ
@@ -129,6 +132,10 @@ func (a *App) Startup(ctx context.Context) {
 func (a *App) OnExit() {
 	a.UnsetSystemProxy()
 	globalLogger.Close()
+	if appOnce.IsReset {
+		err := a.ResetApp()
+		fmt.Println("err:", err)
+	}
 }
 
 func (a *App) installCert() (string, error) {
@@ -179,3 +186,24 @@ func (a *App) lock() error {
 	}
 	return nil
 }
+
+func (a *App) ResetApp() error {
+	exePath, err := os.Executable()
+	if err != nil {
+		return err
+	}
+
+	exePath, err = filepath.Abs(exePath)
+	if err != nil {
+		return err
+	}
+
+	_ = os.Remove(filepath.Join(appOnce.UserDir, "install.lock"))
+	_ = os.Remove(filepath.Join(appOnce.UserDir, "pass.cache"))
+	_ = os.Remove(filepath.Join(appOnce.UserDir, "config.json"))
+	_ = os.Remove(filepath.Join(appOnce.UserDir, "cert.crt"))
+
+	cmd := exec.Command(exePath)
+	cmd.Start()
+	return nil
+}

core/bind.go

@@ -1,5 +1,9 @@
 package core
 
+import (
+	"github.com/wailsapp/wails/v2/pkg/runtime"
+)
+
 type Bind struct {
 }
 
@@ -14,3 +18,8 @@ func (b *Bind) Config() *ResponseData {
 func (b *Bind) AppInfo() *ResponseData {
 	return httpServerOnce.buildResp(1, "ok", appOnce)
 }
+
+func (b *Bind) ResetApp() {
+	appOnce.IsReset = true
+	runtime.Quit(appOnce.ctx)
+}

frontend/src/locales/en.json

@@ -84,7 +84,11 @@
     "win_install_tip": "For the first time using this software, please right-click and select 'Run as administrator'",
     "download_queued": "Download has been added to the queue, current queue length：{count}",
     "search": "Search",
-    "search_description": "Keyword Search..."
+    "search_description": "Keyword Search...",
+    "start_err_tip": "Error Message",
+    "start_err_content": "The current startup process has encountered an issue. Do you want to reset the application?",
+    "start_err_positiveText": "Clear cache and restart",
+    "start_err_negativeText": "Close the software"
   },
   "setting": {
     "restart_tip": "Keep default if unsure, please restart software after modification",

frontend/src/locales/zh.json

@@ -84,7 +84,11 @@
     "win_install_tip": "首次启用本软件，请使用鼠标右键选择以管理员身份运行",
     "download_queued": "下载已加入队列，当前队列长度：{count}",
     "search": "搜索",
-    "search_description": "关键字搜索..."
+    "search_description": "关键字搜索...",
+    "start_err_tip": "错误提示",
+    "start_err_content": "当前启动过程遇到了问题，是否重置应用？",
+    "start_err_positiveText": "清理缓存并重启",
+    "start_err_negativeText": "关闭软件"
   },
   "setting": {
     "restart_tip": "如果不清楚保持默认就行，修改后请重启软件",

frontend/src/views/index.vue

@@ -51,7 +51,7 @@
                   </template>
                   {{ t('index.cancel_down') }}
                 </NButton>
-                <NButton tertiary type="warning" @click.stop="batchExport" class="my-1">
+                <NButton tertiary type="warning" @click.stop="batchExport()" class="my-1">
                   <template #icon>
                     <n-icon>
                       <ArrowRedoCircleOutline/>
@@ -136,9 +136,14 @@ import {
   Apps,
   TrashOutline, CloseOutline
 } from "@vicons/ionicons5"
+import { useDialog } from 'naive-ui'
+import * as bind from "../../wailsjs/go/core/Bind"
+import {Quit} from "../../wailsjs/runtime"
+import {DialogOptions} from "naive-ui/es/dialog/src/DialogProvider"
 
 const {t} = useI18n()
 const eventStore = useEventStore()
+const dialog = useDialog()
 const isProxy = computed(() => {
   return store.isProxy
 })
@@ -382,6 +387,7 @@ const showPassword = ref(false)
 const downloadQueue = ref<appType.MediaInfo[]>([])
 let activeDownloads = 0
 let isOpenProxy = false
+let isInstall = false
 
 onMounted(() => {
   try {
@@ -390,8 +396,16 @@ onMounted(() => {
     })
     loading.value = true
     handleInstall().then((is: boolean) => {
+      isInstall = true
       loading.value = false
     })
+
+    checkLoading()
+    watch(showPassword, ()=>{
+      if (!showPassword.value){
+        checkLoading()
+      }
+    })
   } catch (e) {
     window.$message?.error(JSON.stringify(e), {duration: 5000})
   }
@@ -607,12 +621,11 @@ const batchCancel = () =>{
     return
   }
 
-  data.value.forEach((item, index) => {
+  data.value.forEach(async (item, index) => {
     if (checkedRowKeysValue.value.includes(item.Id) && item.Status === "running") {
-      appApi.cancel({id: item.Id}).then((res)=>{
+      appApi.cancel({id: item.Id})
-        item.Status = 'ready'
+      data.value[index].Status = 'ready'
-        item.SavePath = ''
+      data.value[index].SavePath = ''
-      })
     }
   })
   checkedRowKeysValue.value = []
@@ -847,6 +860,29 @@ const handleInstall = async () => {
   }
   return false
 }
+
+const checkLoading = ()=>{
+  setTimeout(()=>{
+    if (loading.value && !isInstall && !showPassword.value) {
+      dialog.warning({
+        title: t("index.start_err_tip"),
+        content: t("index.start_err_content"),
+        positiveText: t("index.start_err_positiveText"),
+        negativeText: t("index.start_err_negativeText"),
+        draggable: false,
+        closeOnEsc: false,
+        closable: false,
+        maskClosable: false,
+        onPositiveClick: () => {
+          bind.ResetApp()
+        },
+        onNegativeClick: () => {
+          Quit()
+        }
+      } as DialogOptions)
+    }
+  }, 6000)
+}
 </script>
 <style>
 .ellipsis-2 {

frontend/wailsjs/go/core/Bind.d.ts

@@ -5,3 +5,5 @@ import {core} from '../models';
 export function AppInfo():Promise<core.ResponseData>;
 
 export function Config():Promise<core.ResponseData>;
+
+export function ResetApp():Promise<void>;

frontend/wailsjs/go/core/Bind.js

@@ -9,3 +9,7 @@ export function AppInfo() {
 export function Config() {
   return window['go']['core']['Bind']['Config']();
 }
+
+export function ResetApp() {
+  return window['go']['core']['Bind']['ResetApp']();
+}