Release v1.0.3-beta

docs: version v1.0.3
2025-12-08 01:01:57 +08:00 · 2024-11-17 17:06:02 +08:00 · 2024-11-17 16:22:46 +08:00 · 2024-11-17 16:21:34 +08:00 · 2024-11-11 22:53:27 +08:00 · 2024-11-11 00:01:32 +08:00
9 changed files with 134 additions and 67 deletions
--- a/README.md
+++ b/README.md
@ -20,7 +20,7 @@

 ### 截图

-<details>
+<details open>
   <summary> 主界面 </summary>
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/909ac6ad-0021-47d7-a75c-7fb6505e8c15">
@ -28,7 +28,7 @@
   </picture>
 </details>

-<details>
+<details open>
   <summary> 管理员信息 </summary>
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/840dca69-e67d-4083-88f8-8e67c3e47141">
@ -36,7 +36,7 @@
   </picture>
 </details>

-<details>
+<details open>
   <summary> 设置 </summary>
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/8fc8c489-b9cd-4e34-ad32-4899ccc275e9">
@ -44,7 +44,7 @@
   </picture>
 </details>

-<details>
+<details open>
   <summary> 关于 </summary>
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/dbef2d66-4ca4-4e89-8292-dbdce3566f93">
--- a/gui/pom.xml
+++ b/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>
@ -105,21 +107,6 @@

    </dependencies>

-    <pluginRepositories>
-        <pluginRepository>
-            <id>nexus</id>
-            <name>nexus-snapshot-repository</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
    <build>
        <resources>
            <resource>
@ -136,7 +123,6 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
                <configuration>
                    <source>21</source>
                    <target>21</target>
@ -156,7 +142,6 @@
            <plugin>
                <groupId>us.hebi.sass</groupId>
                <artifactId>sass-cli-maven-plugin</artifactId>
-                <version>1.0.3</version>
                <configuration>
                    <sassVersion>1.78.0</sassVersion>
                    <args> <!-- Any argument that should be forwarded to the sass cli -->
@ -183,7 +168,6 @@
            <plugin>
                <groupId>org.openjfx</groupId>
                <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.8</version>
                <configuration>
                    <stripDebug>true</stripDebug>
                    <compress>2</compress>
@ -209,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>
@ -220,7 +204,6 @@
            <plugin>
                <groupId>io.github.fvarrui</groupId>
                <artifactId>javapackager</artifactId>
-                <version>1.7.7-SNAPSHOT</version>
                <configuration>
                    <mainClass>${exec.mainClass}</mainClass>
                    <bundleJre>true</bundleJre>
--- a/gui/src/main/java/cn/octopusyan/alistgui/Application.java
+++ b/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(
--- a/gui/src/main/java/cn/octopusyan/alistgui/manager/AListManager.java
+++ b/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")}
--- a/gui/src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java
+++ b/gui/src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java
@ -19,9 +19,10 @@ import org.apache.commons.lang3.time.DateFormatUtils;

 import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 /**
@ -33,7 +34,7 @@ public class ConsoleLog {
    public static final String format = "yyyy/MM/dd hh:mm:ss";
    private volatile static ConsoleLog log;
    private final VBox textArea;
-    private final static String CONSOLE_COLOR_PREFIX = "^\033[";
+    private final static String CONSOLE_COLOR_PREFIX = "\033[";
    private final static String CONSOLE_MSG_REX = "^\033\\[(\\d+)m(.*)\033\\[0m(.*)$";
    private final static String URL_IP_REX = "^((ht|f)tps?:\\/\\/)?[\\w-+&@#/%?=~_|!:,.;]*[\\w-+&@#/%=~_|]+(:\\d{1,5})?\\/?$";

@ -88,16 +89,6 @@ public class ConsoleLog {
        if (StringUtils.isEmpty(message) || !isInit()) return;
        message = message.strip();
        message = StrUtil.format(message, param);
-
-        // 多颜色消息处理
-        if (StringUtils.countMatches(message, CONSOLE_COLOR_PREFIX) > 1) {
-            String[] split = message.replace(CONSOLE_MSG_REX, "\n%s".formatted(CONSOLE_COLOR_PREFIX)).split("\n");
-            List<String> msgs = Arrays.stream(split).toList();
-            for (String msg : msgs) {
-                msg(msg);
-            }
-            return;
-        }
        message = setPwdText(message);
        message = resetConsoleColor(message);

@ -187,17 +178,35 @@ public class ConsoleLog {
    /**
     * 控制台输出颜色
     *
-     * @param msg alist 输出消息
+     * @param msg 输出消息
     * @return bbcode 颜色文本
     */
    private static String resetConsoleColor(String msg) {
-        if (!msg.contains("\033[")) return msg;
+        if (!msg.contains(CONSOLE_COLOR_PREFIX) || !Pattern.matches(CONSOLE_MSG_REX, msg)) return msg;

-        String colorCode = ReUtil.get(CONSOLE_MSG_REX, msg, 1);
-        String color = StringUtils.lowerCase(Color.valueOf(Integer.parseInt(colorCode)).getColor());
-        String colorMsg = ReUtil.get(CONSOLE_MSG_REX, msg, 2);
-        msg = ReUtil.get(CONSOLE_MSG_REX, msg, 3);
-        return color(color, colorMsg) + msg;
+        // 多颜色处理
+        String[] split = Pattern.compile("\\033\\[(\\d;)?(\\d+)m")
+                .matcher(msg)
+                .replaceAll(matchResult -> "\n" + matchResult.group())
+                .replaceFirst("\n", "")
+                .split("\n");
+
+        StringBuilder sb = new StringBuilder();
+        Pattern pattern = Pattern.compile("\\033\\[(\\d;)?(\\d+)m(.*)");
+        Matcher matcher;
+        for (int i = 0; i < split.length; i++) {
+            matcher = pattern.matcher(split[i]);
+            if(!matcher.matches()) continue;
+
+            if (i % 2 == 0) {
+                String color = StringUtils.lowerCase(Color.valueOf(Integer.parseInt(matcher.group(2))).getColor());
+                sb.append(color(color, matcher.group(3)));
+            } else {
+                sb.append(matcher.group(3));
+            }
+        }
+
+        return sb.toString();
    }

    /**
--- a/gui/src/main/java/cn/octopusyan/alistgui/viewModel/AboutViewModule.java
+++ b/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);
+    };
 }
--- a/gui/src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java
+++ b/gui/src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java
@ -65,8 +65,14 @@ public class SetupViewModel extends BaseViewModel {
        proxySetup.addListener((_, _, newValue) -> ConfigManager.proxySetup(newValue));
        proxyTestUrl.addListener((_, _, newValue) -> ConfigManager.proxyTestUrl(newValue));
        proxyHost.addListener((_, _, newValue) -> ConfigManager.proxyHost(newValue));
-        proxyPort.addListener((_, _, newValue) -> ConfigManager.proxyPort(newValue));
-        language.addListener((_, _, newValue) -> Context.setLanguage(newValue));
+        proxyHost.addListener((_, _, newValue) -> {
+            ConfigManager.proxyHost(newValue);
+            setProxy();
+        });
+        proxyPort.addListener((_, _, newValue) -> {
+            ConfigManager.proxyPort(newValue);
+            setProxy();
+        });
    }

    public ObjectProperty<Theme> themeProperty() {
@ -123,6 +129,14 @@ public class SetupViewModel extends BaseViewModel {
        });
    }

+    private void setProxy() {
+        ConfigManager.checkProxy((success, _) -> {
+            if (!success) return;
+
+            HttpUtil.getInstance().proxy(ConfigManager.proxySetup(), ConfigManager.getProxyInfo());
+        });
+    }
+
    private static ProxyCheckTask getProxyCheckTask(String checkUrl) {
        var task = new ProxyCheckTask(checkUrl);
        task.onListen(new TaskListener(task) {
--- a/pom.xml
+++ b/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>
@ -141,4 +141,52 @@

        </dependencies>
    </dependencyManagement>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus</id>
+            <name>nexus-snapshot-repository</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.13.0</version>
+                </plugin>
+
+                <!-- https://github.com/HebiRobotics/sass-cli-maven-plugin -->
+                <plugin>
+                    <groupId>us.hebi.sass</groupId>
+                    <artifactId>sass-cli-maven-plugin</artifactId>
+                    <version>1.0.3</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>javafx-maven-plugin</artifactId>
+                    <version>0.0.8</version>
+                </plugin>
+
+                <!-- https://github.com/fvarrui/JavaPackager -->
+                <plugin>
+                    <groupId>io.github.fvarrui</groupId>
+                    <artifactId>javapackager</artifactId>
+                    <version>1.7.7-SNAPSHOT</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
--- a/upgrade/pom.xml
+++ b/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>
@ -61,7 +61,6 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
                <configuration>
                    <source>21</source>
                    <target>21</target>
@ -79,7 +78,6 @@
            <plugin>
                <groupId>org.openjfx</groupId>
                <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.8</version>
                <configuration>
                    <stripDebug>true</stripDebug>
                    <compress>2</compress>
@ -112,7 +110,6 @@
            <plugin>
                <groupId>io.github.fvarrui</groupId>
                <artifactId>javapackager</artifactId>
-                <version>1.7.7-SNAPSHOT</version>
                <configuration>
                    <mainClass>${exec.mainClass}</mainClass>
                    <bundleJre>true</bundleJre>
Author	SHA1	Message	Date
octopus yan	a8db7cbf88	Release v1.0.3-beta Release v1.0.3-beta	2024-11-17 17:06:02 +08:00
octopus_yan	6a4e425f8a	docs: version v1.0.3	2024-11-17 16:22:46 +08:00
octopus_yan	09f515025c	fix: 修复在AList运行时更新会报错“该文件正在被使用”的问题	2024-11-17 16:21:34 +08:00
octopus_yan	96274f6952	chore: README.md	2024-11-11 22:53:27 +08:00
octopus_yan	b468b9774d	chore: 手动代理修改配置	2024-11-11 00:01:32 +08:00
octopus_yan	17d21fdc03	chore: 日志输出处理	2024-11-05 22:32:21 +08:00
octopus_yan	894439de6f	docs: 打包配置	2024-10-30 09:43:33 +08:00