octopus_yan/alist-gui
1
0
Fork 0
mirror of https://github.com/octopusYan/alist-gui.git synced 2024-11-23 20:46:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: octopus_yan:08b4ad98ed29299d196c9fd6bdbee8a16aac35a0
Branches Tags
octopus_yan:master
octopus_yan:dev
octopus_yan:v1.0.3-beta
octopus_yan:alpha/v1.0.3-alpha.1.d007.g6a4e425
octopus_yan:alpha/v1.0.3-alpha.1.d002.g894439d
octopus_yan:alpha/v1.0.3-alpha.1.d003.g08b4ad9
octopus_yan:alpha/v1.0.3-alpha.1.d002.g3414f0f
octopus_yan:alpha/v1.0.3-alpha.1.d001.g9bbc3f4
octopus_yan:v1.0.2
octopus_yan:alpha/v1.0.2-alpha.1.d006.gea922e6
octopus_yan:alpha/v1.0.2-alpha.1.d004.g30f0524
octopus_yan:alpha/v1.0.2-alpha.1.d002.g4988cdc
octopus_yan:alpha/v1.0.1-alpha.1.d016.g6670dc7
octopus_yan:alpha/v1.0.1-alpha.1.d014.g7e0ec8b
octopus_yan:v1.0.1
octopus_yan:alpha/v1.0.1-alpha.1.d012.gb9e842a
octopus_yan:alpha/v1.0.1-alpha.1.d007.g828a2fd
octopus_yan:alpha/v1.0.1-alpha.1.d005.g0660674
octopus_yan:alpha/v1.0.1-alpha.1.d004.g1b3a4f5
octopus_yan:alpha/v1.0.1-alpha.1.d001.g329c484
octopus_yan:v1.0.0
octopus_yan:alpha/v1.0.1-alpha.1.d000.gec585ea
octopus_yan:alpha/v0.0.2-alpha.1.d039.g5a8e121
octopus_yan:v0.0.1
..
compare: octopus_yan:4dc13bb8f1bd65deeb8b72a788b9f9d072a36499
Branches Tags
octopus_yan:dev
octopus_yan:master
octopus_yan:v1.0.3-beta
octopus_yan:alpha/v1.0.3-alpha.1.d007.g6a4e425
octopus_yan:alpha/v1.0.3-alpha.1.d002.g894439d
octopus_yan:alpha/v1.0.3-alpha.1.d003.g08b4ad9
octopus_yan:alpha/v1.0.3-alpha.1.d002.g3414f0f
octopus_yan:alpha/v1.0.3-alpha.1.d001.g9bbc3f4
octopus_yan:v1.0.2
octopus_yan:alpha/v1.0.2-alpha.1.d006.gea922e6
octopus_yan:alpha/v1.0.2-alpha.1.d004.g30f0524
octopus_yan:alpha/v1.0.2-alpha.1.d002.g4988cdc
octopus_yan:alpha/v1.0.1-alpha.1.d016.g6670dc7
octopus_yan:alpha/v1.0.1-alpha.1.d014.g7e0ec8b
octopus_yan:v1.0.1
octopus_yan:alpha/v1.0.1-alpha.1.d012.gb9e842a
octopus_yan:alpha/v1.0.1-alpha.1.d007.g828a2fd
octopus_yan:alpha/v1.0.1-alpha.1.d005.g0660674
octopus_yan:alpha/v1.0.1-alpha.1.d004.g1b3a4f5
octopus_yan:alpha/v1.0.1-alpha.1.d001.g329c484
octopus_yan:v1.0.0
octopus_yan:alpha/v1.0.1-alpha.1.d000.gec585ea
octopus_yan:alpha/v0.0.2-alpha.1.d039.g5a8e121
octopus_yan:v0.0.1

No commits in common. "08b4ad98ed29299d196c9fd6bdbee8a16aac35a0" and "4dc13bb8f1bd65deeb8b72a788b9f9d072a36499" have entirely different histories.
08b4ad98ed ... 4dc13bb8f1

95 changed files with 288 additions and 1057 deletions
Show Stats Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@ -118,7 +118,7 @@ jobs:
- name: Build with Maven
run: |
mvn clean package -f pom.xml
mkdir zipball && cp ../target/*.zip zipball
mkdir zipball && cp target/*.zip zipball
- name: Upload AListGUI to Github
if: startsWith(github.ref, 'refs/tags/v')

1
.gitignore vendored
View File

@ -8,7 +8,6 @@ target/
!**/src/test/**/target/
/bin/
gui.yaml
upgrade.exe
### IntelliJ IDEA ###
.idea/

296
gui/pom.xml
View File

@ -1,296 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.octopusyan</groupId>
<artifactId>alist-gui</artifactId>
<version>1.0.1</version>
</parent>
<artifactId>gui</artifactId>
<version>${parent.version}</version>
<name>alist-gui</name>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<exec.mainClass>cn.octopusyan.alistgui.AppLauncher</exec.mainClass>
<cssSrcPath>${project.basedir}/src/main/resources/css</cssSrcPath>
<cssTargetPath>${project.basedir}/target/classes/css</cssTargetPath>
</properties>
<dependencies>
<!-- javafx -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
</dependency>
<!-- https://mkpaz.github.io/atlantafx/ -->
<dependency>
<groupId>io.github.mkpaz</groupId>
<artifactId>atlantafx-base</artifactId>
</dependency>
<!-- slf4j -->
<!-- https://slf4j.org/manual.html -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<!-- common -->
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-exec -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
</dependency>
<!-- hutool -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
</dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<!-- https://kordamp.org/ikonli/ -->
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-javafx</artifactId>
</dependency>
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-fontawesome-pack</artifactId>
</dependency>
<dependency>
<groupId>com.gluonhq</groupId>
<artifactId>emoji</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>css/*.scss</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>21</source>
<target>21</target>
<compilerArgs>--enable-preview</compilerArgs>
<encoding>UTF-8</encoding>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<!-- https://github.com/HebiRobotics/sass-cli-maven-plugin -->
<plugin>
<groupId>us.hebi.sass</groupId>
<artifactId>sass-cli-maven-plugin</artifactId>
<configuration>
<sassVersion>1.78.0</sassVersion>
<args> <!-- Any argument that should be forwarded to the sass cli -->
<arg>${cssSrcPath}/root.scss:${cssTargetPath}/root.css</arg>
<arg>${cssSrcPath}/root-view.scss:${cssTargetPath}/root-view.css</arg>
<arg>${cssSrcPath}/main-view.scss:${cssTargetPath}/main-view.css</arg>
<arg>${cssSrcPath}/setup-view.scss:${cssTargetPath}/setup-view.css</arg>
<arg>${cssSrcPath}/about-view.scss:${cssTargetPath}/about-view.css</arg>
<arg>${cssSrcPath}/admin-panel.scss:${cssTargetPath}/admin-panel.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>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<configuration>
<stripDebug>true</stripDebug>
<compress>2</compress>
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<launcher>alistgui</launcher>
<jlinkImageName>app</jlinkImageName>
<jlinkZipName>app</jlinkZipName>
<mainClass>cn.octopusyan.alistgui/${exec.mainClass}</mainClass>
</configuration>
<executions>
<execution>
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
<stripDebug>true</stripDebug>
<compress>2</compress>
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<launcher>alist-gui</launcher>
<jlinkImageName>app</jlinkImageName>
<jlinkZipName>app</jlinkZipName>
<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>-->
</options>
</configuration>
</execution>
</executions>
</plugin>
<!-- https://github.com/fvarrui/JavaPackager -->
<plugin>
<groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId>
<configuration>
<mainClass>${exec.mainClass}</mainClass>
<bundleJre>true</bundleJre>
<generateInstaller>false</generateInstaller>
<copyDependencies>true</copyDependencies>
<assetsDir>${project.basedir}/src/main/resources/assets</assetsDir>
<vmArgs>
<arg>--enable-preview</arg>
<arg>-Xmx100m</arg>
</vmArgs>
</configuration>
<executions>
<execution>
<id>windows</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>windows</platform>
<zipballName>${project.name}-windows</zipballName>
<createZipball>true</createZipball>
<winConfig>
<headerType>gui</headerType>
<generateMsi>false</generateMsi>
</winConfig>
<additionalResources>
<additionalResource>${project.basedir}/src/main/resources/static/upgrade.exe
</additionalResource>
</additionalResources>
</configuration>
</execution>
<execution>
<id>windows-nojre</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<zipballName>${project.name}-windows-nojre</zipballName>
<platform>windows</platform>
<createZipball>true</createZipball>
<bundleJre>false</bundleJre>
<winConfig>
<headerType>gui</headerType>
<generateMsi>false</generateMsi>
</winConfig>
<additionalResources>
<additionalResource>${project.basedir}/src/main/resources/static/upgrade.exe
</additionalResource>
</additionalResources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>exe</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
<executions>
<execution>
<id>copy-resources</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>UTF-8</encoding>
<!--打成jar包后复制到的路径-->
<outputDirectory>../target</outputDirectory>
<resources>
<resource>
<!--项目中需要复制的文件路径-->
<directory>${project.basedir}/target</directory>
<includes>
<include>*.zip</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

352
pom.xml
View File

@ -6,9 +6,8 @@
<groupId>cn.octopusyan</groupId>
<artifactId>alist-gui</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<name>alist-gui</name>
<packaging>pom</packaging>
<organization>
<name>octopus_yan</name>
@ -18,11 +17,6 @@
<inceptionYear>2024</inceptionYear>
<description>AList GUI</description>
<modules>
<module>upgrade</module>
<module>gui</module>
</modules>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
@ -30,7 +24,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.version>1.0.1</project.version>
<exec.mainClass>cn.octopusyan.alistgui.AppLauncher</exec.mainClass>
<cssSrcPath>${project.basedir}/src/main/resources/css</cssSrcPath>
<cssTargetPath>${project.basedir}/target/classes/css</cssTargetPath>
<junit.version>5.10.0</junit.version>
<javafx.version>21.0.4</javafx.version>
@ -46,101 +42,97 @@
<gluonhq-emoji.version>1.0.1</gluonhq-emoji.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- javafx -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependencies>
<!-- https://mkpaz.github.io/atlantafx/ -->
<dependency>
<groupId>io.github.mkpaz</groupId>
<artifactId>atlantafx-base</artifactId>
<version>2.0.1</version>
</dependency>
<!-- javafx -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>${javafx.version}</version>
</dependency>
<!-- slf4j -->
<!-- https://slf4j.org/manual.html -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- https://mkpaz.github.io/atlantafx/ -->
<dependency>
<groupId>io.github.mkpaz</groupId>
<artifactId>atlantafx-base</artifactId>
<version>2.0.1</version>
</dependency>
<!-- common -->
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${common-lang3.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-exec -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
<version>${common-exec.version}</version>
</dependency>
<!-- slf4j -->
<!-- https://slf4j.org/manual.html -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- hutool -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- common -->
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${common-lang3.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-exec -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
<version>${common-exec.version}</version>
</dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<!-- hutool -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<!-- https://kordamp.org/ikonli/ -->
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-javafx</artifactId>
<version>${ikonli.version}</version>
</dependency>
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-fontawesome-pack</artifactId>
<version>${ikonli.version}</version>
</dependency>
<dependency>
<groupId>com.gluonhq</groupId>
<artifactId>emoji</artifactId>
<version>${gluonhq-emoji.version}</version>
</dependency>
<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- https://kordamp.org/ikonli/ -->
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-javafx</artifactId>
<version>${ikonli.version}</version>
</dependency>
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-fontawesome-pack</artifactId>
<version>${ikonli.version}</version>
</dependency>
<dependency>
<groupId>com.gluonhq</groupId>
<artifactId>emoji</artifactId>
<version>${gluonhq-emoji.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</dependencies>
<pluginRepositories>
<pluginRepository>
@ -158,35 +150,153 @@
</pluginRepositories>
<build>
<pluginManagement>
<plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>css/*.scss</exclude>
</excludes>
</resource>
</resources>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
</plugin>
<plugins>
<!-- 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.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>21</source>
<target>21</target>
<compilerArgs>--enable-preview</compilerArgs>
<encoding>UTF-8</encoding>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</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>
<configuration>
<sassVersion>1.78.0</sassVersion>
<args> <!-- Any argument that should be forwarded to the sass cli -->
<arg>${cssSrcPath}/root.scss:${cssTargetPath}/root.css</arg>
<arg>${cssSrcPath}/root-view.scss:${cssTargetPath}/root-view.css</arg>
<arg>${cssSrcPath}/main-view.scss:${cssTargetPath}/main-view.css</arg>
<arg>${cssSrcPath}/setup-view.scss:${cssTargetPath}/setup-view.css</arg>
<arg>${cssSrcPath}/about-view.scss:${cssTargetPath}/about-view.css</arg>
<arg>${cssSrcPath}/admin-panel.scss:${cssTargetPath}/admin-panel.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>
<!-- https://github.com/fvarrui/JavaPackager -->
<plugin>
<groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId>
<version>1.7.7-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<stripDebug>true</stripDebug>
<compress>2</compress>
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<launcher>alistgui</launcher>
<jlinkImageName>app</jlinkImageName>
<jlinkZipName>app</jlinkZipName>
<mainClass>cn.octopusyan.alistgui/${exec.mainClass}</mainClass>
</configuration>
<executions>
<execution>
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
<stripDebug>true</stripDebug>
<compress>2</compress>
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<launcher>alist-gui</launcher>
<jlinkImageName>app</jlinkImageName>
<jlinkZipName>app</jlinkZipName>
<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>-->
</options>
</configuration>
</execution>
</executions>
</plugin>
<!-- https://github.com/fvarrui/JavaPackager -->
<plugin>
<groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId>
<version>1.7.7-SNAPSHOT</version>
<configuration>
<mainClass>${exec.mainClass}</mainClass>
<bundleJre>true</bundleJre>
<generateInstaller>false</generateInstaller>
<copyDependencies>true</copyDependencies>
<assetsDir>${project.basedir}/src/main/resources/assets</assetsDir>
<vmArgs>
<arg>--enable-preview</arg>
<arg>-Xmx100m</arg>
</vmArgs>
</configuration>
<executions>
<execution>
<id>windows</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>windows</platform>
<zipballName>${project.name}-windows</zipballName>
<createZipball>true</createZipball>
<winConfig>
<headerType>gui</headerType>
<generateMsi>false</generateMsi>
</winConfig>
</configuration>
</execution>
<execution>
<id>windows-nojre</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<zipballName>${project.name}-windows-nojre</zipballName>
<platform>windows</platform>
<createZipball>true</createZipball>
<bundleJre>false</bundleJre>
<winConfig>
<headerType>gui</headerType>
<generateMsi>false</generateMsi>
</winConfig>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0
gui/src/main/java/cn/octopusyan/alistgui/AppLauncher.java → src/main/java/cn/octopusyan/alistgui/AppLauncher.java
View File

27
gui/src/main/java/cn/octopusyan/alistgui/Application.java → src/main/java/cn/octopusyan/alistgui/Application.java
View File

@ -1,6 +1,5 @@
package cn.octopusyan.alistgui;
import cn.hutool.core.io.FileUtil;
import cn.octopusyan.alistgui.config.Constants;
import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.manager.ConfigManager;
@ -8,7 +7,6 @@ import cn.octopusyan.alistgui.manager.SystemTrayManager;
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.model.upgrade.Gui;
import cn.octopusyan.alistgui.util.ProcessesUtil;
import cn.octopusyan.alistgui.view.alert.AlertUtil;
import javafx.application.Platform;
@ -24,8 +22,6 @@ import java.io.*;
import java.net.*;
import java.net.http.HttpClient;
import java.util.Objects;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
@ -35,25 +31,11 @@ public class Application extends javafx.application.Application {
private static Stage primaryStage;
@Override
public void init() throws Exception {
public void init() {
logger.info("application init ...");
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());
if (upgradeFile.exists()) {
logger.error("upgradeFile.exists");
FileUtil.del(upgradeFile);
delay = 1000;
}
new Timer().schedule(new TimerTask() {
@Override
public void run() {
// 单例模式检查
makeSingle();
}
}, delay);
// 单例模式检查
makeSingle();
// 初始化客户端配置
ConfigManager.load();
@ -103,7 +85,7 @@ public class Application extends javafx.application.Application {
// 启动主界面
primaryStage.getIcons().add(new Image(Objects.requireNonNull(this.getClass().getResourceAsStream("/assets/logo.png"))));
primaryStage.initStyle(StageStyle.TRANSPARENT);
primaryStage.setTitle(String.format("%s %s", Constants.APP_TITLE, Constants.APP_VERSION));
primaryStage.setTitle(String.format("%s v%s", Constants.APP_TITLE, Constants.APP_VERSION));
Scene scene = Context.initScene();
primaryStage.setScene(scene);
@ -165,7 +147,6 @@ public class Application extends javafx.application.Application {
instanceCheckLatch.countDown();
while (true) {
logger.error(STR."====\{instanceId}====");
try (
Socket clientSocket = serverSocket.accept();
BufferedReader in = new BufferedReader(

0
gui/src/main/java/cn/octopusyan/alistgui/base/BaseBuilder.java → src/main/java/cn/octopusyan/alistgui/base/BaseBuilder.java
View File

3
gui/src/main/java/cn/octopusyan/alistgui/base/BaseController.java → src/main/java/cn/octopusyan/alistgui/base/BaseController.java
View File

@ -68,8 +68,7 @@ public abstract class BaseController<VM extends BaseViewModel> implements Initia
case Labeled labeled -> labeled.textProperty().bind(Context.getLanguageBinding(i18n.key()));
case Tab tab -> tab.textProperty().bind(Context.getLanguageBinding(i18n.key()));
case MenuItem mi -> mi.textProperty().bind(Context.getLanguageBinding(i18n.key()));
default -> {
}
default -> {}
}
}
}

0
gui/src/main/java/cn/octopusyan/alistgui/base/BaseTask.java → src/main/java/cn/octopusyan/alistgui/base/BaseTask.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/base/BaseViewModel.java → src/main/java/cn/octopusyan/alistgui/base/BaseViewModel.java
View File

2
gui/src/main/java/cn/octopusyan/alistgui/config/Constants.java → src/main/java/cn/octopusyan/alistgui/config/Constants.java
View File

@ -15,7 +15,7 @@ public class Constants {
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 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 TMP_DIR_PATH = System.getProperty("java.io.tmpdir") + APP_NAME;

0
gui/src/main/java/cn/octopusyan/alistgui/config/Context.java → src/main/java/cn/octopusyan/alistgui/config/Context.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/config/I18n.java → src/main/java/cn/octopusyan/alistgui/config/I18n.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/config/ObservableResourceBundleFactory.java → src/main/java/cn/octopusyan/alistgui/config/ObservableResourceBundleFactory.java
View File

5
gui/src/main/java/cn/octopusyan/alistgui/controller/AboutController.java → src/main/java/cn/octopusyan/alistgui/controller/AboutController.java
View File

@ -1,6 +1,7 @@
package cn.octopusyan.alistgui.controller;
import cn.octopusyan.alistgui.base.BaseController;
import cn.octopusyan.alistgui.config.I18n;
import cn.octopusyan.alistgui.manager.ConfigManager;
import cn.octopusyan.alistgui.viewModel.AboutViewModule;
import javafx.scene.control.Button;
@ -21,12 +22,16 @@ public class AboutController extends BaseController<AboutViewModule> {
public Label aListVersion;
@I18n(key = "about.alist.version")
public Label aListVersionLabel;
@I18n(key = "about.app.version")
public Label appVersionLabel;
@I18n(key = "about.app.update")
public Button checkAppVersion;
@I18n(key = "about.alist.update")
public Button checkAListVersion;
@Override

9
gui/src/main/java/cn/octopusyan/alistgui/controller/MainController.java → src/main/java/cn/octopusyan/alistgui/controller/MainController.java
View File

@ -2,6 +2,7 @@ package cn.octopusyan.alistgui.controller;
import cn.octopusyan.alistgui.base.BaseController;
import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.config.I18n;
import cn.octopusyan.alistgui.manager.AListManager;
import cn.octopusyan.alistgui.manager.ConsoleLog;
import cn.octopusyan.alistgui.util.FxmlUtil;
@ -31,20 +32,28 @@ public class MainController extends BaseController<MainViewModel> {
public VBox logArea;
public ScrollPane logAreaSp;
@I18n(key = "main.status.label-stop")
public Button statusLabel;
@I18n(key = "main.control.start")
public Button startButton;
@I18n(key = "main.control.password")
public Button passwordButton;
@I18n(key = "main.control.restart")
public Button restartButton;
@I18n(key = "main.control.more")
public MenuButton moreButton;
@I18n(key = "main.more.browser")
public MenuItem browserButton;
@I18n(key = "main.more.open-config")
public MenuItem configButton;
@I18n(key = "main.more.open-log")
public MenuItem logButton;
private PasswordController controller;

4
gui/src/main/java/cn/octopusyan/alistgui/controller/PasswordController.java → src/main/java/cn/octopusyan/alistgui/controller/PasswordController.java
View File

@ -4,6 +4,7 @@ import atlantafx.base.controls.Popover;
import cn.hutool.core.swing.clipboard.ClipboardUtil;
import cn.octopusyan.alistgui.base.BaseController;
import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.config.I18n;
import cn.octopusyan.alistgui.manager.AListManager;
import cn.octopusyan.alistgui.viewModel.AdminPanelViewModel;
import javafx.beans.value.ChangeListener;
@ -26,11 +27,14 @@ import org.apache.commons.lang3.StringUtils;
public class PasswordController extends BaseController<AdminPanelViewModel> {
public AnchorPane adminPanel;
@I18n(key = "admin.pwd.toptip")
public Label toptip;
@I18n(key = "admin.pwd.user-field")
public Label usernameLabel;
public TextField usernameField;
@FXML
public Button copyUsername;
@I18n(key = "admin.pwd.pwd-field")
public Label passwordLabel;
public PasswordField passwordField;
public Button refreshPassword;

7
gui/src/main/java/cn/octopusyan/alistgui/controller/RootController.java → src/main/java/cn/octopusyan/alistgui/controller/RootController.java
View File

@ -3,6 +3,7 @@ package cn.octopusyan.alistgui.controller;
import atlantafx.base.controls.ModalPane;
import cn.octopusyan.alistgui.base.BaseController;
import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.config.I18n;
import cn.octopusyan.alistgui.manager.ConfigManager;
import cn.octopusyan.alistgui.manager.SystemTrayManager;
import cn.octopusyan.alistgui.util.ViewUtil;
@ -40,13 +41,19 @@ public class RootController extends BaseController<RootViewModel> {
// 界面
public TabPane tabPane;
@I18n(key = "root.tab.main")
public Tab mainTab;
@I18n(key = "root.tab.setup")
public Tab setupTab;
@I18n(key = "root.tab.about")
public Tab aboutTab;
// footer
@I18n(key = "root.foot.doc")
public Button document;
@I18n(key = "root.foot.github")
public Button github;
@I18n(key = "root.foot.sponsor")
public Button sponsor;
private final ModalPane modalPane = new ModalPane();

10
gui/src/main/java/cn/octopusyan/alistgui/controller/SetupController.java → src/main/java/cn/octopusyan/alistgui/controller/SetupController.java
View File

@ -3,6 +3,7 @@ package cn.octopusyan.alistgui.controller;
import atlantafx.base.theme.Theme;
import cn.octopusyan.alistgui.base.BaseController;
import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.config.I18n;
import cn.octopusyan.alistgui.enums.ProxySetup;
import cn.octopusyan.alistgui.manager.ConfigManager;
import cn.octopusyan.alistgui.view.ProxySetupCell;
@ -30,20 +31,29 @@ public class SetupController extends BaseController<SetupViewModel> implements I
@FXML
public VBox setupView;
@I18n(key = "setup.auto-start.label")
public CheckBox autoStartCheckBox;
@I18n(key = "setup.silent-startup.label")
public CheckBox silentStartupCheckBox;
@I18n(key = "setup.close-to-tray.label")
public CheckBox closeToTrayCheckBox;
@I18n(key = "setup.theme")
public Label themeLabel;
public ComboBox<Theme> themeComboBox;
@I18n(key = "setup.language")
public Label languageLabel;
public ComboBox<Locale> languageComboBox;
@I18n(key = "setup.proxy")
public Label proxySetupLabel;
public ComboBox<ProxySetup> proxySetupComboBox;
public Pane proxySetupPane;
@I18n(key = "setup.proxy.test")
public Button proxyCheck;
public TextField proxyHost;
public TextField proxyPort;
@I18n(key = "setup.proxy.host")
public Label hostLabel;
@I18n(key = "setup.proxy.port")
public Label portLabel;
@Override

0
gui/src/main/java/cn/octopusyan/alistgui/enums/ProxySetup.java → src/main/java/cn/octopusyan/alistgui/enums/ProxySetup.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/AListManager.java → src/main/java/cn/octopusyan/alistgui/manager/AListManager.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java → src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java → src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/SystemTrayManager.java → src/main/java/cn/octopusyan/alistgui/manager/SystemTrayManager.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/http/HttpConfig.java → src/main/java/cn/octopusyan/alistgui/manager/http/HttpConfig.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/http/HttpUtil.java → src/main/java/cn/octopusyan/alistgui/manager/http/HttpUtil.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/http/handler/BodyHandler.java → src/main/java/cn/octopusyan/alistgui/manager/http/handler/BodyHandler.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/thread/ThreadFactory.java → src/main/java/cn/octopusyan/alistgui/manager/thread/ThreadFactory.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/manager/thread/ThreadPoolManager.java → src/main/java/cn/octopusyan/alistgui/manager/thread/ThreadPoolManager.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/model/AListConfig.java → src/main/java/cn/octopusyan/alistgui/model/AListConfig.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/model/GuiConfig.java → src/main/java/cn/octopusyan/alistgui/model/GuiConfig.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/model/ProxyInfo.java → src/main/java/cn/octopusyan/alistgui/model/ProxyInfo.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/model/UpgradeConfig.java → src/main/java/cn/octopusyan/alistgui/model/UpgradeConfig.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/model/upgrade/AList.java → src/main/java/cn/octopusyan/alistgui/model/upgrade/AList.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/model/upgrade/Gui.java → src/main/java/cn/octopusyan/alistgui/model/upgrade/Gui.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/model/upgrade/UpgradeApp.java → src/main/java/cn/octopusyan/alistgui/model/upgrade/UpgradeApp.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/task/CheckUpdateTask.java → src/main/java/cn/octopusyan/alistgui/task/CheckUpdateTask.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/task/DownloadTask.java → src/main/java/cn/octopusyan/alistgui/task/DownloadTask.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/task/ProxyCheckTask.java → src/main/java/cn/octopusyan/alistgui/task/ProxyCheckTask.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/task/listener/TaskListener.java → src/main/java/cn/octopusyan/alistgui/task/listener/TaskListener.java
View File

6
gui/src/main/java/cn/octopusyan/alistgui/util/DownloadUtil.java → src/main/java/cn/octopusyan/alistgui/util/DownloadUtil.java
View File

@ -62,10 +62,6 @@ public class DownloadUtil {
}
public static void unzip(UpgradeApp app) {
unzip(app, true);
}
public static void unzip(UpgradeApp app, boolean del) {
String parentPath = app instanceof AList ? Constants.BIN_DIR_PATH : Constants.DATA_DIR_PATH;
File file = new File(parentPath + File.separator + app.getReleaseFile());
@ -97,6 +93,6 @@ public class DownloadUtil {
});
// 解压完成后删除
if (del) FileUtil.del(file);
FileUtil.del(file);
}
}

0
gui/src/main/java/cn/octopusyan/alistgui/util/FxmlUtil.java → src/main/java/cn/octopusyan/alistgui/util/FxmlUtil.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/util/JsonUtil.java → src/main/java/cn/octopusyan/alistgui/util/JsonUtil.java
View File

2
gui/src/main/java/cn/octopusyan/alistgui/util/ProcessesUtil.java → src/main/java/cn/octopusyan/alistgui/util/ProcessesUtil.java
View File

@ -53,7 +53,7 @@ public class ProcessesUtil {
commandLine = CommandLine.parse(command);
int execute = 0;
try {
executor.execute(commandLine, new DefaultExecuteResultHandler());
execute = executor.execute(commandLine);
} catch (Exception e) {
log.error("exec", e);
}

0
gui/src/main/java/cn/octopusyan/alistgui/util/PropertiesUtils.java → src/main/java/cn/octopusyan/alistgui/util/PropertiesUtils.java
View File

6
gui/src/main/java/cn/octopusyan/alistgui/util/Registry.java → src/main/java/cn/octopusyan/alistgui/util/Registry.java
View File

@ -1,7 +1,5 @@
package cn.octopusyan.alistgui.util;
import lombok.Getter;
/**
* 注册表编辑
*
@ -47,7 +45,6 @@ public class Registry {
UNLOAD,
}
@Getter
public enum Root {
HKCR("HKEY_CLASSES_ROOT"),
HKCU("HKEY_CURRENT_USER"),
@ -62,6 +59,9 @@ public class Registry {
this.path = path;
}
public String getPath() {
return path;
}
}
public enum DataType {

0
gui/src/main/java/cn/octopusyan/alistgui/util/ViewUtil.java → src/main/java/cn/octopusyan/alistgui/util/ViewUtil.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/PopupMenu.java → src/main/java/cn/octopusyan/alistgui/view/PopupMenu.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/ProxySetupCell.java → src/main/java/cn/octopusyan/alistgui/view/ProxySetupCell.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/alert/AlertUtil.java → src/main/java/cn/octopusyan/alistgui/view/alert/AlertUtil.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/alert/builder/AlertBuilder.java → src/main/java/cn/octopusyan/alistgui/view/alert/builder/AlertBuilder.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/alert/builder/ChoiceBuilder.java → src/main/java/cn/octopusyan/alistgui/view/alert/builder/ChoiceBuilder.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/alert/builder/DefaultBuilder.java → src/main/java/cn/octopusyan/alistgui/view/alert/builder/DefaultBuilder.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/alert/builder/ProgressBuilder.java → src/main/java/cn/octopusyan/alistgui/view/alert/builder/ProgressBuilder.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/view/alert/builder/TextInputBuilder.java → src/main/java/cn/octopusyan/alistgui/view/alert/builder/TextInputBuilder.java
View File

15
gui/src/main/java/cn/octopusyan/alistgui/viewModel/AboutViewModule.java → src/main/java/cn/octopusyan/alistgui/viewModel/AboutViewModule.java
View File

@ -1,5 +1,6 @@
package cn.octopusyan.alistgui.viewModel;
import cn.octopusyan.alistgui.Application;
import cn.octopusyan.alistgui.base.BaseViewModel;
import cn.octopusyan.alistgui.config.Constants;
import cn.octopusyan.alistgui.config.Context;
@ -141,20 +142,24 @@ public class AboutViewModule extends BaseViewModel {
if (upgrade)
DownloadUtil.startDownload(app, newVersion, () -> {
// 下载完成后，解压并删除文件
DownloadUtil.unzip(app);
// 解压后
Platform.runLater(() -> {
switch (app) {
case AList _ -> {
// 下载完成后，解压并删除文件
DownloadUtil.unzip(app);
// 设置应用版本
aListVersion.setValue(aListNewVersion.getValue());
AListManager.restart();
}
case Gui _ -> {
log.info(STR."guiNewVersion => \{guiNewVersion.get()}");
// 启动升级程序
ProcessesUtil.init(Constants.DATA_DIR_PATH).exec("upgrade.exe");
Platform.exit();
// 重启
Platform.setImplicitExit(true);
Application.getPrimaryStage().close();
ProcessesUtil.init(Constants.DATA_DIR_PATH).exec(STR."\{Constants.APP_NAME}.exe");
}
default -> throw new IllegalStateException(STR."Unexpected value: \{app}");
}

0
gui/src/main/java/cn/octopusyan/alistgui/viewModel/AdminPanelViewModel.java → src/main/java/cn/octopusyan/alistgui/viewModel/AdminPanelViewModel.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/viewModel/MainViewModel.java → src/main/java/cn/octopusyan/alistgui/viewModel/MainViewModel.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/viewModel/RootViewModel.java → src/main/java/cn/octopusyan/alistgui/viewModel/RootViewModel.java
View File

0
gui/src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java → src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java
View File

1
gui/src/main/java/module-info.java → src/main/java/module-info.java
View File

@ -24,5 +24,4 @@ module cn.octopusyan.alistgui {
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;
exports cn.octopusyan.alistgui.model.upgrade;
}

0
gui/src/main/resources/application.properties → src/main/resources/application.properties
View File

0
gui/src/main/resources/assets/logo-about.png → src/main/resources/assets/logo-about.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

0
gui/src/main/resources/assets/logo-disabled.png → src/main/resources/assets/logo-disabled.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 960 B

After

Width:  |  Height:  |  Size: 960 B

0
gui/src/main/resources/assets/logo.png → src/main/resources/assets/logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
gui/src/main/resources/assets/logo.svg → src/main/resources/assets/logo.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
gui/src/main/resources/assets/windows/alist-gui.ico → src/main/resources/assets/windows/alist-gui.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
gui/src/main/resources/css/about-view.scss → src/main/resources/css/about-view.scss
View File

0
gui/src/main/resources/css/admin-panel.scss → src/main/resources/css/admin-panel.scss
View File

0
gui/src/main/resources/css/main-view.scss → src/main/resources/css/main-view.scss
View File

0
gui/src/main/resources/css/root-view.scss → src/main/resources/css/root-view.scss
View File

0
gui/src/main/resources/css/root.scss → src/main/resources/css/root.scss
View File

0
gui/src/main/resources/css/setup-view.scss → src/main/resources/css/setup-view.scss
View File

0
gui/src/main/resources/fxml/about-view.fxml → src/main/resources/fxml/about-view.fxml
View File

0
gui/src/main/resources/fxml/admin-panel.fxml → src/main/resources/fxml/admin-panel.fxml
View File

0
gui/src/main/resources/fxml/main-view.fxml → src/main/resources/fxml/main-view.fxml
View File

0
gui/src/main/resources/fxml/root-view.fxml → src/main/resources/fxml/root-view.fxml
View File

0
gui/src/main/resources/fxml/setup-view.fxml → src/main/resources/fxml/setup-view.fxml
View File

0
gui/src/main/resources/language/language.properties → src/main/resources/language/language.properties
View File

0
gui/src/main/resources/language/language_en.properties → src/main/resources/language/language_en.properties
View File

0
gui/src/main/resources/language/language_zh_CN.properties → src/main/resources/language/language_zh_CN.properties
View File

0
gui/src/main/resources/logback.xml → src/main/resources/logback.xml
View File

171
upgrade/pom.xml
View File

@ -1,171 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.octopusyan</groupId>
<artifactId>alist-gui</artifactId>
<version>1.0.1</version>
</parent>
<artifactId>upgrade</artifactId>
<version>${parent.version}</version>
<name>upgrade</name>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<exec.mainClass>cn.octopusyan.upgrade.AppLauncher</exec.mainClass>
</properties>
<dependencies>
<!-- javafx -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
</dependency>
<!-- https://mkpaz.github.io/atlantafx/ -->
<dependency>
<groupId>io.github.mkpaz</groupId>
<artifactId>atlantafx-base</artifactId>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>21</source>
<target>21</target>
<encoding>UTF-8</encoding>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<configuration>
<stripDebug>true</stripDebug>
<compress>2</compress>
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<launcher>upgrade</launcher>
<jlinkImageName>app</jlinkImageName>
<jlinkZipName>app</jlinkZipName>
<mainClass>cn.octopusyan.upgrade/${exec.mainClass}</mainClass>
</configuration>
<executions>
<execution>
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
<stripDebug>true</stripDebug>
<compress>2</compress>
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<launcher>upgrade</launcher>
<jlinkImageName>app</jlinkImageName>
<jlinkZipName>app</jlinkZipName>
<mainClass>cn.octopusyan.upgrade/${exec.mainClass}</mainClass>
</configuration>
</execution>
</executions>
</plugin>
<!-- https://github.com/fvarrui/JavaPackager -->
<plugin>
<groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId>
<configuration>
<mainClass>${exec.mainClass}</mainClass>
<bundleJre>true</bundleJre>
<generateInstaller>false</generateInstaller>
<copyDependencies>true</copyDependencies>
<vmArgs>
<arg>-Xmx100m</arg>
</vmArgs>
</configuration>
<executions>
<execution>
<id>windows</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>windows</platform>
<createZipball>false</createZipball>
<winConfig>
<headerType>gui</headerType>
<generateMsi>false</generateMsi>
</winConfig>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>UTF-8</encoding>
<!--打成jar包后复制到的路径-->
<outputDirectory>../gui/src/main/resources/static</outputDirectory>
<resources>
<resource>
<!--项目中需要复制的文件路径-->
<directory>./target/upgrade</directory>
<includes>
<include>upgrade.exe</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<!--可配置多个提取复制路径只需要 “<id>”名字不一样即可-->
</executions>
</plugin>
</plugins>
</build>
</project>

13
upgrade/src/main/java/cn/octopusyan/upgrade/AppLauncher.java
View File

@ -1,13 +0,0 @@
package cn.octopusyan.upgrade;
/**
* 启动类
*
* @author octopus_yan@foxmail.com
*/
public class AppLauncher {
public static void main(String[] args) {
Application.launch(Application.class, args);
}
}

35
upgrade/src/main/java/cn/octopusyan/upgrade/Application.java
View File

@ -1,35 +0,0 @@
package cn.octopusyan.upgrade;
import atlantafx.base.theme.PrimerLight;
import cn.octopusyan.upgrade.util.FxmlUtil;
import javafx.application.Platform;
import javafx.scene.Scene;
import javafx.scene.layout.Pane;
import javafx.stage.Stage;
import java.io.IOException;
import java.util.ResourceBundle;
public class Application extends javafx.application.Application {
@Override
public void start(Stage primaryStage) throws IOException {
// 主题样式
Application.setUserAgentStylesheet(new PrimerLight().getUserAgentStylesheet());
// 启动主界面
Pane root = FxmlUtil.init("/fxml/hello-view.fxml").load();
Scene scene = new Scene(root, 420, 240);
primaryStage.setTitle(ResourceBundle.getBundle("language/language").getString("title"));
primaryStage.setScene(scene);
primaryStage.show();
}
@Override
public void stop() {
// 关闭主界面
Platform.exit();
System.exit(0);
}
}

75
upgrade/src/main/java/cn/octopusyan/upgrade/alert/AlertUtil.java
View File

@ -1,75 +0,0 @@
package cn.octopusyan.upgrade.alert;
import cn.octopusyan.upgrade.alert.builder.*;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.stage.Stage;
import javafx.stage.Window;
/**
* 弹窗工具
*
* @author octopus_yan@foxmail.com
*/
public class AlertUtil {
private static Window mOwner;
public static void initOwner(Stage stage) {
AlertUtil.mOwner = stage;
}
public static AlertBuilder info(String content) {
return info().content(content).header(null);
}
public static AlertBuilder info() {
return alert(Alert.AlertType.INFORMATION);
}
public static AlertBuilder error(String message) {
return alert(Alert.AlertType.ERROR).header(null).content(message);
}
public static AlertBuilder warning() {
return alert(Alert.AlertType.WARNING);
}
public static AlertBuilder exception(Exception ex) {
return alert(Alert.AlertType.ERROR).exception(ex);
}
/**
* 确认对话框
*/
public static AlertBuilder confirm() {
return alert(Alert.AlertType.CONFIRMATION);
}
/**
* 自定义确认对话框 <p>
*
* @param buttons <code>"Cancel"</code> OR <code>"取消"</code> 为取消按钮
*/
public static AlertBuilder confirm(String... buttons) {
return confirm().buttons(buttons);
}
public static AlertBuilder confirm(ButtonType... buttons) {
return confirm().buttons(buttons);
}
public static AlertBuilder alert(Alert.AlertType type) {
return new AlertBuilder(mOwner, type);
}
public interface OnChoseListener {
void confirm();
default void cancelOrClose(ButtonType buttonType) {
}
}
public interface OnClickListener {
void onClicked(String result);
}
}

108
upgrade/src/main/java/cn/octopusyan/upgrade/alert/builder/AlertBuilder.java
View File

@ -1,108 +0,0 @@
package cn.octopusyan.upgrade.alert.builder;
import cn.octopusyan.upgrade.alert.AlertUtil;
import javafx.scene.control.*;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;
import javafx.stage.Window;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* @author octopus_yan
*/
public class AlertBuilder extends BaseBuilder<AlertBuilder, Alert> {
public AlertBuilder(Window owner, Alert.AlertType alertType) {
super(new Alert(alertType), owner);
}
public AlertBuilder buttons(String... buttons) {
dialog.getButtonTypes().addAll(getButtonList(buttons));
return this;
}
public AlertBuilder buttons(ButtonType... buttons) {
dialog.getButtonTypes().addAll(buttons);
return this;
}
public AlertBuilder exception(Exception ex) {
dialog.setTitle("Exception Dialog");
dialog.setHeaderText(ex.getClass().getSimpleName());
dialog.setContentText(ex.getMessage());
// 创建可扩展的异常。
var sw = new StringWriter();
var pw = new PrintWriter(sw);
ex.printStackTrace(pw);
var exceptionText = sw.toString();
var label = new Label("The exception stacktrace was :");
var textArea = new TextArea(exceptionText);
textArea.setEditable(false);
textArea.setWrapText(true);
textArea.setMaxWidth(Double.MAX_VALUE);
textArea.setMaxHeight(Double.MAX_VALUE);
GridPane.setVgrow(textArea, Priority.ALWAYS);
GridPane.setHgrow(textArea, Priority.ALWAYS);
var expContent = new GridPane();
expContent.setMaxWidth(Double.MAX_VALUE);
expContent.add(label, 0, 0);
expContent.add(textArea, 0, 1);
// 将可扩展异常设置到对话框窗格中。
dialog.getDialogPane().setExpandableContent(expContent);
return this;
}
/**
* 获取按钮列表
*
* @param buttons "Cancel" / "取消" 为取消按钮
*/
private List<ButtonType> getButtonList(String[] buttons) {
if (ArrayUtils.isEmpty(buttons)) return Collections.emptyList();
return Arrays.stream(buttons).map((type) -> {
ButtonBar.ButtonData buttonData = ButtonBar.ButtonData.OTHER;
if ("cancel".equals(StringUtils.lowerCase(type)) || "取消".equals(type)) {
return ButtonType.CANCEL;
}
return new ButtonType(type, buttonData);
}).collect(Collectors.toList());
}
/**
* AlertUtil.confirm
*/
public void show(AlertUtil.OnClickListener listener) {
Optional<ButtonType> result = dialog.showAndWait();
result.ifPresent(r -> listener.onClicked(r.getText()));
}
/**
* AlertUtil.confirm
*/
public void show(AlertUtil.OnChoseListener listener) {
Optional<ButtonType> result = dialog.showAndWait();
result.ifPresent(r -> {
if (r == ButtonType.OK) {
listener.confirm();
} else {
listener.cancelOrClose(r);
}
});
}
}

44
upgrade/src/main/java/cn/octopusyan/upgrade/alert/builder/BaseBuilder.java
View File

@ -1,44 +0,0 @@
package cn.octopusyan.upgrade.alert.builder;
import javafx.application.Platform;
import javafx.scene.control.Dialog;
import javafx.stage.Window;
import lombok.Getter;
/**
* @author octopus_yan
*/
@Getter
public abstract class BaseBuilder<T extends BaseBuilder<T, ?>, D extends Dialog<?>> {
protected D dialog;
public BaseBuilder(D dialog, Window mOwner) {
this.dialog = dialog;
if (mOwner != null)
this.dialog.initOwner(mOwner);
}
public T title(String title) {
dialog.setTitle(title);
return (T) this;
}
public T header(String header) {
dialog.setHeaderText(header);
return (T) this;
}
public T content(String content) {
dialog.setContentText(content);
return (T) this;
}
public void show() {
Platform.runLater(() -> dialog.showAndWait());
}
public void close() {
if (dialog.isShowing())
dialog.close();
}
}

19
upgrade/src/main/java/cn/octopusyan/upgrade/util/FxmlUtil.java
View File

@ -1,19 +0,0 @@
package cn.octopusyan.upgrade.util;
import javafx.fxml.FXMLLoader;
import javafx.fxml.JavaFXBuilderFactory;
import java.nio.charset.StandardCharsets;
import java.util.ResourceBundle;
public class FxmlUtil {
public static FXMLLoader init(String path) {
return new FXMLLoader(
FxmlUtil.class.getResource(path),
ResourceBundle.getBundle("language/language"),
new JavaFXBuilderFactory(),
null,
StandardCharsets.UTF_8
);
}
}

83
upgrade/src/main/java/cn/octopusyan/upgrade/view/HelloController.java
View File

@ -1,83 +0,0 @@
package cn.octopusyan.upgrade.view;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import cn.octopusyan.upgrade.alert.AlertUtil;
import javafx.application.Platform;
import javafx.fxml.FXML;
import java.io.*;
import java.nio.file.Paths;
import java.util.zip.ZipFile;
public class HelloController {
public static final String APP_NAME = "alist-gui";
public static final String PARENT_PATH = Paths.get("").toFile().getAbsolutePath();
@FXML
public void onUpdate() {
// 更新检查
File file = new File(PARENT_PATH + File.separator + APP_NAME + "-windows-nojre.zip");
if (!file.exists()) {
AlertUtil.error("The upgrade file does not exist!").show();
return;
}
// 解压
unzip();
// 启动GUI
startGui();
// 退出
onExit();
}
@FXML
public void onExit() {
Platform.exit();
}
private void startGui() {
Runtime runtime = Runtime.getRuntime(); //获取Runtime实例
//执行命令
String[] command = {APP_NAME + ".exe"};
try {
Process process = runtime.exec(command);
} catch (IOException ignored) {
}
}
private void unzip() {
File file = new File(PARENT_PATH + File.separator + APP_NAME + "-windows-nojre.zip");
ZipFile zipFile = ZipUtil.toZipFile(file, CharsetUtil.defaultCharset());
ZipUtil.read(zipFile, zipEntry -> {
String path = zipEntry.getName();
if (FileUtil.isWindows()) {
// Win系统下
path = StrUtil.replace(path, "*", "_");
}
// 打包后文件都在alist-gui文件夹下，解压时去掉
path = path.replaceFirst(APP_NAME, "");
final File outItemFile = FileUtil.file(PARENT_PATH, path);
if (zipEntry.isDirectory()) {
// 目录
//noinspection ResultOfMethodCallIgnored
outItemFile.mkdirs();
} else {
InputStream in = ZipUtil.getStream(zipFile, zipEntry);
// 文件
FileUtil.writeFromStream(in, outItemFile, false);
}
});
// 解压完成后删除
FileUtil.del(file);
}
}

16
upgrade/src/main/java/module-info.java
View File

@ -1,16 +0,0 @@
module cn.octopusyan.upgrade {
requires javafx.controls;
requires javafx.fxml;
requires atlantafx.base;
requires cn.hutool.core;
requires static lombok;
requires org.apache.commons.lang3;
opens cn.octopusyan.upgrade to javafx.fxml;
exports cn.octopusyan.upgrade;
exports cn.octopusyan.upgrade.util;
opens cn.octopusyan.upgrade.util to javafx.fxml;
exports cn.octopusyan.upgrade.view;
opens cn.octopusyan.upgrade.view to javafx.fxml;
}

14
upgrade/src/main/resources/fxml/hello-view.fxml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.HBox?>
<HBox alignment="CENTER" spacing="20.0" xmlns:fx="http://javafx.com/fxml/1"
xmlns="http://javafx.com/javafx/11.0.14-internal"
fx:controller="cn.octopusyan.upgrade.view.HelloController">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
</padding>
<Button onAction="#onUpdate" styleClass="large" text="%update"/>
<Button onAction="#onExit" styleClass="large" text="%exit"/>
</HBox>

7
upgrade/src/main/resources/language/language.properties
View File

@ -1,7 +0,0 @@
exit=\u9000\u51FA
title=\u66F4\u65B0
update=\u66F4\u65B0

6
upgrade/src/main/resources/language/language_en.properties
View File

@ -1,6 +0,0 @@
exit=Exit
title=Upgrade App
update=Upgrade

6
upgrade/src/main/resources/language/language_zh_CN.properties
View File

@ -1,6 +0,0 @@
exit=\u9000\u51FA
title=\u66F4\u65B0
update=\u66F4\u65B0