todo: alist检查更新、代理测试

This commit is contained in:
octopus_yan 2024-09-08 02:03:01 +08:00
parent ef8ae3e53d
commit b1218e9122
21 changed files with 551 additions and 324 deletions

60
pom.xml
View File

@ -18,21 +18,21 @@
<description>AList windows gui</description> <description>AList windows gui</description>
<properties> <properties>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>21</maven.compiler.target>
<java.version>17</java.version> <java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<junit.version>5.10.0</junit.version> <junit.version>5.10.0</junit.version>
<javafx.version>17.0.6</javafx.version> <javafx.version>21.0.4</javafx.version>
<slf4j.version>2.0.16</slf4j.version> <slf4j.version>2.0.16</slf4j.version>
<logback.version>1.4.14</logback.version> <logback.version>1.4.14</logback.version>
<hutool.version>5.8.32</hutool.version> <hutool.version>5.8.32</hutool.version>
<common-lang3.version>3.16.0</common-lang3.version> <common-lang3.version>3.16.0</common-lang3.version>
<!-- <common-io.version>2.16.1</common-io.version>-->
<common-exec.version>1.4.0</common-exec.version> <common-exec.version>1.4.0</common-exec.version>
<lombok.version>1.18.32</lombok.version> <lombok.version>1.18.32</lombok.version>
<jackson.version>2.15.4</jackson.version>
<ikonli.version>12.3.1</ikonli.version> <ikonli.version>12.3.1</ikonli.version>
<gluonhq-emoji.version>1.0.1</gluonhq-emoji.version> <gluonhq-emoji.version>1.0.1</gluonhq-emoji.version>
</properties> </properties>
@ -50,6 +50,7 @@
<version>${javafx.version}</version> <version>${javafx.version}</version>
</dependency> </dependency>
<!-- https://mkpaz.github.io/atlantafx/ -->
<dependency> <dependency>
<groupId>io.github.mkpaz</groupId> <groupId>io.github.mkpaz</groupId>
<artifactId>atlantafx-base</artifactId> <artifactId>atlantafx-base</artifactId>
@ -127,7 +128,7 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId> <artifactId>jackson-dataformat-yaml</artifactId>
<version>2.15.4</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.kordamp.ikonli/ikonli-javafx --> <!-- https://mvnrepository.com/artifact/org.kordamp.ikonli/ikonli-javafx -->
@ -183,8 +184,9 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version> <version>3.13.0</version>
<configuration> <configuration>
<source>17</source> <source>21</source>
<target>17</target> <target>21</target>
<compilerArgs>--enable-preview</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
@ -196,11 +198,45 @@
<nonFilteredFileExtensions> <nonFilteredFileExtensions>
<nonFilteredFileExtension>exe</nonFilteredFileExtension> <nonFilteredFileExtension>exe</nonFilteredFileExtension>
<nonFilteredFileExtension>dll</nonFilteredFileExtension> <nonFilteredFileExtension>dll</nonFilteredFileExtension>
<nonFilteredFileExtension>ttf</nonFilteredFileExtension> <filteredFileExtension>scss</filteredFileExtension>
</nonFilteredFileExtensions> </nonFilteredFileExtensions>
</configuration> </configuration>
</plugin> </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>
<configuration>
<sassVersion>1.78.0</sassVersion>
<args> <!-- Any argument that should be forwarded to the sass cli -->
<arg>
${project.basedir}/src/main/resources/css/root.scss:${project.basedir}/target/classes/css/root.css
</arg>
<arg>
${project.basedir}/src/main/resources/css/root-view.scss:${project.basedir}/target/classes/css/root-view.css
</arg>
<arg>
${project.basedir}/src/main/resources/css/main-view.scss:${project.basedir}/target/classes/css/main-view.css
</arg>
<arg>
${project.basedir}/src/main/resources/css/setup-view.scss:${project.basedir}/target/classes/css/setup-view.css
</arg>
<arg>--no-source-map</arg>
</args>
</configuration>
<executions>
<execution>
<id>sass-exec</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId> <artifactId>javafx-maven-plugin</artifactId>
@ -210,8 +246,7 @@
<!-- Default configuration for running with: mvn clean javafx:run --> <!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id> <id>default-cli</id>
<configuration> <configuration>
<mainClass>cn.octopusyan.alistgui/cn.octopusyan.alistgui.AppLuncher <mainClass>cn.octopusyan.alistgui/cn.octopusyan.alistgui.AppLauncher</mainClass>
</mainClass>
<launcher>launcher</launcher> <launcher>launcher</launcher>
<jlinkZipName>app</jlinkZipName> <jlinkZipName>app</jlinkZipName>
<jlinkImageName>app</jlinkImageName> <jlinkImageName>app</jlinkImageName>
@ -223,13 +258,14 @@
</executions> </executions>
</plugin> </plugin>
<!-- https://github.com/fvarrui/JavaPackager -->
<plugin> <plugin>
<groupId>io.github.fvarrui</groupId> <groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId> <artifactId>javapackager</artifactId>
<version>1.7.7-SNAPSHOT</version> <version>1.7.7-SNAPSHOT</version>
<configuration> <configuration>
<bundleJre>true</bundleJre> <bundleJre>true</bundleJre>
<mainClass>cn.octopusyan.alistgui.AppLuncher</mainClass> <mainClass>cn.octopusyan.alistgui.AppLauncher</mainClass>
<generateInstaller>false</generateInstaller> <generateInstaller>false</generateInstaller>
</configuration> </configuration>
<executions> <executions>

View File

@ -0,0 +1,50 @@
package cn.octopusyan.alistgui.base;
import cn.octopusyan.alistgui.manager.thread.ThreadPoolManager;
import javafx.application.Platform;
import javafx.concurrent.Task;
/**
* @author octopus_yan
*/
public abstract class BaseTask extends Task<Void> {
private final ThreadPoolManager Executor = ThreadPoolManager.getInstance();
@Override
protected Void call() throws Exception {
task();
return null;
}
protected void runLater(Runnable runnable) {
Platform.runLater(runnable);
}
protected abstract void task() throws Exception;
public void onListen(Listener listener) {
if (listener == null) return;
setOnRunning(_ -> listener.onRunning());
setOnCancelled(_ -> listener.onCancelled());
setOnFailed(_ -> listener.onFailed(getException()));
setOnSucceeded(_ -> listener.onSucceeded());
}
public void execute() {
Executor.execute(this);
}
public interface Listener {
default void onRunning() {
}
default void onCancelled() {
}
default void onFailed(Throwable throwable) {
}
void onSucceeded();
}
}

View File

@ -1,127 +0,0 @@
package cn.octopusyan.alistgui.config;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.util.NumberUtil;
import cn.octopusyan.alistgui.enums.ProxySetup;
import cn.octopusyan.alistgui.manager.http.HttpUtil;
import cn.octopusyan.alistgui.model.GuiConfig;
import cn.octopusyan.alistgui.model.ProxyInfo;
import org.apache.commons.lang3.LocaleUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Locale;
import java.util.Optional;
import java.util.regex.Matcher;
/**
* 客户端设置
*
* @author octopus_yan@foxmail.com
*/
public class ConfigManager {
private static final Logger logger = LoggerFactory.getLogger(ConfigManager.class);
public static final Locale DEFAULT_LANGUAGE = Locale.CHINESE;
private static GuiConfig guiConfig;
public static void load() {
try {
guiConfig = GuiConfig.getInstance();
} catch (IOException e) {
logger.error("load config error", e);
}
}
public static boolean hasProxy() {
if (guiConfig == null)
return false;
ProxyInfo proxyInfo = guiConfig.getProxyInfo();
return proxyInfo != null
&& StringUtils.isNoneEmpty(proxyInfo.getHost())
&& StringUtils.isNoneEmpty(proxyInfo.getPort())
&& Integer.parseInt(proxyInfo.getPort()) > 0;
}
public static ProxyInfo getProxyInfo() {
return guiConfig.getProxyInfo();
}
public static String proxyHost() {
return guiConfig.getProxyInfo().getHost();
}
public static void proxyHost(String host) {
final Matcher matcher = PatternPool.IPV4.matcher(host);
if (matcher.matches()) {
guiConfig.getProxyInfo().setHost(host);
}
}
public static String proxyPort() {
return guiConfig.getProxyInfo().getPort();
}
public static int getProxyPort() {
return Integer.parseInt(guiConfig.getProxyInfo().getPort());
}
public static void proxyPort(String port) {
if (NumberUtil.isNumber(port))
guiConfig.getProxyInfo().setPort(port);
}
public static Locale language() {
String language = guiConfig.getLanguage();
return LocaleUtils.toLocale(Optional.ofNullable(language).orElse(DEFAULT_LANGUAGE.toString()));
}
public static void language(Locale locale) {
guiConfig.setLanguage(locale.toString());
}
public static boolean autoStart() {
return guiConfig.getAutoStart();
}
public static void autoStart(Boolean autoStart) {
guiConfig.setAutoStart(autoStart);
}
public static ProxySetup proxySetup() {
return ProxySetup.valueOf(StringUtils.upperCase(guiConfig.getProxySetup()));
}
public static void proxySetup(ProxySetup setup) {
guiConfig.setProxySetup(setup.getName());
if (!ProxySetup.NO_PROXY.equals(setup) && hasProxy()) {
HttpUtil.getInstance().proxy(setup, ConfigManager.getProxyInfo());
}
}
public static boolean silentStartup() {
return guiConfig.getSilentStartup();
}
public static void silentStartup(Boolean startup) {
guiConfig.setSilentStartup(startup);
}
public static String aListVersion() {
return guiConfig.getAListVersion();
}
public static void aListVersion(String version) {
guiConfig.setAListVersion(version);
}
public static void save() {
try {
guiConfig.save();
} catch (IOException e) {
logger.error("save config error", e);
}
}
}

View File

@ -10,13 +10,15 @@ import java.nio.file.Paths;
* *
* @author octopus_yan@foxmail.com * @author octopus_yan@foxmail.com
*/ */
public class AppConstant { public class Constants {
public static final String APP_TITLE = PropertiesUtils.getInstance().getProperty("app.title"); public static final String APP_TITLE = PropertiesUtils.getInstance().getProperty("app.title");
public static final String APP_NAME = PropertiesUtils.getInstance().getProperty("app.name"); public static final String APP_NAME = PropertiesUtils.getInstance().getProperty("app.name");
public static final String APP_VERSION = PropertiesUtils.getInstance().getProperty("app.version"); public static final String APP_VERSION = PropertiesUtils.getInstance().getProperty("app.version");
public static final String DATA_DIR_PATH = Paths.get(".").toFile().getAbsolutePath(); public static final String DATA_DIR_PATH = Paths.get(".").toFile().getAbsolutePath();
public static final String BIN_DIR_PATH = STR."\{DATA_DIR_PATH}\{File.separator}bin";
public static final String UPGRADE_PATH = STR."\{BIN_DIR_PATH}\{File.separator}upgrade.yaml";
public static final String TMP_DIR_PATH = System.getProperty("java.io.tmpdir") + APP_NAME; public static final String TMP_DIR_PATH = System.getProperty("java.io.tmpdir") + APP_NAME;
public static final String CONFIG_DIR_PATH = DATA_DIR_PATH + File.separator + "config"; public static final String CONFIG_DIR_PATH = STR."\{DATA_DIR_PATH}\{File.separator}config";
public static final String GUI_CONFIG_PATH = CONFIG_DIR_PATH + File.separator + "gui.yaml"; public static final String GUI_CONFIG_PATH = STR."\{CONFIG_DIR_PATH}\{File.separator}gui.yaml";
public static final String BAK_FILE_PATH = AppConstant.TMP_DIR_PATH + File.separator + "bak"; public static final String BAK_FILE_PATH = STR."\{Constants.TMP_DIR_PATH}\{File.separator}bak";
} }

View File

@ -65,14 +65,17 @@ public class Context {
// 获取控制工厂 // 获取控制工厂
public static Callback<Class<?>, Object> getControlFactory() { public static Callback<Class<?>, Object> getControlFactory() {
return type -> { return type -> {
if (type.equals(RootController.class)) { try {
return new RootController(); return switch (type.getDeclaredConstructor().newInstance()) {
} else if (type.equals(MainController.class)) { case RootController root -> root;
return new MainController(); case MainController main -> main;
} else if (type.equals(SetupController.class)) { case SetupController setup -> setup;
return new SetupController(); default -> throw new IllegalStateException(STR."Unexpected value: \{type}");
};
} catch (Exception e) {
log.error("", e);
return null;
} }
throw new IllegalStateException("Unexpected value: " + type);
}; };
} }
@ -130,15 +133,13 @@ public class Context {
* 初始化 语言 * 初始化 语言
*/ */
private static void initI18n() { private static void initI18n() {
currentLocaleProperty().addListener((observable, oldValue, newValue) -> { currentLocaleProperty().addListener((_, _, _) -> Platform.runLater(() -> {
Platform.runLater(() -> { try {
try { loadScene();
loadScene(); } catch (IOException e) {
} catch (IOException e) { log.error("", e);
log.error("", e); }
} }));
});
});
} }
/** /**

View File

@ -47,6 +47,7 @@ public class RootController extends BaseController<VBox> {
public Button github; public Button github;
@FXML @FXML
public Button sponsor; public Button sponsor;
/** /**
* 获取根布局 * 获取根布局
* *
@ -71,12 +72,19 @@ public class RootController extends BaseController<VBox> {
@Override @Override
public void initViewStyle() { public void initViewStyle() {
// 设置图标 // 设置图标
ImageView book = EmojiImageUtils.emojiView(EmojiData.emojiFromShortName("book").get(), 25); EmojiData.emojiFromShortName("book").ifPresent(icon -> {
document.setGraphic(book); ImageView book = EmojiImageUtils.emojiView(icon, 25);
ImageView githubIcon = EmojiImageUtils.emojiView(EmojiData.emojiFromShortName("cat").get(), 25); document.setGraphic(book);
github.setGraphic(githubIcon); });
ImageView juice = EmojiImageUtils.emojiView(EmojiData.emojiFromShortName("tropical_drink").get(), 25); EmojiData.emojiFromShortName("cat").ifPresent(icon -> {
sponsor.setGraphic(juice); ImageView githubIcon = EmojiImageUtils.emojiView(icon, 25);
github.setGraphic(githubIcon);
});
EmojiData.emojiFromShortName("tropical_drink").ifPresent(icon -> {
ImageView juice = EmojiImageUtils.emojiView(icon, 25);
sponsor.setGraphic(juice);
});
} }
/** /**
@ -84,9 +92,9 @@ public class RootController extends BaseController<VBox> {
*/ */
@Override @Override
public void initViewAction() { public void initViewAction() {
closeIcon.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> getWindow().close()); closeIcon.addEventHandler(MouseEvent.MOUSE_CLICKED, _ -> getWindow().close());
minimizeIcon.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> getWindow().setIconified(true)); minimizeIcon.addEventHandler(MouseEvent.MOUSE_CLICKED, _ -> getWindow().setIconified(true));
alwaysOnTopIcon.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> { alwaysOnTopIcon.addEventHandler(MouseEvent.MOUSE_CLICKED, _ -> {
boolean newVal = !getWindow().isAlwaysOnTop(); boolean newVal = !getWindow().isAlwaysOnTop();
alwaysOnTopIcon.pseudoClassStateChanged(PseudoClass.getPseudoClass("always-on-top"), newVal); alwaysOnTopIcon.pseudoClassStateChanged(PseudoClass.getPseudoClass("always-on-top"), newVal);
getWindow().setAlwaysOnTop(newVal); getWindow().setAlwaysOnTop(newVal);
@ -101,8 +109,8 @@ public class RootController extends BaseController<VBox> {
getWindow().setY(event.getScreenY() + yOffset); getWindow().setY(event.getScreenY() + yOffset);
}); });
tabPane.getSelectionModel().selectedIndexProperty().addListener((observable, oldValue, newValue) -> { tabPane.getSelectionModel()
Context.setCurrentViewIndex(newValue); .selectedIndexProperty()
}); .addListener((_, _, newValue) -> Context.setCurrentViewIndex(newValue));
} }
} }

View File

@ -1,15 +1,15 @@
package cn.octopusyan.alistgui.controller; package cn.octopusyan.alistgui.controller;
import cn.octopusyan.alistgui.base.BaseController; import cn.octopusyan.alistgui.base.BaseController;
import cn.octopusyan.alistgui.config.ConfigManager;
import cn.octopusyan.alistgui.config.Context; import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.enums.ProxySetup; import cn.octopusyan.alistgui.enums.ProxySetup;
import cn.octopusyan.alistgui.manager.ConfigManager;
import cn.octopusyan.alistgui.viewModel.SetupViewModel; import cn.octopusyan.alistgui.viewModel.SetupViewModel;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.GridPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -22,11 +22,11 @@ import java.util.Locale;
* *
* @author octopus_yan * @author octopus_yan
*/ */
public class SetupController extends BaseController<GridPane> implements Initializable { public class SetupController extends BaseController<AnchorPane> implements Initializable {
protected final Logger logger = LoggerFactory.getLogger(this.getClass()); protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@FXML @FXML
public GridPane setupView; public AnchorPane setupView;
@FXML @FXML
public CheckBox autoStartCheckBox; public CheckBox autoStartCheckBox;
@FXML @FXML
@ -35,26 +35,23 @@ public class SetupController extends BaseController<GridPane> implements Initial
public ComboBox<Locale> languageComboBox; public ComboBox<Locale> languageComboBox;
@FXML @FXML
public ComboBox<ProxySetup> proxySetupComboBox; public ComboBox<ProxySetup> proxySetupComboBox;
// @FXML
// public RadioButton noProxy;
// @FXML
// public RadioButton systemProxy;
// @FXML
// public RadioButton manualProxy;
@FXML @FXML
public Pane proxySetupPane; public Pane proxySetupPane;
@FXML @FXML
public Button proxyCheck;
@FXML
public TextField proxyHost; public TextField proxyHost;
@FXML @FXML
public TextField proxyPort; public TextField proxyPort;
@FXML @FXML
public Label alistVersion; public Label aListVersion;
@FXML
public Button checkAppVersion;
private final SetupViewModel setupViewModel = new SetupViewModel(); private final SetupViewModel setupViewModel = new SetupViewModel();
private final ToggleGroup proxySetupGroup = new ToggleGroup();
@Override @Override
public GridPane getRootPanel() { public AnchorPane getRootPanel() {
return setupView; return setupView;
} }
@ -63,18 +60,13 @@ public class SetupController extends BaseController<GridPane> implements Initial
languageComboBox.setItems(FXCollections.observableList(Context.SUPPORT_LANGUAGE_LIST)); languageComboBox.setItems(FXCollections.observableList(Context.SUPPORT_LANGUAGE_LIST));
proxySetupComboBox.setItems(FXCollections.observableList(List.of(ProxySetup.values()))); proxySetupComboBox.setItems(FXCollections.observableList(List.of(ProxySetup.values())));
// noProxy.setToggleGroup(proxySetupGroup);
// systemProxy.setToggleGroup(proxySetupGroup);
// manualProxy.setToggleGroup(proxySetupGroup);
} }
@Override @Override
public void initViewStyle() { public void initViewStyle() {
proxySetupComboBox.getSelectionModel().selectedItemProperty().addListener(observable -> { proxySetupComboBox.getSelectionModel().selectedItemProperty().addListener((_, _, newValue) -> {
proxySetupPane.setVisible(ProxySetup.MANUAL.equals(setupViewModel.proxySetupProperty().get()));
});
proxySetupComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
proxySetupPane.setVisible(ProxySetup.MANUAL.equals(newValue)); proxySetupPane.setVisible(ProxySetup.MANUAL.equals(newValue));
proxyCheck.setVisible(!ProxySetup.NO_PROXY.equals(newValue));
}); });
languageComboBox.getSelectionModel().select(ConfigManager.language()); languageComboBox.getSelectionModel().select(ConfigManager.language());
@ -85,15 +77,19 @@ public class SetupController extends BaseController<GridPane> implements Initial
public void initViewAction() { public void initViewAction() {
autoStartCheckBox.selectedProperty().bindBidirectional(setupViewModel.autoStartProperty()); autoStartCheckBox.selectedProperty().bindBidirectional(setupViewModel.autoStartProperty());
silentStartupCheckBox.selectedProperty().bindBidirectional(setupViewModel.silentStartupProperty()); silentStartupCheckBox.selectedProperty().bindBidirectional(setupViewModel.silentStartupProperty());
proxySetupComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> { proxySetupComboBox.getSelectionModel().selectedItemProperty()
setupViewModel.proxySetupProperty().set(newValue); .addListener((_, _, newValue) -> setupViewModel.proxySetupProperty().set(newValue));
});
proxyHost.textProperty().bindBidirectional(setupViewModel.proxyHostProperty()); proxyHost.textProperty().bindBidirectional(setupViewModel.proxyHostProperty());
proxyPort.textProperty().bindBidirectional(setupViewModel.proxyPortProperty()); proxyPort.textProperty().bindBidirectional(setupViewModel.proxyPortProperty());
languageComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> { languageComboBox.getSelectionModel().selectedItemProperty().addListener((_, _, newValue) -> {
setupViewModel.languageProperty().set(newValue); setupViewModel.languageProperty().set(newValue);
logger.info("language changed to {}", newValue); logger.info("language changed to {}", newValue);
}); });
alistVersion.textProperty().bindBidirectional(setupViewModel.aListVersionProperty()); aListVersion.textProperty().bindBidirectional(setupViewModel.aListVersionProperty());
}
@FXML
public void checkAListUpdate() {
setupViewModel.checkAListUpdate();
} }
} }

View File

@ -0,0 +1,181 @@
package cn.octopusyan.alistgui.manager;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.util.NumberUtil;
import cn.octopusyan.alistgui.config.Constants;
import cn.octopusyan.alistgui.enums.ProxySetup;
import cn.octopusyan.alistgui.manager.http.HttpUtil;
import cn.octopusyan.alistgui.model.GuiConfig;
import cn.octopusyan.alistgui.model.ProxyInfo;
import cn.octopusyan.alistgui.model.UpgradeConfig;
import cn.octopusyan.alistgui.model.upgrade.AList;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.apache.commons.lang3.LocaleUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.Locale;
import java.util.Optional;
import java.util.regex.Matcher;
/**
* 客户端设置
*
* @author octopus_yan@foxmail.com
*/
public class ConfigManager {
private static final Logger logger = LoggerFactory.getLogger(ConfigManager.class);
public static ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
public static final Locale DEFAULT_LANGUAGE = Locale.CHINESE;
private static GuiConfig guiConfig;
private static UpgradeConfig upgradeConfig;
static {
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
}
public static void load() {
guiConfig = loadConfig(Constants.GUI_CONFIG_PATH, GuiConfig.class);
upgradeConfig = loadConfig(Constants.UPGRADE_PATH, UpgradeConfig.class);
}
private static <T> T loadConfig(String path, Class<T> clazz) {
File src = new File(path);
try {
if (!src.exists()) {
checkFile(src, clazz);
}
return objectMapper.readValue(src, clazz);
} catch (Exception e) {
logger.error(String.format("load %s error", clazz.getSimpleName()), e);
}
return null;
}
public static boolean hasProxy() {
if (guiConfig == null)
return false;
ProxyInfo proxyInfo = getProxyInfo();
return proxyInfo != null
&& StringUtils.isNoneEmpty(proxyInfo.getHost())
&& StringUtils.isNoneEmpty(proxyInfo.getPort())
&& Integer.parseInt(proxyInfo.getPort()) > 0;
}
private static ProxyInfo getProxyInfo() {
return guiConfig.getProxyInfo();
}
private static void setProxyInfo(ProxyInfo info) {
guiConfig.setProxyInfo(info);
}
public static String proxyHost() {
if (getProxyInfo() == null) return null;
return getProxyInfo().getHost();
}
public static void proxyHost(String host) {
final Matcher matcher = PatternPool.IPV4.matcher(host);
if (matcher.matches()) {
if (getProxyInfo() == null)
setProxyInfo(new ProxyInfo());
getProxyInfo().setHost(host);
}
}
public static String proxyPort() {
if (getProxyInfo() == null) return null;
return getProxyInfo().getPort();
}
public static int getProxyPort() {
return Integer.parseInt(getProxyInfo().getPort());
}
public static void proxyPort(String port) {
if (NumberUtil.isNumber(port)) {
if (getProxyInfo() == null)
setProxyInfo(new ProxyInfo());
getProxyInfo().setPort(port);
}
}
public static Locale language() {
String language = guiConfig.getLanguage();
return LocaleUtils.toLocale(Optional.ofNullable(language).orElse(DEFAULT_LANGUAGE.toString()));
}
public static void language(Locale locale) {
guiConfig.setLanguage(locale.toString());
}
public static boolean autoStart() {
return guiConfig.getAutoStart();
}
public static void autoStart(Boolean autoStart) {
guiConfig.setAutoStart(autoStart);
}
public static ProxySetup proxySetup() {
return ProxySetup.valueOf(StringUtils.upperCase(guiConfig.getProxySetup()));
}
public static void proxySetup(ProxySetup setup) {
guiConfig.setProxySetup(setup.getName());
if (ProxySetup.NO_PROXY.equals(setup)) {
HttpUtil.getInstance().clearProxy();
} else if (hasProxy()) {
HttpUtil.getInstance().proxy(setup, ConfigManager.getProxyInfo());
}
}
public static boolean silentStartup() {
return guiConfig.getSilentStartup();
}
public static void silentStartup(Boolean startup) {
guiConfig.setSilentStartup(startup);
}
public static AList aList() {
return upgradeConfig.getAList();
}
public static String aListVersion() {
return upgradeConfig.getAList().getVersion();
}
public static void aListVersion(String version) {
upgradeConfig.getAList().setVersion(version);
}
private static <T> void checkFile(File src, Class<T> clazz) throws Exception {
File parent = FileUtil.getParent(src, 1);
if (!parent.exists()) {
boolean wasSuccessful = parent.mkdirs();
objectMapper.writeValue(src, clazz.getDeclaredConstructor().newInstance());
if (!wasSuccessful)
logger.error("{} 创建失败", src.getAbsolutePath());
}
}
public static void save() {
try {
objectMapper.writeValue(new File(Constants.GUI_CONFIG_PATH), guiConfig);
objectMapper.writeValue(new File(Constants.UPGRADE_PATH), upgradeConfig);
} catch (IOException e) {
logger.error("save config error", e);
}
}
}

View File

@ -1,71 +1,23 @@
package cn.octopusyan.alistgui.model; package cn.octopusyan.alistgui.model;
import cn.hutool.core.io.FileUtil;
import cn.octopusyan.alistgui.config.AppConstant;
import cn.octopusyan.alistgui.config.ConfigManager;
import cn.octopusyan.alistgui.enums.ProxySetup; import cn.octopusyan.alistgui.enums.ProxySetup;
import com.fasterxml.jackson.annotation.JsonInclude; import cn.octopusyan.alistgui.manager.ConfigManager;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import lombok.Data; import lombok.Data;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
/** /**
* GUI配置信息 * GUI配置信息
* 通过Jackson 写入yaml
* *
* @author octopus_yan * @author octopus_yan
*/ */
@Data @Data
public class GuiConfig { public class GuiConfig {
private static final Logger log = LoggerFactory.getLogger(GuiConfig.class); private static final Logger log = LoggerFactory.getLogger(GuiConfig.class);
public static GuiConfig INSTANCE;
public static ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
private Boolean autoStart = false; private Boolean autoStart = false;
private Boolean silentStartup = false; private Boolean silentStartup = false;
private ProxyInfo proxyInfo = new ProxyInfo(); private ProxyInfo proxyInfo;
private String proxySetup = ProxySetup.NO_PROXY.getName(); private String proxySetup = ProxySetup.NO_PROXY.getName();
private String language = ConfigManager.DEFAULT_LANGUAGE.toString(); private String language = ConfigManager.DEFAULT_LANGUAGE.toString();
@JsonProperty("aListVersion")
private String aListVersion = "unknown";
static {
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
}
private GuiConfig() {
}
public static GuiConfig getInstance() throws IOException {
File src = new File(AppConstant.GUI_CONFIG_PATH);
if (INSTANCE == null) {
if (!src.exists()) {
checkFile(src);
}
INSTANCE = objectMapper.readValue(src, GuiConfig.class);
}
return INSTANCE;
}
private static void checkFile(File src) throws IOException {
File parent = FileUtil.getParent(src, 1);
if (!parent.exists()) {
boolean wasSuccessful = parent.mkdirs();
objectMapper.writeValue(src, new GuiConfig());
if (!wasSuccessful)
log.error("{} 创建失败", src.getAbsolutePath());
}
}
public void save() throws IOException {
objectMapper.writeValue(new File(AppConstant.GUI_CONFIG_PATH), INSTANCE);
}
} }

View File

@ -0,0 +1,18 @@
package cn.octopusyan.alistgui.model;
import cn.octopusyan.alistgui.model.upgrade.AList;
import cn.octopusyan.alistgui.model.upgrade.Gui;
import lombok.Data;
/**
* 更新配置
*
* @author octopus_yan
*/
@Data
public class UpgradeConfig {
public static final String RELEASE_API = "https://api.github.com/repos/{}/{}/releases/latest";
public static final String DOWNLOAD_API = "https://github.com/{}/{}/releases/download/{}/{}";
private AList aList = new AList();
private Gui gui = new Gui();
}

View File

@ -0,0 +1,18 @@
package cn.octopusyan.alistgui.model.upgrade;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
/**
* @author octopus_yan
*/
@Data
public class AList implements UpgradeApp {
@JsonIgnore
private final String owner = "alist-org";
@JsonIgnore
private final String repo = "alist";
private String releaseFile = "alist-windows-amd64.zip";
private String version = "unknown";
}

View File

@ -0,0 +1,27 @@
package cn.octopusyan.alistgui.model.upgrade;
import cn.octopusyan.alistgui.util.PropertiesUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
/**
* @author octopus_yan
*/
@Data
public class Gui implements UpgradeApp {
@JsonIgnore
private final String owner = "alist-org";
@JsonIgnore
private final String repo = "alist";
private String releaseFile = "alist-gui-{version}-windows.zip";
private String version = PropertiesUtils.getInstance().getProperty("app.version");
public String getReleaseFile() {
return getReleaseFile(version);
}
public String getReleaseFile(String version) {
return releaseFile.replace("{version}", version);
}
}

View File

@ -0,0 +1,14 @@
package cn.octopusyan.alistgui.model.upgrade;
/**
* @author octopus_yan
*/
public interface UpgradeApp {
String getOwner();
String getRepo();
String getReleaseFile();
String getVersion();
}

View File

@ -0,0 +1,46 @@
package cn.octopusyan.alistgui.task;
import cn.hutool.core.util.StrUtil;
import cn.octopusyan.alistgui.base.BaseTask;
import cn.octopusyan.alistgui.manager.http.HttpUtil;
import cn.octopusyan.alistgui.model.UpgradeConfig;
import cn.octopusyan.alistgui.model.upgrade.UpgradeApp;
import cn.octopusyan.alistgui.util.JsonUtil;
import cn.octopusyan.alistgui.viewModel.SetupViewModel;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.commons.lang3.StringUtils;
/**
* 检查更新任务
*
* @author octopus_yan
*/
public class UpgradeTask extends BaseTask {
private final SetupViewModel vm;
private final UpgradeApp app;
public UpgradeTask(SetupViewModel viewModel, UpgradeApp app) {
this.vm = viewModel;
this.app = app;
}
@Override
protected void task() throws Exception {
String releaseApi = StrUtil.format(UpgradeConfig.RELEASE_API, app.getOwner(), app.getRepo());
String responseStr = HttpUtil.getInstance().get(releaseApi, null, null);
JsonNode response = JsonUtil.parseJsonObject(responseStr);
String newVersion = response.get("tag_name").asText();
String downloadUrl = StrUtil.format(UpgradeConfig.DOWNLOAD_API,
app.getOwner(),
app.getRepo(),
newVersion,
app.getReleaseFile()
);
runLater(() -> {
vm.aListUpgradeProperty().setValue(StringUtils.equals(app.getVersion(), newVersion));
vm.aListNewVersionProperty().setValue(newVersion);
});
}
}

View File

@ -1,12 +1,12 @@
package cn.octopusyan.alistgui.viewModel; package cn.octopusyan.alistgui.viewModel;
import cn.hutool.core.lang.Validator; import cn.octopusyan.alistgui.base.BaseTask;
import cn.hutool.core.net.url.UrlBuilder;
import cn.octopusyan.alistgui.config.ConfigManager;
import cn.octopusyan.alistgui.config.Context; import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.enums.ProxySetup; import cn.octopusyan.alistgui.enums.ProxySetup;
import cn.octopusyan.alistgui.manager.ConfigManager;
import cn.octopusyan.alistgui.task.UpgradeTask;
import cn.octopusyan.alistgui.util.alert.AlertUtil;
import javafx.beans.property.*; import javafx.beans.property.*;
import org.apache.commons.lang3.StringUtils;
import java.util.Locale; import java.util.Locale;
@ -20,19 +20,21 @@ public class SetupViewModel {
private final BooleanProperty silentStartup = new SimpleBooleanProperty(ConfigManager.silentStartup()); private final BooleanProperty silentStartup = new SimpleBooleanProperty(ConfigManager.silentStartup());
private final StringProperty proxyHost = new SimpleStringProperty(ConfigManager.proxyHost()); private final StringProperty proxyHost = new SimpleStringProperty(ConfigManager.proxyHost());
private final StringProperty proxyPort = new SimpleStringProperty(ConfigManager.proxyPort()); private final StringProperty proxyPort = new SimpleStringProperty(ConfigManager.proxyPort());
private final BooleanProperty proxyVerify = new SimpleBooleanProperty(false);
private final ObjectProperty<Locale> language = new SimpleObjectProperty<>(ConfigManager.language()); private final ObjectProperty<Locale> language = new SimpleObjectProperty<>(ConfigManager.language());
private final ObjectProperty<ProxySetup> proxySetup = new SimpleObjectProperty<>(ConfigManager.proxySetup()); private final ObjectProperty<ProxySetup> proxySetup = new SimpleObjectProperty<>(ConfigManager.proxySetup());
private final SimpleStringProperty aListVersion = new SimpleStringProperty(ConfigManager.aListVersion()); private final StringProperty aListVersion = new SimpleStringProperty(ConfigManager.aListVersion());
private final StringProperty aListNewVersion = new SimpleStringProperty("");
private final BooleanProperty aListUpgrade = new SimpleBooleanProperty(false);
public SetupViewModel() { public SetupViewModel() {
aListVersion.addListener((observable, oldValue, newValue) -> ConfigManager.aListVersion(newValue)); aListVersion.addListener((_, _, newValue) -> ConfigManager.aListVersion(newValue));
autoStart.addListener((observable, oldValue, newValue) -> ConfigManager.autoStart(newValue)); autoStart.addListener((_, _, newValue) -> ConfigManager.autoStart(newValue));
silentStartup.addListener((observable, oldValue, newValue) -> ConfigManager.silentStartup(newValue)); silentStartup.addListener((_, _, newValue) -> ConfigManager.silentStartup(newValue));
proxySetup.addListener((observable, oldValue, newValue) -> ConfigManager.proxySetup(newValue)); proxySetup.addListener((_, _, newValue) -> ConfigManager.proxySetup(newValue));
proxyHost.addListener((observable, oldValue, newValue) -> ConfigManager.proxyHost(newValue)); proxyHost.addListener((_, _, newValue) -> ConfigManager.proxyHost(newValue));
proxyPort.addListener((observable, oldValue, newValue) -> ConfigManager.proxyPort(newValue)); proxyPort.addListener((_, _, newValue) -> ConfigManager.proxyPort(newValue));
language.addListener((observable, oldValue, newValue) -> Context.setLanguage(newValue)); language.addListener((_, _, newValue) -> Context.setLanguage(newValue));
} }
public BooleanProperty autoStartProperty() { public BooleanProperty autoStartProperty() {
@ -63,25 +65,35 @@ public class SetupViewModel {
return aListVersion; return aListVersion;
} }
public BooleanProperty aListUpgradeProperty() {
return aListUpgrade;
}
public StringProperty aListNewVersionProperty() {
return aListNewVersion;
}
/** /**
* 验证代理地址 * 检查alist更新
*
* @param address 新的代理地址
* @return UrlBuilder, 验证失败时为null
*/ */
public UrlBuilder validateAddress(String address) { public void checkAListUpdate() {
if (StringUtils.isEmpty(address)) var task = new UpgradeTask(this, ConfigManager.aList());
return null; task.onListen(new BaseTask.Listener() {
@Override
public void onSucceeded() {
AlertUtil.info(STR."""
当前版本 : \{aListVersion.get()}
最新版本 : \{aListNewVersion.get()}
""")
.title("AList 更新提示")
.show();
}
// 验证 URL 的可用性 @Override
UrlBuilder ub = UrlBuilder.of(address); public void onFailed(Throwable throwable) {
boolean isUrlValid = Validator.isUrl(address) && ub.getPort() > 0; AlertUtil.exception(new Exception(throwable)).show();
}
// 设置 proxyVerify proxyVerifyMsg });
proxyVerify.setValue(isUrlValid); task.execute();
if (isUrlValid)
return ub;
else return null;
} }
} }

View File

@ -21,4 +21,6 @@ module cn.octopusyan.alistgui {
opens cn.octopusyan.alistgui to javafx.fxml; opens cn.octopusyan.alistgui to javafx.fxml;
opens cn.octopusyan.alistgui.model to com.fasterxml.jackson.databind; opens cn.octopusyan.alistgui.model to com.fasterxml.jackson.databind;
opens cn.octopusyan.alistgui.controller to javafx.fxml; opens cn.octopusyan.alistgui.controller to javafx.fxml;
opens cn.octopusyan.alistgui.base to com.fasterxml.jackson.databind;
opens cn.octopusyan.alistgui.model.upgrade to com.fasterxml.jackson.databind;
} }

View File

@ -50,7 +50,6 @@
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-text-fill: #9254d1; -fx-text-fill: #9254d1;
-fx-border-color: #9254d1; -fx-border-color: #9254d1;
-fx-border-width: 2;
} }
#logArea { #logArea {

View File

@ -3,59 +3,48 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:id="setupView" prefHeight="700" prefWidth="720" stylesheets="@../css/setup-view.css" <AnchorPane fx:id="setupView" prefHeight="700" prefWidth="720" stylesheets="@../css/setup-view.css"
xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="cn.octopusyan.alistgui.controller.SetupController"> fx:controller="cn.octopusyan.alistgui.controller.SetupController">
<padding> <padding>
<Insets left="10.0" right="10.0" top="20.0"/> <Insets left="10.0" right="10.0" top="20.0"/>
</padding> </padding>
<columnConstraints> <VBox spacing="20" AnchorPane.topAnchor="0" AnchorPane.leftAnchor="0">
<ColumnConstraints hgrow="SOMETIMES" percentWidth="100"/>
</columnConstraints>
<rowConstraints>
<RowConstraints vgrow="SOMETIMES"/>
<RowConstraints vgrow="SOMETIMES"/>
</rowConstraints>
<VBox spacing="20">
<CheckBox fx:id="autoStartCheckBox" text="%setup.auto-start.label"/> <CheckBox fx:id="autoStartCheckBox" text="%setup.auto-start.label"/>
<CheckBox fx:id="silentStartupCheckBox" text="%setup.silent-startup.label"/> <CheckBox fx:id="silentStartupCheckBox" text="%setup.silent-startup.label"/>
<HBox alignment="CENTER_LEFT" spacing="10"> <HBox alignment="CENTER_LEFT" spacing="10">
<Label text="%setup.language"/> <Label text="%setup.language"/>
<ComboBox fx:id="languageComboBox"/> <ComboBox fx:id="languageComboBox"/>
</HBox> </HBox>
<HBox alignment="CENTER_LEFT" spacing="20">
<Label styleClass="proxy-label" text="%setup.proxy"/>
<ComboBox fx:id="proxySetupComboBox"/>
<Button fx:id="proxyCheck" text="%setup.proxy.test"/>
</HBox>
<VBox fx:id="proxySetupPane" spacing="10">
<HBox alignment="CENTER_LEFT" spacing="20"> <HBox alignment="CENTER_LEFT" spacing="20">
<Label text="%setup.proxyInfo" styleClass="proxyInfo-label"/> <Label text="%setup.proxy.host"/>
<ComboBox fx:id="proxySetupComboBox"/> <TextField fx:id="proxyHost" promptText="127.0.0.1"/>
</HBox> </HBox>
<!-- <HBox spacing="10" visible="false">--> <HBox alignment="CENTER_LEFT" spacing="20">
<!-- <RadioButton fx:id="noProxy" text="%proxyInfo.setup.label.no_proxy"/>--> <Label text="%setup.proxy.port"/>
<!-- <RadioButton fx:id="systemProxy" text="%proxyInfo.setup.label.system"/>--> <TextField fx:id="proxyPort" promptText="8080"/>
<!-- <RadioButton fx:id="manualProxy" text="%proxyInfo.setup.label.manual"/>--> </HBox>
<!-- </HBox>--> </VBox>
<VBox fx:id="proxySetupPane" spacing="10">
<HBox spacing="20" alignment="CENTER_LEFT">
<Label text="%setup.proxyInfo.host"/>
<TextField fx:id="proxyHost" promptText="127.0.0.1"/>
</HBox>
<HBox spacing="20" alignment="CENTER_LEFT">
<Label text="%setup.proxyInfo.port"/>
<TextField fx:id="proxyPort" promptText="8080"/>
</HBox>
</VBox>
</VBox> </VBox>
<AnchorPane GridPane.rowIndex="1"> <AnchorPane AnchorPane.rightAnchor="0" AnchorPane.bottomAnchor="0">
<VBox alignment="CENTER" spacing="10" <VBox alignment="CENTER" spacing="10" AnchorPane.bottomAnchor="50" AnchorPane.rightAnchor="0"
AnchorPane.bottomAnchor="50" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"> AnchorPane.topAnchor="0">
<HBox alignment="CENTER" styleClass="shield"> <HBox alignment="CENTER" styleClass="shield">
<Label text="%alist.version" styleClass="shield-name"/> <Label styleClass="shield-name" text="%alist.version"/>
<Label fx:id="alistVersion" styleClass="shield-version"/> <Label fx:id="aListVersion" styleClass="shield-version"/>
</HBox> </HBox>
<HBox alignment="CENTER" styleClass="shield"> <HBox alignment="CENTER" styleClass="shield">
<Label text="%app.version" styleClass="shield-name"/> <Label styleClass="shield-name" text="%app.version"/>
<Label text="${project.version}" styleClass="shield-version"/> <Label styleClass="shield-version" text="v${project.version}"/>
</HBox> </HBox>
<Button text="%app.update"/> <Button fx:id="checkAppVersion" text="%app.update"/>
<Button text="%alist.update"/> <Button fx:id="checkAListVersion" onAction="#checkAListUpdate" text="%alist.update"/>
</VBox> </VBox>
</AnchorPane> </AnchorPane>
</GridPane> </AnchorPane>

View File

@ -11,7 +11,7 @@ main.status.label-running=\u8FD0\u884C\u4E2D
main.status.label-stop=\u5DF2\u505C\u6B62 main.status.label-stop=\u5DF2\u505C\u6B62
main.more.browser=\u5728\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00 main.more.browser=\u5728\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00
main.more.open-log=\u6253\u5F00\u65E5\u5FD7\u6587\u4EF6\u5939 main.more.open-log=\u6253\u5F00\u65E5\u5FD7\u6587\u4EF6\u5939
setup.proxyInfo=HTTP\u4EE3\u7406 setup.proxy=HTTP\u4EE3\u7406
setup.auto-start.label=\u5F00\u673A\u81EA\u542F setup.auto-start.label=\u5F00\u673A\u81EA\u542F
setup.silent-startup.label=\u9759\u9ED8\u542F\u52A8 setup.silent-startup.label=\u9759\u9ED8\u542F\u52A8
setup.language=\u8BED\u8A00 setup.language=\u8BED\u8A00
@ -19,9 +19,10 @@ alist.version=AList \u7248\u672C
app.version=GUI \u7248\u672C app.version=GUI \u7248\u672C
alist.update=\u68C0\u67E5 AList \u7248\u672C alist.update=\u68C0\u67E5 AList \u7248\u672C
app.update=\u68C0\u67E5 GUI \u7248\u672C app.update=\u68C0\u67E5 GUI \u7248\u672C
setup.proxyInfo.host=\u4E3B\u673A setup.proxy.host=\u4E3B\u673A
setup.proxyInfo.port=\u7AEF\u53E3 setup.proxy.port=\u7AEF\u53E3
proxy.setup.label.no_proxy=\u4E0D\u4EE3\u7406 proxy.setup.label.no_proxy=\u4E0D\u4EE3\u7406
proxy.setup.label.system=\u7CFB\u7EDF\u4EE3\u7406 proxy.setup.label.system=\u7CFB\u7EDF\u4EE3\u7406
proxy.setup.label.manual=\u624B\u52A8\u8BBE\u7F6E proxy.setup.label.manual=\u624B\u52A8\u8BBE\u7F6E
setup.proxy.test=\u6D4B\u8BD5

View File

@ -11,7 +11,7 @@ main.status.label-running=Running
main.status.label-stop=Stoped main.status.label-stop=Stoped
main.more.browser=Open in browser main.more.browser=Open in browser
main.more.open-log=Open the log folder main.more.open-log=Open the log folder
setup.proxyInfo=HTTP PROXY setup.proxy=HTTP PROXY
setup.auto-start.label=Auto start with PC setup.auto-start.label=Auto start with PC
setup.silent-startup.label=Silent startup setup.silent-startup.label=Silent startup
setup.language=language setup.language=language
@ -19,9 +19,10 @@ alist.version=AList Version
app.version=GUI Version app.version=GUI Version
alist.update=Check AList Version alist.update=Check AList Version
app.update=Check GUI Version app.update=Check GUI Version
setup.proxyInfo.host=Host setup.proxy.host=Host
setup.proxyInfo.port=Port setup.proxy.port=Port
proxy.setup.label.no_proxy=No Proxy proxy.setup.label.no_proxy=No Proxy
proxy.setup.label.system=System Proxy proxy.setup.label.system=System Proxy
proxy.setup.label.manual=Manual Config proxy.setup.label.manual=Manual Config
setup.proxy.test=Check connection

View File

@ -11,7 +11,7 @@ main.status.label-running=\u8FD0\u884C\u4E2D
main.status.label-stop=\u5DF2\u505C\u6B62 main.status.label-stop=\u5DF2\u505C\u6B62
main.more.browser=\u5728\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00 main.more.browser=\u5728\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00
main.more.open-log=\u6253\u5F00\u65E5\u5FD7\u6587\u4EF6\u5939 main.more.open-log=\u6253\u5F00\u65E5\u5FD7\u6587\u4EF6\u5939
setup.proxyInfo=HTTP\u4EE3\u7406 setup.proxy=HTTP\u4EE3\u7406
setup.auto-start.label=\u5F00\u673A\u81EA\u542F setup.auto-start.label=\u5F00\u673A\u81EA\u542F
setup.silent-startup.label=\u9759\u9ED8\u542F\u52A8 setup.silent-startup.label=\u9759\u9ED8\u542F\u52A8
setup.language=\u8BED\u8A00 setup.language=\u8BED\u8A00
@ -19,9 +19,10 @@ alist.version=AList \u7248\u672C
app.version=GUI \u7248\u672C app.version=GUI \u7248\u672C
alist.update=\u68C0\u67E5 AList \u7248\u672C alist.update=\u68C0\u67E5 AList \u7248\u672C
app.update=\u68C0\u67E5 GUI \u7248\u672C app.update=\u68C0\u67E5 GUI \u7248\u672C
setup.proxyInfo.host=\u4E3B\u673A setup.proxy.host=\u4E3B\u673A
setup.proxyInfo.port=\u7AEF\u53E3 setup.proxy.port=\u7AEF\u53E3
proxy.setup.label.no_proxy=\u4E0D\u4EE3\u7406 proxy.setup.label.no_proxy=\u4E0D\u4EE3\u7406
proxy.setup.label.system=\u7CFB\u7EDF\u4EE3\u7406 proxy.setup.label.system=\u7CFB\u7EDF\u4EE3\u7406
proxy.setup.label.manual=\u624B\u52A8\u8BBE\u7F6E proxy.setup.label.manual=\u624B\u52A8\u8BBE\u7F6E
setup.proxy.test=\u6D4B\u8BD5