Update Changelog

use `mv -T` @mahor1221

.github/workflows/build_pull_request.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.9.0
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ github.token }}
 
@@ -45,13 +45,9 @@ jobs:
           mkdir -p ~/.gradle
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
-
       - name: Build Jar
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-build-action@v2
         with:
           build-root-directory: master
-          wrapper-directory: master
           arguments: :server:shadowJar --stacktrace
-          wrapper-cache-enabled: true
+
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true

.github/workflows/build_push.yml

@@ -9,28 +9,26 @@ jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
     runs-on: ubuntu-latest
-
     steps:
       - name: Clone repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
   build:
-    name: Build artifacts and deploy preview
+    name: Build Jar
     needs: check_wrapper
     if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
     runs-on: ubuntu-latest
-
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.9.0
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ github.token }}
 
       - name: Checkout master branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
           path: master
@@ -48,43 +46,136 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build Jar
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-build-action@v2
         env:
           ProductBuildType: "Preview"
         with:
           build-root-directory: master
-          wrapper-directory: master
           arguments: :server:shadowJar --stacktrace
-          wrapper-cache-enabled: true
+
-          dependencies-cache-enabled: true
+      - name: Upload Jar
-          configuration-cache-enabled: true
+        uses: actions/upload-artifact@v3
+        with:
+          name: jar
+          path: master/server/build/*.jar
+          if-no-files-found: error
+
+      - name: Upload icons
+        uses: actions/upload-artifact@v3
+        with:
+          name: icon
+          path: master/server/src/main/resources/icon
+          if-no-files-found: error
+
+      - name: Tar scripts dir to maintain file permissions
+        run: tar -cvzf scripts.tar.gz -C master/ scripts/
+      - name: Upload scripts.tar.gz
+        uses: actions/upload-artifact@v3
+        with:
+          name: scripts
+          path: scripts.tar.gz
+          if-no-files-found: error
+
+  bundle:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - debian-all
+          - linux-assets
+          - linux-x64
+          - macOS-x64
+          - macOS-arm64
+          - windows-x64
+          - windows-x86
+
+    name: Make ${{ matrix.os }} release
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Jar
+        uses: actions/download-artifact@v3
+        with:
+          name: jar
+          path: server/build
+
+      - name: Download icons
+        uses: actions/download-artifact@v3
+        with:
+          name: icon
+          path: server/src/main/resources/icon
+
+      - name: Download scripts.tar.gz
+        uses: actions/download-artifact@v3
+        with:
+          name: scripts
+
+      - name: Make ${{ matrix.os }} release
+        run: |
+          mkdir upload
+          tar -xvpf scripts.tar.gz
+          scripts/bundler.sh -o upload/ ${{ matrix.os }}
+
+      - name: Upload ${{ matrix.os }} release
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.os }}
+          path: upload/*
+          if-no-files-found: error
+
+  release:
+    needs: bundle
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: jar
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: debian-all
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: linux-assets
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: linux-x64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: macOS-x64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: macOS-arm64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: windows-x64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: windows-x86
+          path: release
+
+      - name: Checkout Preview branch
+        uses: actions/checkout@v3
+        with:
+          repository: "Suwayomi/Tachidesk-Server-preview"
+          ref: main
+          path: preview
+          token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
 
       - name: Generate Tag Name
         id: GenTagName
         run: |
-          cd master/server/build
+          cd release
           genTag=$(ls *.jar | sed -e's/Tachidesk-Server-\|.jar//g')
           echo "$genTag"
           echo "::set-output name=value::$genTag"
 
-      - name: make bundle packages
-        run: |
-          cd master/scripts
-          ./windows-bundler.sh win32
-          ./windows-bundler.sh win64
-          ./unix-bundler.sh linux-x64
-          ./debian-packager.sh
-          ./unix-bundler.sh macOS-x64
-          ./unix-bundler.sh macOS-arm64
-
-      - name: Checkout preview branch
-        uses: actions/checkout@v2
-        with:
-          repository: 'Suwayomi/Tachidesk-Server-preview'
-          ref: main
-          path: preview
-          token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-
       - name: Create Tag
         run: |
           TAG="${{ steps.GenTagName.outputs.value }}"
@@ -92,7 +183,8 @@ jobs:
           cd preview
           echo "{ \"latest\": \"$TAG\" }" > index.json
           git add index.json
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email \
+            "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
           git commit -m "Updated to $TAG"
           git push origin main
@@ -101,10 +193,10 @@ jobs:
           git push origin $TAG
 
       - name: Upload Preview Release
-        uses: ncipollo/release-action@v1
+        uses: softprops/action-gh-release@v1
         with:
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-          artifacts: "master/server/build/*.jar,master/server/build/*.msi,master/server/build/*.zip,master/server/build/*.tar.gz,master/server/build/*.deb"
+          repository: "Suwayomi/Tachidesk-Server-preview"
-          owner: "Suwayomi"
+          tag_name:  ${{ steps.GenTagName.outputs.value }}
-          repo: "Tachidesk-Server-preview"
+          files: release/*
-          tag: ${{ steps.GenTagName.outputs.value }}
+

.github/workflows/publish.yml

@@ -1,6 +1,7 @@
 name: CI Publish
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - "v*"
@@ -9,27 +10,25 @@ jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
     runs-on: ubuntu-latest
-
     steps:
       - name: Clone repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
   build:
-    name: Build artifacts and release
+    name: Build Jar
     needs: check_wrapper
     runs-on: ubuntu-latest
-
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.9.0
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ github.token }}
 
       - name: Checkout ${{ github.ref }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
           path: master
@@ -44,36 +43,131 @@ jobs:
         run: |
           cd master
           mkdir -p ~/.gradle
-          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
+          cp .github/runner-files/ci-gradle.properties \
+            ~/.gradle/gradle.properties
 
       - name: Build and copy webUI, Build Jar
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-build-action@v2
         env:
           ProductBuildType: "Stable"
         with:
           build-root-directory: master
-          wrapper-directory: master
           arguments: :server:downloadWebUI :server:shadowJar --stacktrace
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
 
-      - name: Make bundle packages
+      - name: Upload Jar
-        run: |
+        uses: actions/upload-artifact@v3
-          cd master/scripts
-          ./windows-bundler.sh win32
-          ./windows-bundler.sh win64
-          ./unix-bundler.sh linux-x64
-          ./debian-packager.sh
-          ./unix-bundler.sh macOS-x64
-          ./unix-bundler.sh macOS-arm64
-
-      - name: Upload Release
-        uses: xresloader/upload-to-github-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          file: "master/server/build/*.jar;master/server/build/*.msi;master/server/build/*.zip;master/server/build/*.tar.gz;master/server/build/*.deb"
+          name: jar
-          tags: true
+          path: master/server/build/*.jar
+          if-no-files-found: error
+
+      - name: Upload icons
+        uses: actions/upload-artifact@v3
+        with:
+          name: icon
+          path: master/server/src/main/resources/icon
+          if-no-files-found: error
+
+      - name: Tar scripts dir to maintain file permissions
+        run: tar -cvzf scripts.tar.gz -C master/ scripts/
+      - name: Upload scripts.tar.gz
+        uses: actions/upload-artifact@v3
+        with:
+          name: scripts
+          path: scripts.tar.gz
+          if-no-files-found: error
+
+  bundle:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - debian-all
+          - linux-assets
+          - linux-x64
+          - macOS-x64
+          - macOS-arm64
+          - windows-x64
+          - windows-x86
+
+    name: Make ${{ matrix.os }} release
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Jar
+        uses: actions/download-artifact@v3
+        with:
+          name: jar
+          path: server/build
+
+      - name: Download icons
+        uses: actions/download-artifact@v3
+        with:
+          name: icon
+          path: server/src/main/resources/icon
+
+      - name: Download scripts.tar.gz
+        uses: actions/download-artifact@v3
+        with:
+          name: scripts
+
+      - name: Make ${{ matrix.os }} release
+        run: |
+          mkdir upload/
+          tar -xvpf scripts.tar.gz
+          scripts/bundler.sh -o upload/ ${{ matrix.os }}
+
+      - name: Upload ${{ matrix.os }} files
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.os }}
+          path: upload/*
+          if-no-files-found: error
+
+  release:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: bundle
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: jar
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: debian-all
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: linux-assets
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: linux-x64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: macOS-x64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: macOS-arm64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: windows-x64
+          path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: windows-x86
+          path: release
+
+      - name: Generate checksums
+        run: cd release && sha256sum * > Checksums.sha256
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          token: ${{ secrets.WINGET_PUBLISH_PAT }}
           draft: true
-          verbose: true
+          files: release/*

.github/workflows/winget.yml

@@ -0,0 +1,13 @@
+name: Publish to WinGet
+on:
+  release:
+    types: [released]
+jobs:
+  publish:
+    runs-on: windows-latest # action can only be run on windows
+    steps:
+      - uses: vedantmgoyal2009/winget-releaser@latest
+        with:
+          identifier: Suwayomi.Tachidesk-Server
+          installers-regex: '.*x64.msi$'
+          token: ${{ secrets.WINGET_PUBLISH_PAT }}

CHANGELOG.md

@@ -1,6 +1,28 @@
-# Server: v0.6.3-next + WebUI: r944
+# Server: v0.6.5 + WebUI: r946
 ## TL;DR
-- N/A
+- Fixed Windows bundler
+
+## Tachidesk-Server Changelog
+- (r1113) v0.6.4 (by @AriaMoradi)
+- (r1114) fix broken links (by @AriaMoradi)
+- (r1115) fix more broken stuff (by @AriaMoradi)
+- (r1116) fix more broken stuff (by @AriaMoradi)
+- (r1117) fix more broken stuff (by @AriaMoradi)
+- (r1118) Update winget.yml ([#393](https://github.com/Suwayomi/Tachidesk-Server/pull/393) by @vedantmgoyal2009)
+- (r1119) fix jre path([#396](https://github.com/Suwayomi/Tachidesk-Server/pull/396) by @voltrare)
+- (r1120) Fix deb package ([#397](https://github.com/Suwayomi/Tachidesk-Server/pull/397)) by @mahor1221)
+- (r1121) bump version (by @AriaMoradi)
+
+## Tachidesk-WebUI Changelog
+- None
+
+
+
+# Server: v0.6.4 + WebUI: r946
+## TL;DR
+- No new major features
+- Bug fixes and changes for packaging
+- Documentation changes
 
 ## Tachidesk-Server Changelog
 - (r1087) v0.6.3 (by @AriaMoradi)
@@ -15,10 +37,28 @@
 - (r1096) document all endpoints ([#350](https://github.com/Suwayomi/Tachidesk-Server/pull/350) by @Syer10)
 - (r1097) fix copymanga ([#354](https://github.com/Suwayomi/Tachidesk-Server/pull/354) by @AriaMoradi)
 - (r1098) fix formatting by kotlinter (by @AriaMoradi)
+- (r1099) bump WebUI (by @AriaMoradi)
+- (r1100) fix WebUI release name (by @AriaMoradi)
+- (r1101) Fix documentation errors ([#358](https://github.com/Suwayomi/Tachidesk-Server/pull/358) by @Syer10)
+- (r1102) Docs improvements ([#359](https://github.com/Suwayomi/Tachidesk-Server/pull/359) by @Syer10)
+- (r1103) Add linux-all.tar.gz & systemd service ([#366](https://github.com/Suwayomi/Tachidesk-Server/pull/366) by @mahor1221)
+- (r1104) Publish to Windows Package Managar (WinGet) ([#369](https://github.com/Suwayomi/Tachidesk-Server/pull/369) by @vedantmgoyal2009)
+- (r1105) Refactor scripts ([#370](https://github.com/Suwayomi/Tachidesk-Server/pull/370) by @mahor1221)
+- (r1106) Run workflow jobs toghether ([#371](https://github.com/Suwayomi/Tachidesk-Server/pull/371) by @mahor1221)
+- (r1107) Update gradle action ([#372](https://github.com/Suwayomi/Tachidesk-Server/pull/372) by @mahor1221)
+- (r1108) Improve DocumentationDsl, bugfix default values and add queryParams ([#378](https://github.com/Suwayomi/Tachidesk-Server/pull/378) by @Syer10)
+- (r1109) Tidy up bundler script ([#380](https://github.com/Suwayomi/Tachidesk-Server/pull/380) by @mahor1221)
+- (r1110) Replace linux-all with linux-assets ([#381](https://github.com/Suwayomi/Tachidesk-Server/pull/381) by @mahor1221)
+- (r1111) Rename every instance of Tachidesk jar to Tachdidesk-Server.jar ([#384](https://github.com/Suwayomi/Tachidesk-Server/pull/384) by @AriaMoradi)
+- (r1112) Fix mistakes from #384 ([#385](https://github.com/Suwayomi/Tachidesk-Server/pull/385) by @AriaMoradi)
 
 ## Tachidesk-WebUI Changelog
 - (r943) fix default width ([#171](https://github.com/Suwayomi/Tachidesk-WebUI/pull/171) by @Robonau)
 - (r944) added an update checker button for library ([#172](https://github.com/Suwayomi/Tachidesk-WebUI/pull/172) by @infix)
+- (r945) fix download queue delete button ([#176](https://github.com/Suwayomi/Tachidesk-WebUI/pull/176) by @Kreach37)
+- (r946) fix mangadex filters ([#177](https://github.com/Suwayomi/Tachidesk-WebUI/pull/177) by @Robonau)
+
+
 
 # Server: v0.6.3 + WebUI: r942
 ## TL;DR

buildSrc/src/main/kotlin/Constants.kt

@@ -12,9 +12,9 @@ const val kotlinVersion = "1.6.10"
 const val MainClass = "suwayomi.tachidesk.MainKt"
 
 // should be bumped with each stable release
-val tachideskVersion = System.getenv("ProductVersion") ?: "v0.6.3"
+val tachideskVersion = System.getenv("ProductVersion") ?: "v0.6.5"
 
-val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r944"
+val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r946"
 val sorayomiRevisionTag = System.getenv("SorayomiRevision") ?: "0.1.5"
 
 // counts commits on the master branch

scripts/bundler.sh

@@ -0,0 +1,288 @@
+#!/bin/bash
+
+# Copyright (C) Contributors to the Suwayomi project
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+main() {
+  POSITIONAL_ARGS=()
+  OUTPUT_DIR=.
+  while [ "$#" -gt 0 ]; do
+    case "$1" in
+      -o|--output-dir)
+        OUTPUT_DIR="$(readlink -e "$2" || exit 1)"
+        shift
+        shift
+        ;;
+      *)
+        POSITIONAL_ARGS+=("$1")
+        shift
+        ;;
+    esac
+  done
+  # restore positional parameters
+  set -- "${POSITIONAL_ARGS[@]}"
+
+  OS="$1"
+  JAR="$(ls server/build/*.jar | tail -n1)"
+  RELEASE_NAME="$(echo "${JAR%.*}" | xargs basename)-$OS"
+  RELEASE_VERSION="$(tmp="${JAR%-*}"; echo "${tmp##*-}" | tr -d v)"
+  #RELEASE_REVISION_NUMBER="$(tmp="${JAR%.*}" && echo "${tmp##*-}" | tr -d r)"
+  local electron_version="v14.0.0"
+
+  # clean temporary directory on function return
+  trap "rm -rf $RELEASE_NAME/" RETURN
+  mkdir "$RELEASE_NAME/"
+
+  case "$OS" in
+    debian-all)
+      RELEASE="$RELEASE_NAME.deb"
+      make_deb_package
+      move_release_to_output_dir
+      ;;
+    linux-assets)
+      RELEASE="$RELEASE_NAME.tar.gz"
+      copy_linux_package_assets_to "$RELEASE_NAME/"
+      tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
+      move_release_to_output_dir
+      ;;
+    linux-x64)
+      JRE="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
+      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$JRE"
+      ELECTRON="electron-$electron_version-linux-x64.zip"
+      ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
+      download_jre_and_electron
+
+      RELEASE="$RELEASE_NAME.tar.gz"
+      make_linux_bundle
+      move_release_to_output_dir
+      ;;
+    macOS-x64)
+      JRE="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
+      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$JRE"
+      ELECTRON="electron-$electron_version-darwin-x64.zip"
+      ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
+      download_jre_and_electron
+
+      RELEASE="$RELEASE_NAME.zip"
+      make_macos_bundle
+      move_release_to_output_dir
+      ;;
+    macOS-arm64)
+      JRE="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64.tar.gz"
+      JRE_URL="https://cdn.azul.com/zulu/bin/$JRE"
+      ELECTRON="electron-$electron_version-darwin-arm64.zip"
+      ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
+      download_jre_and_electron
+
+      RELEASE="$RELEASE_NAME.zip"
+      make_macos_bundle
+      move_release_to_output_dir
+      ;;
+    windows-x86)
+      JRE="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
+      JRE_URL="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/$JRE"
+      ELECTRON="electron-$electron_version-win32-ia32.zip"
+      ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
+      download_jre_and_electron
+
+      RELEASE="$RELEASE_NAME.zip"
+      make_windows_bundle
+      move_release_to_output_dir
+
+      RELEASE="$RELEASE_NAME.msi"
+      make_windows_package
+      move_release_to_output_dir
+      ;;
+    windows-x64)
+      JRE="OpenJDK8U-jre_x64_windows_hotspot_8u302b08.zip"
+      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$JRE"
+      ELECTRON="electron-$electron_version-win32-x64.zip"
+      ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
+      download_jre_and_electron
+
+      RELEASE="$RELEASE_NAME.zip"
+      make_windows_bundle
+      move_release_to_output_dir
+
+      RELEASE="$RELEASE_NAME.msi"
+      make_windows_package
+      move_release_to_output_dir
+      ;;
+    *)
+      error $LINENO "Unsupported operating system: $OS" 2
+      ;;
+  esac
+}
+
+move_release_to_output_dir() {
+   # clean up from possible previous runs
+   if [ -f "$OUTPUT_DIR/$RELEASE" ]; then
+     rm "$OUTPUT_DIR/$RELEASE"
+   fi
+   mv "$RELEASE" "$OUTPUT_DIR/"
+}
+
+download_jre_and_electron() {
+  if [ ! -f "$JRE" ]; then
+    curl -L "$JRE_URL" -o "$JRE"
+  fi
+  if [ ! -f "$ELECTRON" ]; then
+    curl -L "$ELECTRON_URL" -o "$ELECTRON"
+  fi
+
+  mkdir -p "$RELEASE_NAME/jre/"
+  local ext="${JRE##*.}"
+  local jre_dir
+  if [ "$ext" = "zip" ]; then
+    jre_dir="$(unzip "$JRE" | sed -n '2p' | cut -d: -f2 | xargs basename)"
+    mv -T "$jre_dir" "$RELEASE_NAME/jre"
+  else
+    # --strip-components=1: untar an archive without the root folder
+    tar xvf "$JRE" --strip-components=1 -C "$RELEASE_NAME/jre/"
+  fi
+  unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
+}
+
+copy_linux_package_assets_to() {
+  local output_dir
+  output_dir="$(readlink -e "$1" || exit 1)"
+
+  cp "scripts/resources/pkg/tachidesk-server-browser-launcher.sh" "$output_dir/"
+  cp "scripts/resources/pkg/tachidesk-server-debug-launcher.sh" "$output_dir/"
+  cp "scripts/resources/pkg/tachidesk-server-electron-launcher.sh" "$output_dir/"
+  cp "scripts/resources/pkg/tachidesk-server.desktop" "$output_dir/"
+  cp "scripts/resources/pkg/systemd"/* "$output_dir/"
+  cp "server/src/main/resources/icon/faviconlogo.png" \
+    "$output_dir/tachidesk-server.png"
+}
+
+make_linux_bundle() {
+  cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar"
+  cp "scripts/resources/tachidesk-server-browser-launcher.sh" "$RELEASE_NAME/"
+  cp "scripts/resources/tachidesk-server-debug-launcher.sh" "$RELEASE_NAME/"
+  cp "scripts/resources/tachidesk-server-electron-launcher.sh" "$RELEASE_NAME/"
+
+  tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
+}
+
+make_macos_bundle() {
+  cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar"
+  cp "scripts/resources/Tachidesk Browser Launcher.command" "$RELEASE_NAME/"
+  cp "scripts/resources/Tachidesk Debug Launcher.command" "$RELEASE_NAME/"
+  cp "scripts/resources/Tachidesk Electron Launcher.command" "$RELEASE_NAME/"
+
+  zip -9 -r "$RELEASE" "$RELEASE_NAME/"
+}
+
+# https://wiki.debian.org/SimplePackagingTutorial
+# https://www.debian.org/doc/manuals/packaging-tutorial/packaging-tutorial.pdf
+make_deb_package() {
+  #behind $RELEASE_VERSION is hyphen "-"
+  local source_dir="tachidesk-server-$RELEASE_VERSION"
+  #behind $RELEASE_VERSION is underscore "_"
+  local upstream_source="tachidesk-server_$RELEASE_VERSION.orig.tar.gz"
+
+  mkdir "$RELEASE_NAME/$source_dir/"
+  cp "$JAR" "$RELEASE_NAME/$source_dir/Tachidesk-Server.jar"
+  copy_linux_package_assets_to "$RELEASE_NAME/$source_dir/"
+  tar -I "gzip" -C "$RELEASE_NAME/" -cvf "$upstream_source" "$source_dir"
+
+  cp -r "scripts/resources/deb/" "$RELEASE_NAME/$source_dir/debian/"
+  sed -i "s/\$pkgver/$RELEASE_VERSION/" "$RELEASE_NAME/$source_dir/debian/changelog"
+  sed -i "s/\$pkgrel/1/"                "$RELEASE_NAME/$source_dir/debian/changelog"
+
+  sudo apt install devscripts build-essential dh-exec
+  cd "$RELEASE_NAME/$source_dir/"
+  dpkg-buildpackage --no-sign --build=all
+  cd -
+
+  local deb="tachidesk-server_$RELEASE_VERSION-1_all.deb"
+  mv "$RELEASE_NAME/$deb" "$RELEASE"
+}
+
+make_windows_bundle() {
+  ## I disabled this section until someone find a solution to this error:
+  ##E: Unable to correct problems, you have held broken packages.
+  ##./bundler.sh: line 250: wine: command not found
+
+  ## check if running under github actions
+  #if [ "$CI" = true ]; then
+    ## change electron executable's icon
+    #sudo dpkg --add-architecture i386
+    #wget -qO - https://dl.winehq.org/wine-builds/winehq.key \
+        #| sudo apt-key add -
+    #sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
+    #sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu \
+        #$(lsb_release -cs) main"
+    #sudo apt install --install-recommends winehq-stable
+  #fi
+  ## this script assumes that wine is installed here on out
+
+  #local rcedit="rcedit-x85.exe"
+  #local rcedit_url="https://github.com/electron/rcedit/releases/download/v0.1.1/$rcedit"
+  ## change electron's icon
+  #if [ ! -f "$rcedit" ]; then
+    #curl -L "$rcedit_url" -o "$rcedit"
+  #fi
+
+  #local icon="server/src/main/resources/icon/faviconlogo.ico"
+  #WINEARCH=win32 wine "$rcedit" "$RELEASE_NAME/electron/electron.exe" \
+  #    --set-icon "$icon"
+
+  cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar"
+  cp "scripts/resources/Tachidesk Browser Launcher.bat" "$RELEASE_NAME"
+  cp "scripts/resources/Tachidesk Debug Launcher.bat" "$RELEASE_NAME"
+  cp "scripts/resources/Tachidesk Electron Launcher.bat" "$RELEASE_NAME"
+
+  zip -9 -r "$RELEASE" "$RELEASE_NAME"
+}
+
+make_windows_package() {
+  if [ "$CI" = true ]; then
+    sudo apt install -y wixl
+  fi
+
+  find "$RELEASE_NAME/jre" \
+  | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
+    --directory-ref jre --component-group jre >"$RELEASE_NAME/jre.wxs"
+  find "$RELEASE_NAME/electron" \
+  | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
+    --directory-ref electron --component-group electron >"$RELEASE_NAME/electron.wxs"
+
+  local icon="server/src/main/resources/icon/faviconlogo.ico"
+  local arch=${OS##*-}
+
+  wixl -D ProductVersion="$RELEASE_VERSION" -D SourceDir="$RELEASE_NAME" \
+    -D Icon="$icon" --arch "$arch" "scripts/resources/msi/tachidesk-server-$arch.wxs" \
+    "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" -o "$RELEASE"
+}
+
+# Error handler
+# set -u: Treat unset variables as an error when substituting.
+# set -o pipefail: Prevents errors in pipeline from being masked.
+# set -e: Immediatly exit if any command has a non-zero exit status.
+# set -E: Inherit the trap ERR function before exiting by set.
+#
+# set -e is not recommended and unpredictable.
+# see https://stackoverflow.com/questions/64786/error-handling-in-bash
+# and http://mywiki.wooledge.org/BashFAO/105
+set -uo pipefail
+error() {
+  local parent_lineno="$1"
+  local message="$2"
+  local code="${3:-1}"
+  if [ -z "$message" ]; then
+      echo "$0: line $parent_lineno: exiting with status $code"
+  else
+      echo "$0: line $parent_lineno: $message: exiting with status $code"
+  fi
+  exit "$code"
+}
+trap 'error $LINENO ""' ERR
+
+main "$@"; exit
+
+

scripts/debian-packager.sh

@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) Contributors to the Suwayomi project
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-echo "Creating DEB Package"
-pkgname="tachidesk-server"
-PkgName="Tachidesk-Server"
-jar=$(ls ../server/build/*.jar | tail -n1)
-pkgver="$(tmp="${jar%-*}" && echo "${tmp##*-}" | tr -d v)"
-pkgrel=1
-
-srcdir="$pkgname-$pkgver"               # uses hyphen "-"
-srctgz="${pkgname}_$pkgver.orig.tar.gz" # uses underscore "_"
-deb="${pkgname}_$pkgver-${pkgrel}_all.deb"
-Deb="${PkgName}_$pkgver-${pkgrel}_all.deb"
-
-# Prepare
-mkdir "$srcdir/"
-cp "$jar" "$srcdir/$pkgname.jar"
-cp "resources/$pkgname-browser-launcher.sh" "$srcdir/"
-cp "resources/$pkgname-debug-launcher.sh" "$srcdir/"
-cp "resources/$pkgname-electron-launcher-debian.sh" "$srcdir/$pkgname-electron-launcher.sh"
-cp "resources/$pkgname.desktop" "$srcdir/"
-cp "../server/src/main/resources/icon/faviconlogo.png" "$srcdir/$pkgname.png"
-
-GZIP=-9 tar -cvzf "$srctgz" "$srcdir/"
-
-cp -r "resources/debian" "$srcdir/"
-sed -i "s/\${pkgver}/$pkgver/" "$srcdir/debian/changelog"
-sed -i "s/\${pkgrel}/$pkgrel/" "$srcdir/debian/changelog"
-
-# Build
-mkdir "debuild/"
-mv "$srctgz" "$srcdir/" "debuild/"
-sudo apt install devscripts build-essential dh-exec
-# --lintian-opts --profile are for building Debian packages on Ubuntu 
-cd "debuild/$srcdir/debian"
-debuild -uc -us --lintian-opts --profile debian
-cd -
-
-# clean up from possible previous runs
-if [ -f "../server/build/$Deb" ]; then
-    rm "../server/build/$Deb"
-fi
-
-mv "debuild/$deb" "../server/build/$Deb"
-rm -rf "debuild/"

scripts/resources/Tachidesk Browser Launcher.bat

@@ -1 +1 @@
-start "" jre/bin/javaw -jar Tachidesk.jar
+start "" jre/bin/javaw -jar Tachidesk-Server.jar

scripts/resources/Tachidesk Browser Launcher.command

@@ -1,3 +1,3 @@
 cd "`dirname "$0"`"
 
-./jre/Contents/Home/bin/java -jar Tachidesk.jar
+./jre/Contents/Home/bin/java -jar Tachidesk-Server.jar

scripts/resources/Tachidesk Debug Launcher.bat

@@ -1,7 +1,7 @@
 :: cleaner output
 @echo off
 
-jre\bin\java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar
+jre\bin\java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk-Server.jar
 
 :: Prevent cmd from closing when Tachidesk crashes
 pause

scripts/resources/Tachidesk Debug Launcher.command

@@ -1,3 +1,3 @@
 cd "`dirname "$0"`"
 
-./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar
+./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk-Server.jar

scripts/resources/Tachidesk Electron Launcher.bat

@@ -1 +1 @@
-jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk.jar
+jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk-Server.jar

scripts/resources/Tachidesk Electron Launcher.command

@@ -1,3 +1,3 @@
 cd "`dirname "$0"`"
 
-./jre/Contents/Home/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/Electron.app/Contents/MacOS/Electron" -jar Tachidesk.jar
+./jre/Contents/Home/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/Electron.app/Contents/MacOS/Electron" -jar Tachidesk-Server.jar

scripts/resources/deb/changelog

@@ -0,0 +1,5 @@
+tachidesk-server ($pkgver-$pkgrel) unstable; urgency=medium
+
+  * See CHANGELOG.md on https://github.com/Suwayomi/Tachidesk-Server
+
+ -- Mahor1221 <mahor1221@pm.me>  Fri, 14 Jan 2022 00:00:00 +0000

scripts/resources/deb/control

@@ -1,7 +1,7 @@
 Source: tachidesk-server
 Section: web
 Priority: optional
-Maintainer: Mahor Foruzesh <mahorforuzesh@pm.me>
+Maintainer: Mahor1221 <mahor1221@pm.me>
 Build-Depends: debhelper-compat (= 12), dh-exec
 Standards-Version: 4.5.1
 Homepage: https://github.com/Suwayomi/Tachidesk-Server

scripts/resources/deb/install

@@ -0,0 +1,12 @@
+#!/usr/bin/dh-exec
+
+Tachidesk-Server.jar         usr/share/java/tachidesk-server/
+tachidesk-server.png         usr/share/pixmaps/
+tachidesk-server.desktop     usr/share/applications/
+tachidesk-server.service     usr/lib/systemd/system/
+tachidesk-server.sysusers => usr/lib/sysusers.d/tachidesk-server.conf
+tachidesk-server.tmpfiles => usr/lib/tmpfiles.d/tachidesk-server.conf
+tachidesk-server.conf     => etc/tachidesk/server.conf
+tachidesk-server-browser-launcher.sh  => usr/bin/tachidesk-server-browser
+tachidesk-server-debug-launcher.sh    => usr/bin/tachidesk-server-debug
+tachidesk-server-electron-launcher.sh => usr/bin/tachidesk-server-electron

scripts/resources/debian/changelog

@@ -1,5 +0,0 @@
-tachidesk-server (${pkgver}-${pkgrel}) unstable; urgency=medium
-
-  * See CHANGELOG.md on https://github.com/Suwayomi/Tachidesk-Server
-
- -- Mahor Foruzesh <mahorforuzesh@pm.me>  Fri, 14 Jan 2022 00:00:00 +0000

scripts/resources/debian/install

@@ -1,8 +0,0 @@
-#!/usr/bin/dh-exec
-
-tachidesk-server-browser-launcher.sh  => usr/bin/tachidesk-server-browser
-tachidesk-server-debug-launcher.sh    => usr/bin/tachidesk-server-debug
-tachidesk-server-electron-launcher.sh => usr/bin/tachidesk-server-electron
-tachidesk-server.jar     usr/share/java/tachidesk-server/
-tachidesk-server.png     usr/share/pixmaps/
-tachidesk-server.desktop usr/share/applications/

scripts/resources/msi/tachidesk-server-x64.wxs

@@ -31,7 +31,7 @@
     <!-- Component -->
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="TachideskJAR" Guid="*" Win64="yes">
-          <File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
+          <File Id="Tachidesk-Server.jar" Source="$(var.SourceDir)/Tachidesk-Server.jar" KeyPath="yes" />
       </Component>
 
       <Component Id="TachideskBrowserBAT" Guid="*" Win64="yes">

scripts/resources/msi/tachidesk-server-x86.wxs

@@ -27,7 +27,7 @@
     <!-- Component -->
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="TachideskJAR" Guid="*">
-          <File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
+          <File Id="Tachidesk-Server.jar" Source="$(var.SourceDir)/Tachidesk-Server.jar" KeyPath="yes" />
       </Component>
 
       <Component Id="TachideskBrowserBAT" Guid="*">

scripts/resources/pkg/systemd/tachidesk-server.conf

@@ -0,0 +1,5 @@
+TACHIDESK_ROOT_DIR="/var/lib/tachidesk"
+
+# Extra arguments passed to the java command
+# The default value disables the system tray icon, and launching a browser on service start.
+JAVA_ARGS=-Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false

scripts/resources/pkg/systemd/tachidesk-server.service

@@ -0,0 +1,31 @@
+[Unit]
+Description=A free and open source manga reader server that runs extensions built for Tachiyomi.
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+User=tachidesk
+Group=tachidesk
+SyslogIdentifier=tachidesk
+
+EnvironmentFile=/etc/tachidesk/server.conf
+ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar
+Restart=on-failure
+
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectClock=yes
+ProtectKernelTunables=yes
+ProtectKernelModules=yes
+ProtectKernelLogs=yes
+ProtectControlGroups=yes
+RestrictSUIDSGID=yes
+RestrictRealtime=yes
+RestrictNamespaces=yes
+NoNewPrivileges=yes
+
+[Install]
+WantedBy=multi-user.target

scripts/resources/pkg/systemd/tachidesk-server.sysusers

@@ -0,0 +1,2 @@
+#Type    Name       ID    GECOS                                 Home directory              Shell
+u        tachidesk  -     "Tachidesk Manga Server"              /var/lib/tachidesk

scripts/resources/pkg/systemd/tachidesk-server.tmpfiles

@@ -0,0 +1,2 @@
+#Type  Path                Mode  User       Group      Age  Argument
+d      /var/lib/tachidesk  0755  tachidesk  tachidesk

scripts/resources/pkg/tachidesk-server-browser-launcher.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar

scripts/resources/pkg/tachidesk-server-debug-launcher.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec /usr/bin/java \
+    -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true \
+    -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar

scripts/resources/pkg/tachidesk-server-electron-launcher.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ ! -f /usr/bin/electron ]; then
+    echo "Electron executable was not found!
+In order to run this launcher, you need Electron installed."
+    exit 1
+fi
+
+exec /usr/bin/java \
+    -Dsuwayomi.tachidesk.config.server.webUIInterface=electron \
+    -Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron \
+    -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar

scripts/resources/pkg/tachidesk-server.desktop

@@ -2,7 +2,7 @@
 Type=Application
 Name=Tachidesk-Server
 Comment=Manga Reader
-Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/tachidesk-server.jar "\\$@"
+Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar "\\$@"
 Icon=tachidesk-server
 Terminal=false
 Categories=Network;

scripts/resources/tachidesk-server-browser-launcher.sh

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec /usr/bin/java -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
+
+exec ./jre/bin/java -jar ./Tachidesk-Server.jar

scripts/resources/tachidesk-server-debug-launcher.sh

@@ -1,2 +1,5 @@
 #!/bin/sh
-exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
+
+exec ./jre/bin/java \
+    -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true \
+    -jar ./Tachidesk-Server.jar

scripts/resources/tachidesk-server-electron-launcher-debian.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-if [ ! -f /usr/bin/electron ]; then
-  echo "Electron executable was not found
-In order to run this launcher, you need Electron installed.
-
-You can install it with these commands:
-sudo apt install npm
-sudo npm install electron -g"
-  exit 1
-fi
-
-exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.webUIInterface=electron -Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron -jar /usr/share/java/tachidesk-server/tachidesk-server.jar

scripts/resources/tachidesk-server-electron-launcher.sh

@@ -1,3 +1,6 @@
 #!/bin/sh
 
-exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.webUIInterface=electron -Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
+exec ./jre/bin/java \
+    -Dsuwayomi.tachidesk.config.server.webUIInterface=electron \
+    -Dsuwayomi.tachidesk.config.server.electronPath=./electron/electron \
+    -jar ./Tachidesk-Server.jar

scripts/unix-bundler.sh

@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) Contributors to the Suwayomi project
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-electron_version="v14.0.0"
-
-if [ $1 = "linux-x64" ]; then
-  jre="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
-  jre_release="jdk8u302-b08"
-  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
-  jre_dir="$jre_release-jre"
-  electron="electron-$electron_version-linux-x64.zip"
-elif [ $1 = "macOS-x64" ]; then
-  jre="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
-  jre_release="jdk8u302-b08"
-  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
-  jre_dir="$jre_release-jre"
-  electron="electron-$electron_version-darwin-x64.zip"
-elif [ $1 = "macOS-arm64" ]; then
-  jre="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64.tar.gz"
-  jre_release="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64"
-  jre_url="https://cdn.azul.com/zulu/bin/$jre"
-  jre_dir="$jre_release/zulu-8.jre"
-  electron="electron-$electron_version-darwin-arm64.zip"
-else
-  echo "Unsupported arch value: $1"
-  exit 1
-fi
-
-arch="$1"
-os=$(echo $arch | cut -d '-' -f1)
-
-echo "creating $arch bundle"
-
-jar=$(ls ../server/build/*.jar | tail -n1)
-jar_name=$(echo $jar | cut -d'/' -f4)
-release_name=$(echo $jar_name | sed 's/.jar//')-$arch
-
-# make release dir
-mkdir $release_name
-
-echo "Dealing with jre..."
-if [ ! -f $jre ]; then
-  curl -L $jre_url -o $jre
-fi
-tar xvf $jre
-mv $jre_dir $release_name/jre
-
-echo "Dealing with electron"
-if [ ! -f $electron ]; then
-  curl -L "https://github.com/electron/electron/releases/download/$electron_version/$electron" -o $electron
-fi
-unzip $electron -d $release_name/electron
-
-# copy artifacts
-cp $jar $release_name/Tachidesk-Server.jar
-if [ $os = linux ]; then
-  cp "resources/tachidesk-server-browser-launcher.sh" $release_name
-  cp "resources/tachidesk-server-debug-launcher.sh" $release_name
-  cp "resources/tachidesk-server-electron-launcher.sh" $release_name
-elif [ $os = macOS ]; then
-  cp "resources/Tachidesk Browser Launcher.command" $release_name
-  cp "resources/Tachidesk Debug Launcher.command" $release_name
-  cp "resources/Tachidesk Electron Launcher.command" $release_name
-fi
-
-archive_name=""
-if [ $os = linux ]; then
-  archive_name=$release_name.tar.gz
-  GZIP=-9 tar cvzf $archive_name $release_name
-elif [ $os = macOS ]; then
-  archive_name=$release_name.zip
-  zip -9 -r $archive_name $release_name
-fi
-
-rm -rf $release_name
-
-# clean up from possible previous runs
-if [ -f ../server/build/$archive_name ]; then
-  rm ../server/build/$archive_name
-fi
-
-mv $archive_name ../server/build/

scripts/windows-bundler.sh

@@ -1,104 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) Contributors to the Suwayomi project
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-electron_version="v14.0.0"
-arch=$1
-if [ $arch = "win32" ]; then
-  jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
-  jre_release="jdk8u292-b10"
-  jre_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$jre_release/$jre"
-  arch="windows-x86"
-  electron="electron-$electron_version-win32-ia32.zip"
-else
-  jre="OpenJDK8U-jre_x64_windows_hotspot_8u302b08.zip"
-  jre_release="jdk8u302-b08"
-  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
-  arch="windows-x64"
-  electron="electron-$electron_version-win32-x64.zip"
-fi
-
-jre_dir="$jre_release-jre"
-
-echo "creating windows bundle"
-
-jar=$(ls ../server/build/*.jar | tail -n1)
-jar_name=$(echo $jar | cut -d'/' -f4)
-release_name=$(echo $jar_name | sed 's/.jar//')-$arch
-
-# make release dir
-mkdir $release_name
-
-echo "Dealing with jre..."
-if [ ! -f $jre ]; then
-  curl -L $jre_url -o $jre
-fi
-unzip $jre
-mv $jre_dir $release_name/jre
-
-echo "Dealing with electron"
-if [ ! -f $electron ]; then
-  curl -L "https://github.com/electron/electron/releases/download/$electron_version/$electron" -o $electron
-fi
-unzip $electron -d $release_name/electron
-
-# change electron's icon
-rcedit="rcedit-x86.exe"
-if [ ! -f $rcedit ]; then
-  curl -L "https://github.com/electron/rcedit/releases/download/v1.1.1/$rcedit" -o $rcedit
-fi
-
-# check if running under github actions
-if [ $CI = true ]; then
-  # change electron executable's icon
-  sudo dpkg --add-architecture i386
-  wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
-  sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
-  sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
-  sudo apt install --install-recommends winehq-stable
-  sudo apt install -y wixl
-fi
-# this script assumes that wine is installed here on out
-
-WINEARCH=win32 wine $rcedit $release_name/electron/electron.exe --set-icon ../server/src/main/resources/icon/faviconlogo.ico
-
-# copy artifacts
-cp $jar $release_name/Tachidesk.jar
-cp "resources/Tachidesk Browser Launcher.bat" $release_name
-cp "resources/Tachidesk Debug Launcher.bat" $release_name
-cp "resources/Tachidesk Electron Launcher.bat" $release_name
-
-zip_name=$release_name.zip
-zip -9 -r $zip_name $release_name
-
-# create msi package
-msi_name=$release_name.msi
-release_ver=$(tmp=${jar%-*} && echo ${tmp##*-} | tr -d v)
-icon="../server/src/main/resources/icon/faviconlogo.ico"
-
-find $release_name/jre | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref jre --component-group jre >jre.wxs
-find $release_name/electron | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref electron --component-group electron >electron.wxs
-if [ $arch = "win32" ]; then
-  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name -D Icon=$icon \
-    --arch x86 resources/msi/tachidesk-server-x86.wxs jre.wxs electron.wxs -o $msi_name
-else
-  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name -D Icon=$icon \
-    --arch x64 resources/msi/tachidesk-server-x64.wxs jre.wxs electron.wxs -o $msi_name
-fi
-
-rm -rf $release_name
-
-# clean up from possible previous runs
-if [ -f ../server/build/$zip_name ]; then
-  rm ../server/build/$zip_name
-fi
-if [ -f ../server/build/$msi_name ]; then
-  rm ../server/build/$msi_name
-fi
-
-mv $zip_name ../server/build/
-mv $msi_name ../server/build/

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt

@@ -135,8 +135,6 @@ object BackupController {
                 summary("Validate a backup")
                 description("Reports missing sources and trackers, expects a Tachiyomi protobuf backup in the body")
             }
-            body<ByteArray>("") {
-            }
         },
         behaviorOf = { ctx ->
             ctx.future(

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/CategoryController.kt

@@ -30,7 +30,7 @@ object CategoryController {
             ctx.json(Category.getCategoryList())
         },
         withResults = {
-            json<List<CategoryDataClass>>(HttpCode.OK)
+            json<Array<CategoryDataClass>>(HttpCode.OK)
         }
     )
 
@@ -107,7 +107,7 @@ object CategoryController {
             ctx.json(CategoryManga.getCategoryMangaList(categoryId))
         },
         withResults = {
-            json<List<MangaDataClass>>(HttpCode.OK)
+            json<Array<MangaDataClass>>(HttpCode.OK)
         }
     )
 

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt

@@ -37,7 +37,7 @@ object ExtensionController {
             )
         },
         withResults = {
-            json<List<ExtensionDataClass>>(HttpCode.OK)
+            json<Array<ExtensionDataClass>>(HttpCode.OK)
         }
     )
 

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/MangaController.kt

@@ -128,7 +128,7 @@ object MangaController {
             ctx.json(CategoryManga.getMangaCategories(mangaId))
         },
         withResults = {
-            json<List<CategoryDataClass>>(HttpCode.OK)
+            json<Array<CategoryDataClass>>(HttpCode.OK)
         }
     )
 
@@ -205,7 +205,7 @@ object MangaController {
             ctx.future(future { Chapter.getChapterList(mangaId, onlineFetch) })
         },
         withResults = {
-            json<List<ChapterDataClass>>(HttpCode.OK)
+            json<Array<ChapterDataClass>>(HttpCode.OK)
             httpCode(HttpCode.NOT_FOUND)
         }
     )

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/SourceController.kt

@@ -19,12 +19,12 @@ import suwayomi.tachidesk.manga.impl.Search.FilterChange
 import suwayomi.tachidesk.manga.impl.Source
 import suwayomi.tachidesk.manga.impl.Source.SourcePreferenceChange
 import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
+import suwayomi.tachidesk.manga.model.dataclass.SourceDataClass
 import suwayomi.tachidesk.server.JavalinSetup.future
 import suwayomi.tachidesk.server.util.handler
 import suwayomi.tachidesk.server.util.pathParam
 import suwayomi.tachidesk.server.util.queryParam
 import suwayomi.tachidesk.server.util.withOperation
-import javax.sound.sampled.SourceDataLine
 
 object SourceController {
     /** list of sources */
@@ -39,7 +39,7 @@ object SourceController {
             ctx.json(Source.getSourceList())
         },
         withResults = {
-            json<List<SourceDataLine>>(HttpCode.OK)
+            json<Array<SourceDataClass>>(HttpCode.OK)
         }
     )
 
@@ -56,7 +56,7 @@ object SourceController {
             ctx.json(Source.getSource(sourceId)!!)
         },
         withResults = {
-            json<SourceDataLine>(HttpCode.OK)
+            json<SourceDataClass>(HttpCode.OK)
             httpCode(HttpCode.NOT_FOUND)
         }
     )
@@ -118,7 +118,7 @@ object SourceController {
             ctx.json(Source.getSourcePreferences(sourceId))
         },
         withResults = {
-            json<List<Source.PreferenceObject>>(HttpCode.OK)
+            json<Array<Source.PreferenceObject>>(HttpCode.OK)
         }
     )
 
@@ -154,7 +154,7 @@ object SourceController {
             ctx.json(Search.getFilterList(sourceId, reset))
         },
         withResults = {
-            json<List<Search.FilterObject>>(HttpCode.OK)
+            json<Array<Search.FilterObject>>(HttpCode.OK)
         }
     )
 

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt

@@ -14,7 +14,7 @@ import suwayomi.tachidesk.manga.impl.update.IUpdater
 import suwayomi.tachidesk.manga.impl.update.UpdateStatus
 import suwayomi.tachidesk.manga.impl.update.UpdaterSocket
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.MangaChapterDataClass
 import suwayomi.tachidesk.manga.model.dataclass.PaginatedList
 import suwayomi.tachidesk.server.JavalinSetup.future
 import suwayomi.tachidesk.server.util.formParam
@@ -49,10 +49,16 @@ object UpdateController {
             )
         },
         withResults = {
-            json<PaginatedList<MangaDataClass>>(HttpCode.OK)
+            json<PagedMangaChapterListDataClass>(HttpCode.OK)
         }
     )
 
+    /**
+     * Class made for handling return type in the documentation for [recentChapters],
+     * since OpenApi cannot handle runtime generics.
+     */
+    private class PagedMangaChapterListDataClass : PaginatedList<MangaChapterDataClass>(emptyList(), false)
+
     val categoryUpdate = handler(
         formParam<Int?>("categoryId"),
         documentWith = {

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PaginatedList.kt

@@ -9,7 +9,7 @@ package suwayomi.tachidesk.manga.model.dataclass
 
 import kotlin.math.min
 
-data class PaginatedList<T>(
+open class PaginatedList<T>(
     val page: List<T>,
     val hasNextPage: Boolean,
 )

server/src/main/kotlin/suwayomi/tachidesk/server/util/DocumentationDsl.kt

@@ -12,23 +12,44 @@ fun <T> getSimpleParamItem(ctx: Context, param: Param<T>): String? {
         is Param.FormParam -> ctx.formParam(param.key)
         is Param.PathParam -> ctx.pathParam(param.key)
         is Param.QueryParam -> ctx.queryParam(param.key)
+        else -> throw IllegalStateException("Invalid param")
     }
 }
 
 @Suppress("UNCHECKED_CAST")
 fun <T> getParam(ctx: Context, param: Param<T>): T {
-    val typedItem: Any? = when (param.clazz) {
+    if (param is Param.QueryParams<*, *>) {
-        String::class.java -> getSimpleParamItem(ctx, param)
+        val item = ctx.queryParams(param.key).filter(String::isNotBlank)
-        Int::class.java -> getSimpleParamItem(ctx, param)?.toIntOrNull()
+        val typedItem: List<Any?> = when (param.clazz) {
-        Long::class.java -> getSimpleParamItem(ctx, param)?.toLongOrNull()
+            String::class.java, java.lang.String::class.java -> item
-        Boolean::class.java -> getSimpleParamItem(ctx, param)?.toBoolean()
+            Int::class.java, java.lang.Integer::class.java -> item.map { it.toIntOrNull() }
-        Float::class.java -> getSimpleParamItem(ctx, param)?.toFloatOrNull()
+            Long::class.java, java.lang.Long::class.java -> item.map { it.toLongOrNull() }
-        Double::class.java -> getSimpleParamItem(ctx, param)?.toDoubleOrNull()
+            Boolean::class.java, java.lang.Boolean::class.java -> item.map { it.toBoolean() }
+            Float::class.java, java.lang.Float::class.java -> item.map { it.toFloatOrNull() }
+            Double::class.java, java.lang.Double::class.java -> item.map { it.toDoubleOrNull() }
+            else -> throw IllegalStateException("Unknown class ${param.clazz.simpleName}")
+        }.let {
+            if (param.nullable) {
+                it
+            } else {
+                it.filterNotNull()
+            }
+        }.ifEmpty { param.defaultValue }
+        return typedItem as T
+    }
+    val typedItem: Any? = when (val clazz = param.clazz as Class<T>) {
+        String::class.java, java.lang.String::class.java -> getSimpleParamItem(ctx, param) ?: param.defaultValue
+        Int::class.java, java.lang.Integer::class.java -> getSimpleParamItem(ctx, param)?.toIntOrNull() ?: param.defaultValue
+        Long::class.java, java.lang.Long::class.java -> getSimpleParamItem(ctx, param)?.toLongOrNull() ?: param.defaultValue
+        Boolean::class.java, java.lang.Boolean::class.java -> getSimpleParamItem(ctx, param)?.toBoolean() ?: param.defaultValue
+        Float::class.java, java.lang.Float::class.java -> getSimpleParamItem(ctx, param)?.toFloatOrNull() ?: param.defaultValue
+        Double::class.java, java.lang.Double::class.java -> getSimpleParamItem(ctx, param)?.toDoubleOrNull() ?: param.defaultValue
         else -> {
             when (param) {
-                is Param.FormParam -> ctx.formParamAsClass(param.key, param.clazz)
+                is Param.FormParam -> ctx.formParamAsClass(param.key, clazz)
-                is Param.PathParam -> ctx.pathParamAsClass(param.key, param.clazz)
+                is Param.PathParam -> ctx.pathParamAsClass(param.key, clazz)
-                is Param.QueryParam -> ctx.queryParamAsClass(param.key, param.clazz)
+                is Param.QueryParam -> ctx.queryParamAsClass(param.key, clazz)
+                else -> throw IllegalStateException("Invalid param")
             }.let {
                 if (param.nullable) {
                     it.allowNullable().get() ?: param.defaultValue
@@ -61,7 +82,8 @@ inline fun getDocumentation(
             when (it) {
                 is Param.FormParam -> formParam(it.key, it.clazz, !it.nullable && it.defaultValue == null)
                 is Param.PathParam -> pathParam(it.key, it.clazz)
-                is Param.QueryParam -> queryParam(it.key, it.clazz,)
+                is Param.QueryParam -> queryParam(it.key, it.clazz)
+                is Param.QueryParams<*, *> -> queryParam(it.key, it.clazz, isRepeatable = true)
             }
         }
     }
@@ -83,30 +105,39 @@ inline fun <reified T> formParam(key: String, defaultValue: T? = null): Param.Fo
 inline fun <reified T> queryParam(key: String, defaultValue: T? = null): Param.QueryParam<T> {
     return Param.QueryParam(key, T::class.java, defaultValue, null is T)
 }
+inline fun <reified T> queryParams(key: String, defaultValue: List<T> = emptyList()): Param.QueryParams<T, List<T>> {
+    return Param.QueryParams(key, T::class.java, defaultValue, null is T)
+}
 inline fun <reified T> pathParam(key: String): Param.PathParam<T> {
     return Param.PathParam(key, T::class.java, null, false)
 }
 
 sealed class Param<T> {
     abstract val key: String
-    abstract val clazz: Class<T>
+    abstract val clazz: Class<*>
     abstract val defaultValue: T?
     abstract val nullable: Boolean
     data class FormParam<T>(
         override val key: String,
-        override val clazz: Class<T>,
+        override val clazz: Class<*>,
         override val defaultValue: T?,
         override val nullable: Boolean
     ) : Param<T>()
     data class QueryParam<T>(
         override val key: String,
-        override val clazz: Class<T>,
+        override val clazz: Class<*>,
         override val defaultValue: T?,
         override val nullable: Boolean
     ) : Param<T>()
+    data class QueryParams<R, T : List<R>>(
+        override val key: String,
+        override val clazz: Class<R>,
+        override val defaultValue: T,
+        override val nullable: Boolean
+    ) : Param<T>()
     data class PathParam<T>(
         override val key: String,
-        override val clazz: Class<T>,
+        override val clazz: Class<*>,
         override val defaultValue: T?,
         override val nullable: Boolean
     ) : Param<T>()