diff --git a/.github/workflows/build_installers.yml b/.github/workflows/build_installers.yml index b6e6a6eb98..1d1b11f1c0 100644 --- a/.github/workflows/build_installers.yml +++ b/.github/workflows/build_installers.yml @@ -19,7 +19,7 @@ jobs: - uses: luangong/setup-install4j@v1 name: Setup Install4j with: - version: 10.0.8 + version: 11.0.1 license: ${{ secrets.INSTALL4J_LICENSE }} - name: Make installers run: | diff --git a/Dockerfile b/Dockerfile index 97e79e574f..e9f6dc9ab1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ LABEL maintainer="https://github.com/PBH-BTN/PeerBanHelper" USER 0 EXPOSE 9898 ENV TZ=UTC -ENV JAVA_OPTS="-Dpbh.release=docker -Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps" +ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps" WORKDIR /app VOLUME /tmp COPY --from=build build/target/libraries /app/libraries diff --git a/Dockerfile-Release b/Dockerfile-Release index 122dee7a77..dfa195d726 100644 --- a/Dockerfile-Release +++ b/Dockerfile-Release @@ -5,7 +5,7 @@ COPY target/PeerBanHelper.jar /app/PeerBanHelper.jar USER 0 EXPOSE 9898 ENV TZ=UTC -ENV JAVA_OPTS="-Dpbh.release=docker -Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps" +ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps" WORKDIR /app VOLUME /tmp ENTRYPOINT ${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar PeerBanHelper.jar \ No newline at end of file diff --git a/install4j/project.install4j b/install4j/project.install4j index 6cf0908b19..e37180e675 100644 --- a/install4j/project.install4j +++ b/install4j/project.install4j @@ -1,5 +1,5 @@ - + @@ -79,7 +79,7 @@ - + @@ -519,6 +519,7 @@ return !Files.getFileStore(dir).isReadOnly() && ((Util.isWindows() & + ${installer:updatesUrl?:${compiler:sys.updatesUrl}} updateDescriptor @@ -1575,15 +1576,11 @@ return true; - - - + - - - + @@ -1592,23 +1589,15 @@ return true; - - - + - + - + - - - - - - - + diff --git a/pom.xml b/pom.xml index 9bba6a9915..b4bd60005c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ghostchu.peerbanhelper peerbanhelper - 7.2.1 + 7.2.2 jar PeerBanHelper @@ -211,7 +211,7 @@ ${project.basedir}/target/PeerBanHelper.jar - -Xmx2G + -Xmx4G diff --git a/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/transmission/Transmission.java b/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/transmission/Transmission.java index 206b762b31..311945622b 100644 --- a/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/transmission/Transmission.java +++ b/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/transmission/Transmission.java @@ -125,7 +125,7 @@ public DownloaderLoginResult login0() { @Override public List getTorrents() { - RqTorrentGet torrent = new RqTorrentGet(Fields.ID, Fields.HASH_STRING, Fields.NAME, Fields.PEERS_CONNECTED, Fields.STATUS, Fields.TOTAL_SIZE, Fields.PEERS, Fields.RATE_DOWNLOAD, Fields.RATE_UPLOAD, Fields.PEER_LIMIT, Fields.PERCENT_DONE); + RqTorrentGet torrent = new RqTorrentGet(Fields.ID, Fields.HASH_STRING, Fields.NAME, Fields.PEERS_CONNECTED, Fields.STATUS, Fields.TOTAL_SIZE, Fields.PEERS, Fields.RATE_DOWNLOAD, Fields.RATE_UPLOAD, Fields.PEER_LIMIT, Fields.PERCENT_DONE, Fields.SIZE_WHEN_DONE); TypedResponse rsp = client.execute(torrent); return rsp.getArgs().getTorrents().stream() .filter(t -> t.getStatus() == Status.DOWNLOADING || t.getStatus() == Status.SEEDING) @@ -178,7 +178,7 @@ private void relaunchTorrents(Collection ids) { RqTorrentGet torrentList = new RqTorrentGet(Fields.ID, Fields.HASH_STRING, Fields.NAME, Fields.PEERS_CONNECTED, Fields.STATUS, Fields.TOTAL_SIZE, Fields.PEERS, Fields.RATE_DOWNLOAD, - Fields.RATE_UPLOAD, Fields.PEER_LIMIT, Fields.PERCENT_DONE, Fields.IS_PRIVATE); + Fields.RATE_UPLOAD, Fields.PEER_LIMIT, Fields.PERCENT_DONE, Fields.IS_PRIVATE, Fields.SIZE_WHEN_DONE); TypedResponse rsp = client.execute(torrentList); List torrents = rsp.getArgs().getTorrents().stream() .filter(t -> t.getStatus() != Status.STOPPED) diff --git a/webui/src/components/changelogViewer.vue b/webui/src/components/changelogViewer.vue index 1647bbe5fe..597829dc6a 100644 --- a/webui/src/components/changelogViewer.vue +++ b/webui/src/components/changelogViewer.vue @@ -10,7 +10,7 @@ {{ t('changeLogModel.changelog') }} diff --git a/webui/src/components/markdown.vue b/webui/src/components/markdown.vue index df67a355ad..ec377e0de2 100644 --- a/webui/src/components/markdown.vue +++ b/webui/src/components/markdown.vue @@ -2,7 +2,7 @@