Compare commits

..

2 Commits
master ... dev

Author SHA1 Message Date
50cba0557f chore: rename BodyHandler 2024-12-21 22:08:20 +08:00
9e9a1b22b7 chore: 版本号 2024-12-16 12:32:09 +08:00
5 changed files with 18 additions and 17 deletions

View File

@ -7,11 +7,11 @@
<parent> <parent>
<groupId>cn.octopusyan</groupId> <groupId>cn.octopusyan</groupId>
<artifactId>alist-gui</artifactId> <artifactId>alist-gui</artifactId>
<version>${gui.version}</version> <version>1.0.3</version>
</parent> </parent>
<artifactId>gui</artifactId> <artifactId>gui</artifactId>
<version>${gui.version}</version> <version>1.0.3</version>
<name>alist-gui</name> <name>alist-gui</name>
<properties> <properties>
@ -21,8 +21,6 @@
<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>
<parent.version>${gui.version}</parent.version>
<exec.mainClass>cn.octopusyan.alistgui.AppLauncher</exec.mainClass> <exec.mainClass>cn.octopusyan.alistgui.AppLauncher</exec.mainClass>
<cssSrcPath>${project.basedir}/src/main/resources/css</cssSrcPath> <cssSrcPath>${project.basedir}/src/main/resources/css</cssSrcPath>
<cssTargetPath>${project.basedir}/target/classes/css</cssTargetPath> <cssTargetPath>${project.basedir}/target/classes/css</cssTargetPath>
@ -143,7 +141,7 @@
<groupId>us.hebi.sass</groupId> <groupId>us.hebi.sass</groupId>
<artifactId>sass-cli-maven-plugin</artifactId> <artifactId>sass-cli-maven-plugin</artifactId>
<configuration> <configuration>
<sassVersion>1.78.0</sassVersion> <sassVersion>1.81.0</sassVersion>
<args> <!-- Any argument that should be forwarded to the sass cli --> <args> <!-- Any argument that should be forwarded to the sass cli -->
<arg>${cssSrcPath}/root.scss:${cssTargetPath}/root.css</arg> <arg>${cssSrcPath}/root.scss:${cssTargetPath}/root.css</arg>
<arg>${cssSrcPath}/root-view.scss:${cssTargetPath}/root-view.css</arg> <arg>${cssSrcPath}/root-view.scss:${cssTargetPath}/root-view.css</arg>
@ -263,7 +261,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<configuration> <configuration>
<nonFilteredFileExtensions> <nonFilteredFileExtensions>
<nonFilteredFileExtension>exe</nonFilteredFileExtension> <nonFilteredFileExtension>exe</nonFilteredFileExtension>

View File

@ -1,7 +1,7 @@
package cn.octopusyan.alistgui.manager.http; package cn.octopusyan.alistgui.manager.http;
import cn.octopusyan.alistgui.enums.ProxySetup; import cn.octopusyan.alistgui.enums.ProxySetup;
import cn.octopusyan.alistgui.manager.http.handler.BodyHandler; import cn.octopusyan.alistgui.manager.http.handler.DownloadBodyHandler;
import cn.octopusyan.alistgui.model.ProxyInfo; import cn.octopusyan.alistgui.model.ProxyInfo;
import cn.octopusyan.alistgui.util.JsonUtil; import cn.octopusyan.alistgui.util.JsonUtil;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
@ -126,7 +126,7 @@ public class HttpUtil {
} }
// 下载处理器 // 下载处理器
var handler = BodyHandler.create( var handler = DownloadBodyHandler.create(
Path.of(savePath), Path.of(savePath),
StandardOpenOption.CREATE, StandardOpenOption.WRITE StandardOpenOption.CREATE, StandardOpenOption.WRITE
); );

View File

@ -21,16 +21,16 @@ import java.util.function.Consumer;
* @author octopus_yan * @author octopus_yan
*/ */
@Slf4j @Slf4j
public class BodyHandler implements HttpResponse.BodyHandler<Path> { public class DownloadBodyHandler implements HttpResponse.BodyHandler<Path> {
private final HttpResponse.BodyHandler<Path> handler; private final HttpResponse.BodyHandler<Path> handler;
private BiConsumer<Long, Long> consumer; private BiConsumer<Long, Long> consumer;
private BodyHandler(HttpResponse.BodyHandler<Path> handler) { private DownloadBodyHandler(HttpResponse.BodyHandler<Path> handler) {
this.handler = handler; this.handler = handler;
} }
public static BodyHandler create(Path directory, OpenOption... openOptions) { public static DownloadBodyHandler create(Path directory, OpenOption... openOptions) {
return new BodyHandler(HttpResponse.BodyHandlers.ofFileDownload(directory, openOptions)); return new DownloadBodyHandler(HttpResponse.BodyHandlers.ofFileDownload(directory, openOptions));
} }
@Override @Override

10
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>cn.octopusyan</groupId> <groupId>cn.octopusyan</groupId>
<artifactId>alist-gui</artifactId> <artifactId>alist-gui</artifactId>
<version>${gui.version}</version> <version>1.0.3</version>
<name>alist-gui</name> <name>alist-gui</name>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -30,8 +30,6 @@
<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>
<gui.version>1.0.3</gui.version>
<junit.version>5.10.0</junit.version> <junit.version>5.10.0</junit.version>
<javafx.version>21.0.4</javafx.version> <javafx.version>21.0.4</javafx.version>
<slf4j.version>2.0.16</slf4j.version> <slf4j.version>2.0.16</slf4j.version>
@ -167,6 +165,12 @@
<version>3.13.0</version> <version>3.13.0</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<!-- https://github.com/HebiRobotics/sass-cli-maven-plugin --> <!-- https://github.com/HebiRobotics/sass-cli-maven-plugin -->
<plugin> <plugin>
<groupId>us.hebi.sass</groupId> <groupId>us.hebi.sass</groupId>

View File

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