octopus_yan/alist-gui
1
0
Fork 0
mirror of https://github.com/octopusYan/alist-gui.git synced 2025-12-11 10:31:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 主界面启动按钮、命令执行工具

Browse Source
This commit is contained in:
octopus_yan
2024-09-12 22:04:25 +08:00
parent cfd7075c8f
commit c93837a7a9
10 changed files with 217 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/octopusyan/alistgui/Application.java
View File

@ -6,6 +6,7 @@ import cn.octopusyan.alistgui.manager.ConfigManager;
import cn.octopusyan.alistgui.manager.http.HttpConfig;
import cn.octopusyan.alistgui.manager.http.HttpUtil;
import cn.octopusyan.alistgui.manager.thread.ThreadPoolManager;
import cn.octopusyan.alistgui.util.ProcessesUtil;
import cn.octopusyan.alistgui.util.alert.AlertUtil;
import javafx.application.Platform;
import javafx.scene.Scene;
@ -92,6 +93,8 @@ public class Application extends javafx.application.Application {
@Override
public void stop() {
logger.info("application stop ...");
// 关闭所有命令
ProcessesUtil.destroyAll();
// 保存应用数据
ConfigManager.save();
// 停止所有线程

4
src/main/java/cn/octopusyan/alistgui/config/Constants.java
View File

@ -14,10 +14,12 @@ public class Constants {
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_VERSION = PropertiesUtils.getInstance().getProperty("app.version");
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 ALIST_FILE = STR."\{BIN_DIR_PATH}\{File.separator}alist.exe";
public static final String CONFIG_DIR_PATH = STR."\{DATA_DIR_PATH}\{File.separator}config";
public static final String GUI_CONFIG_PATH = STR."\{CONFIG_DIR_PATH}\{File.separator}gui.yaml";
public static final String BAK_FILE_PATH = STR."\{Constants.TMP_DIR_PATH}\{File.separator}bak";

41
src/main/java/cn/octopusyan/alistgui/controller/MainController.java
View File

@ -1,8 +1,12 @@
package cn.octopusyan.alistgui.controller;
import cn.octopusyan.alistgui.base.BaseController;
import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.manager.AListManager;
import cn.octopusyan.alistgui.manager.ConsoleLog;
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.ScrollPane;
import javafx.scene.layout.VBox;
import org.slf4j.Logger;
@ -22,6 +26,10 @@ public class MainController extends BaseController<VBox> {
public VBox logArea;
@FXML
public ScrollPane logAreaSp;
@FXML
public Button statusLabel;
@FXML
public Button startButton;
@Override
public VBox getRootPanel() {
@ -35,11 +43,42 @@ public class MainController extends BaseController<VBox> {
@Override
public void initViewStyle() {
AListManager.runningProperty().addListener(_ -> setStartButton(AListManager.isRunning()));
}
@Override
public void initViewAction() {
AListManager.runningProperty().addListener((_, _, running) -> setStartButton(running));
}
private void setStartButton(boolean running) {
String removeStyle = running ? "success" : "danger";
String addStyle = running ? "danger" : "success";
String button = Context.getLanguageBinding(STR."main.control.\{running ? "stop" : "start"}").get();
String status = Context.getLanguageBinding(STR."main.status.label-\{running ? "running" : "stop"}").get();
Platform.runLater(() -> {
startButton.getStyleClass().remove(removeStyle);
startButton.getStyleClass().add(addStyle);
startButton.textProperty().set(button);
statusLabel.getStyleClass().remove(addStyle);
statusLabel.getStyleClass().add(removeStyle);
statusLabel.textProperty().set(status);
});
}
@FXML
public void start() {
if (AListManager.isRunning()) {
AListManager.stop();
} else {
AListManager.start();
}
}
@FXML
public void restart() {
AListManager.restart();
}
}

85
src/main/java/cn/octopusyan/alistgui/manager/AListManager.java Normal file
View File

@ -0,0 +1,85 @@
package cn.octopusyan.alistgui.manager;
import cn.octopusyan.alistgui.config.Constants;
import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.util.ProcessesUtil;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.value.ChangeListener;
/**
* AList 管理
*
* @author octopus_yan
*/
public class AListManager {
public static final String START_COMMAND = STR."\{Constants.ALIST_FILE} server";
private static final ProcessesUtil util;
private static final BooleanProperty running = new SimpleBooleanProperty(false);
static {
util = ProcessesUtil.init(Constants.BIN_DIR_PATH);
}
public static BooleanProperty runningProperty() {
return running;
}
public static boolean isRunning() {
return running.get();
}
public static void start() {
ConsoleLog.info(getText("alist.status.start"));
if (running.get()) {
ConsoleLog.warning(getText("alist.status.start.running"));
return;
}
running.set(true);
util.exec(START_COMMAND, new ProcessesUtil.OnExecuteListener() {
@Override
public void onExecute(String msg) {
if (ConsoleLog.isInit())
ConsoleLog.msg(msg);
}
@Override
public void onExecuteSuccess(int exitValue) {
running.set(false);
}
@Override
public void onExecuteError(Exception e) {
running.set(false);
}
});
}
public static void stop() {
ConsoleLog.info(getText("alist.status.stop"));
if (!running.get()) {
ConsoleLog.warning(getText("alist.status.stop.stopped"));
return;
}
util.destroy();
}
static ChangeListener<Boolean> changeListener;
public static void restart() {
stop();
changeListener = (_, _, run) -> {
if (run) return;
start();
if (changeListener != null) {
running.removeListener(changeListener);
}
};
running.addListener(changeListener);
}
private static String getText(String code) {
return Context.getLanguageBinding(code).get();
}
}

91
src/main/java/cn/octopusyan/alistgui/util/ProcessesUtil.java
View File

@ -1,44 +1,66 @@
package cn.octopusyan.alistgui.util;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.exec.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
/**
* 命令工具类
*
* @author octopus_yan@foxmail.com
*/
@Slf4j
public class ProcessesUtil {
private static final Logger logger = LoggerFactory.getLogger(ProcessesUtil.class);
private static final String NEW_LINE = System.lineSeparator();
private static final DefaultExecuteResultHandler handler = new DefaultExecuteResultHandler();
public static boolean exec(String command) {
try {
exec(command, msg -> {});
handler.waitFor();
} catch (Exception e) {
logger.error("", e);
private final Executor executor = DefaultExecutor.builder().get();
private final ShutdownHookProcessDestroyer processDestroyer;
private DefaultExecuteResultHandler handler;
private final PumpStreamHandler streamHandler;
private OnExecuteListener listener;
private CommandLine commandLine;
private final LogOutputStream logout = new LogOutputStream() {
@Override
protected void processLine(String line, int logLevel) {
if (listener != null)
listener.onExecute(line + NEW_LINE);
}
return 0 == handler.getExitValue();
};
private static final Set<ProcessesUtil> set = new HashSet<>();
/**
* Prevent construction.
*/
private ProcessesUtil(String workingDirectory) {
streamHandler = new PumpStreamHandler(logout, logout);
executor.setStreamHandler(streamHandler);
executor.setWorkingDirectory(new File(workingDirectory));
executor.setExitValue(1);
processDestroyer = new ShutdownHookProcessDestroyer();
executor.setProcessDestroyer(processDestroyer);
}
public static void exec(String command, OnExecuteListener listener) {
LogOutputStream logout = new LogOutputStream() {
@Override
protected void processLine(String line, int logLevel) {
if (listener != null) listener.onExecute(line + NEW_LINE);
}
};
public static ProcessesUtil init(String workingDirectory) {
ProcessesUtil util = new ProcessesUtil(workingDirectory);
set.add(util);
return util;
}
CommandLine commandLine = CommandLine.parse(command);
DefaultExecutor executor = DefaultExecutor.builder().get();
executor.setStreamHandler(new PumpStreamHandler(logout, logout));
DefaultExecuteResultHandler handler = new DefaultExecuteResultHandler() {
public boolean exec(String command) throws IOException {
commandLine = CommandLine.parse(command);
int execute = executor.execute(commandLine);
return 0 == execute;
}
public void exec(String command, OnExecuteListener listener) {
this.listener = listener;
commandLine = CommandLine.parse(command);
handler = new DefaultExecuteResultHandler() {
@Override
public void onProcessComplete(int exitValue) {
if (listener != null) {
@ -60,15 +82,22 @@ public class ProcessesUtil {
}
}
public interface OnExecuteListener {
void onExecute(String msg);
default void onExecuteSuccess(int exitValue){}
default void onExecuteError(Exception e){}
public void destroy() {
if (processDestroyer.isEmpty()) return;
processDestroyer.run();
}
/**
* Prevent construction.
*/
private ProcessesUtil() {
public static void destroyAll() {
set.forEach(ProcessesUtil::destroy);
}
public interface OnExecuteListener {
void onExecute(String msg);
default void onExecuteSuccess(int exitValue) {
}
default void onExecuteError(Exception e) {
}
}
}