Release v1.0.3-beta

Release v1.0.3-beta

gui/pom.xml

@@ -7,11 +7,11 @@
     <parent>
         <groupId>cn.octopusyan</groupId>
         <artifactId>alist-gui</artifactId>
-        <version>1.0.1</version>
+        <version>${gui.version}</version>
     </parent>
 
     <artifactId>gui</artifactId>
-    <version>${parent.version}</version>
+    <version>${gui.version}</version>
     <name>alist-gui</name>
 
     <properties>
@@ -21,6 +21,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+        <parent.version>${gui.version}</parent.version>
+
         <exec.mainClass>cn.octopusyan.alistgui.AppLauncher</exec.mainClass>
         <cssSrcPath>${project.basedir}/src/main/resources/css</cssSrcPath>
         <cssTargetPath>${project.basedir}/target/classes/css</cssTargetPath>
@@ -191,7 +193,7 @@
                             <mainClass>cn.octopusyan.alistgui/${exec.mainClass}</mainClass>
                             <options>
                                 <option>--enable-preview</option>
-                                <!--                                <option>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005</option>-->
+<!--                                <option>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005</option>-->
                             </options>
                         </configuration>
                     </execution>

gui/src/main/java/cn/octopusyan/alistgui/Application.java

@@ -41,7 +41,7 @@ public class Application extends javafx.application.Application {
         long delay = 0L;
         // 更新重启检查
         File upgradeFile = new File(Constants.DATA_DIR_PATH + File.separator + new Gui().getReleaseFile());
-        logger.error("{}{}{}", Constants.DATA_DIR_PATH, File.separator, new Gui().getReleaseFile());
+//        logger.error("{}{}{}", Constants.DATA_DIR_PATH, File.separator, new Gui().getReleaseFile());
         if (upgradeFile.exists()) {
             logger.error("upgradeFile.exists");
             FileUtil.del(upgradeFile);
@@ -165,7 +165,7 @@ public class Application extends javafx.application.Application {
                 instanceCheckLatch.countDown();
 
                 while (true) {
-                    logger.error(STR."====\{instanceId}====");
+                    logger.debug(STR."====\{instanceId}====");
                     try (
                             Socket clientSocket = serverSocket.accept();
                             BufferedReader in = new BufferedReader(

gui/src/main/java/cn/octopusyan/alistgui/manager/AListManager.java

@@ -143,24 +143,21 @@ public class AListManager {
         ConsoleLog.info(getText("alist.status.stop"));
         if (!running.get()) {
             ConsoleLog.warning(getText("alist.status.stop.stopped"));
-            return;
         }
         util.destroy();
     }
 
-    static ChangeListener<Boolean> restartListener;
+    static ChangeListener<Boolean> restartListener = (_, _, run) -> {
+        if (run) return;
+        running.removeListener(AListManager.restartListener);
+        start();
+    };
 
     public static void restart() {
         if (!running.get()) {
             start();
         } else {
             stop();
-
-            restartListener = (_, _, run) -> {
-                if (run) return;
-                running.removeListener(restartListener);
-                start();
-            };
             running.addListener(restartListener);
         }
     }
@@ -194,7 +191,7 @@ public class AListManager {
 //============================={ private }====================================
 
     /**
-     * TODO 点击开始时检查 aList 执行文件
+     * 点击开始时检查 aList 执行文件
      */
     private static boolean checkAList() {
         if (new File(Constants.ALIST_FILE).exists()) return true;
@@ -216,6 +213,11 @@ public class AListManager {
         return false;
     }
 
+    /**
+     * 开始下载AList
+     *
+     * @param version 下载版本号
+     */
     private static void showDownload(String version) {
         String content = STR."""
                 \{getText("msg.alist.download.notfile")}

gui/src/main/java/cn/octopusyan/alistgui/viewModel/AboutViewModule.java

@@ -17,6 +17,7 @@ import cn.octopusyan.alistgui.view.alert.AlertUtil;
 import cn.octopusyan.alistgui.view.alert.builder.AlertBuilder;
 import javafx.application.Platform;
 import javafx.beans.property.*;
+import javafx.beans.value.ChangeListener;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -144,8 +145,13 @@ public class AboutViewModule extends BaseViewModel {
                             Platform.runLater(() -> {
                                 switch (app) {
                                     case AList _ -> {
-                                        // 下载完成后，解压并删除文件
-                                        DownloadUtil.unzip(app);
+                                        if(AListManager.isRunning()) {
+                                            AListManager.stop();
+                                            AListManager.runningProperty().addListener(updateListener);
+                                        } else {
+                                            // 下载完成后，解压并删除文件
+                                            DownloadUtil.unzip(app);
+                                        }
                                         // 设置应用版本
                                         aListVersion.setValue(aListNewVersion.getValue());
                                         AListManager.restart();
@@ -163,4 +169,12 @@ public class AboutViewModule extends BaseViewModel {
                         }).execute();
                 });
     }
+
+    static final ChangeListener<Boolean> updateListener = (_, _, run) -> {
+        if (!run) {
+            // 下载完成后，解压并删除文件
+            DownloadUtil.unzip(ConfigManager.aList());
+        }
+        AListManager.runningProperty().removeListener(AboutViewModule.updateListener);
+    };
 }

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.octopusyan</groupId>
     <artifactId>alist-gui</artifactId>
-    <version>1.0.1</version>
+    <version>${gui.version}</version>
     <name>alist-gui</name>
     <packaging>pom</packaging>
 
@@ -30,7 +30,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <project.version>1.0.1</project.version>
+        <gui.version>1.0.3</gui.version>
 
         <junit.version>5.10.0</junit.version>
         <javafx.version>21.0.4</javafx.version>

upgrade/pom.xml

@@ -7,11 +7,11 @@
     <parent>
         <groupId>cn.octopusyan</groupId>
         <artifactId>alist-gui</artifactId>
-        <version>1.0.1</version>
+        <version>${gui.version}</version>
     </parent>
 
     <artifactId>upgrade</artifactId>
-    <version>${parent.version}</version>
+    <version>${gui.version}</version>
     <name>upgrade</name>
 
     <properties>