Merge branch 'refs/heads/test'

.github/workflows/build-test.yml

@@ -0,0 +1,61 @@
+name: build-test
+
+on:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Test server
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          java-package: 'jdk'
+          distribution: 'temurin'
+
+      - name: npm install
+        working-directory: komga-webui
+        run: npm install
+      - name: npm build
+        working-directory: komga-webui
+        run: |
+          npm run build
+          mkdir ../komga/src/main/resources/public
+          cp -r dist/* ../komga/src/main/resources/public/
+        env:
+          NODE_OPTIONS: "--max-old-space-size=4096"
+
+      - name: Build
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          arguments: :komga:bootJar
+      - name: ls
+        run: |
+          version=$(grep '^version=' gradle.properties | cut -d'=' -f2)
+          echo "version=v$version" >> $GITHUB_ENV
+          ls komga/build
+          cp -r komga/build/*
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ env.version }}
+          body: ${{ env.version }}
+          tag_name: ${{ env.version }}
+          append_body: false
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: |
+            komga/build/libs/*.jar
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./komga
+          file: ./komga/docker/Dockerfile.tpl
+          push: true
+          tags: wushuo894/komga-cn:test

CHANGELOG.md

@@ -1,3 +1,122 @@
+# [1.14.0](https://github.com/gotson/komga/compare/1.13.0...1.14.0) (2024-09-27)
+## 🚀 Features
+**docker**
+- bundle kepubify ([1d1e3fd](https://github.com/gotson/komga/commits/1d1e3fd))
+
+**kobo**
+- update changed covers on Kobo ([870afff](https://github.com/gotson/komga/commits/870afff))
+- handle read progression conversion between kepub and epub ([df11920](https://github.com/gotson/komga/commits/df11920))
+- convert books to kepub on the fly using kepubify ([dd39f28](https://github.com/gotson/komga/commits/dd39f28))
+- provide KEPUB format download url if book is kepub ([9e8a525](https://github.com/gotson/komga/commits/9e8a525))
+
+**komga-tray**
+- bundle kepubify for windows and macos apps ([489d4b1](https://github.com/gotson/komga/commits/489d4b1))
+
+**webui**
+- support kepubify path in Server Settings ([d838c85](https://github.com/gotson/komga/commits/d838c85))
+- display KEPUB as book format for kepub files ([12e2436](https://github.com/gotson/komga/commits/12e2436))
+
+**unscoped**
+- detect if epub is a kepub ([0fd783c](https://github.com/gotson/komga/commits/0fd783c))
+
+## 🐛 Fixes
+
+- don't crash if ForwardedHeaderFilter is not defined ([2b18dfa](https://github.com/gotson/komga/commits/2b18dfa))
+
+## 🔄️ Changes
+
+- simplify epub zip functions ([d0143bf](https://github.com/gotson/komga/commits/d0143bf))
+- move TaskPoolSize event to infrastructure package ([734bf8f](https://github.com/gotson/komga/commits/734bf8f))
+
+## 📝 Documentation
+**openapi**
+- split OPDS v1 and v2 ([ca57ab3](https://github.com/gotson/komga/commits/ca57ab3))
+
+## 🌐 Translation
+**komga-tray**
+- translated using Weblate (Danish) ([a253bce](https://github.com/gotson/komga/commits/a253bce))
+- translated using Weblate (Portuguese) ([5494254](https://github.com/gotson/komga/commits/5494254))
+
+**webui**
+- translated using Weblate (Chinese (Simplified Han script)) ([b549038](https://github.com/gotson/komga/commits/b549038))
+- translated using Weblate (Spanish) ([f7d1fe4](https://github.com/gotson/komga/commits/f7d1fe4))
+- translated using Weblate (Danish) ([5c5aabb](https://github.com/gotson/komga/commits/5c5aabb))
+- translated using Weblate (Chinese (Simplified Han script)) ([51cd7e0](https://github.com/gotson/komga/commits/51cd7e0))
+- translated using Weblate (Finnish) ([cc55e2f](https://github.com/gotson/komga/commits/cc55e2f))
+- translated using Weblate (French) ([14bbdc4](https://github.com/gotson/komga/commits/14bbdc4))
+- translated using Weblate (Spanish) ([fdf0582](https://github.com/gotson/komga/commits/fdf0582))
+- translated using Weblate (Croatian) ([9c49f65](https://github.com/gotson/komga/commits/9c49f65))
+- translated using Weblate (Portuguese) ([7e29dc6](https://github.com/gotson/komga/commits/7e29dc6))
+- translated using Weblate (German) ([ebeea18](https://github.com/gotson/komga/commits/ebeea18))
+- translated using Weblate (Turkish) ([e1c2395](https://github.com/gotson/komga/commits/e1c2395))
+
+## ⚙️ Dependencies
+**komga**
+- bump sqlite-jdbc from 3.45.0.0 to 3.46.1.3 ([b9cb0fe](https://github.com/gotson/komga/commits/b9cb0fe))
+
+**webui**
+- bump serve-static and express in /komga-webui ([b64c117](https://github.com/gotson/komga/commits/b64c117))
+
+# [1.13.0](https://github.com/gotson/komga/compare/1.12.1...1.13.0) (2024-09-11)
+## 🚀 Features
+**kobo**
+- sync On Deck as a Kobo collection ([f07be06](https://github.com/gotson/komga/commits/f07be06))
+
+**metadata**
+- support multiple values in Web field from ComicInfo.xml ([d12f3b3](https://github.com/gotson/komga/commits/d12f3b3)), closes [#1639](https://github.com/gotson/komga/issues/1639)
+
+**webui**
+- add sort criteria for known page hash ([be4911d](https://github.com/gotson/komga/commits/be4911d)), closes [#1609](https://github.com/gotson/komga/issues/1609)
+
+## 🐛 Fixes
+
+- admin user created by claiming does not have kobo sync role ([bf8bbdd](https://github.com/gotson/komga/commits/bf8bbdd)), closes [#1686](https://github.com/gotson/komga/issues/1686)
+
+## 🏎 Perf
+**api**
+- make on deck much faster ([e72ff78](https://github.com/gotson/komga/commits/e72ff78))
+
+## 🛠  Build
+**benchmark**
+- mark some books as read for on deck ([0047a91](https://github.com/gotson/komga/commits/0047a91))
+
+## 🌐 Translation
+**komga-tray**
+- translated using Weblate (Croatian) ([b8f2cea](https://github.com/gotson/komga/commits/b8f2cea))
+
+**webui**
+- translated using Weblate (Chinese (Simplified Han script)) ([bc913ad](https://github.com/gotson/komga/commits/bc913ad))
+- translated using Weblate (Korean) ([41c93fd](https://github.com/gotson/komga/commits/41c93fd))
+- translated using Weblate (Finnish) ([026c696](https://github.com/gotson/komga/commits/026c696))
+- translated using Weblate (French) ([c725d73](https://github.com/gotson/komga/commits/c725d73))
+- translated using Weblate (Spanish) ([ffc7bc3](https://github.com/gotson/komga/commits/ffc7bc3))
+- translated using Weblate (Croatian) ([15eb9a4](https://github.com/gotson/komga/commits/15eb9a4))
+- translated using Weblate (Russian) ([8249e0f](https://github.com/gotson/komga/commits/8249e0f))
+
+# [1.12.1](https://github.com/gotson/komga/compare/1.12.0...1.12.1) (2024-09-04)
+## 🐛 Fixes
+**kobo**
+- better handling of missing port from Kobo Sync requests ([4cd838a](https://github.com/gotson/komga/commits/4cd838a))
+- use the total progression sent by Kobo ([be37127](https://github.com/gotson/komga/commits/be37127))
+- correctly propagate metadata update during kobo sync ([20e7c29](https://github.com/gotson/komga/commits/20e7c29))
+- properly store total progression on state update ([fcde9c9](https://github.com/gotson/komga/commits/fcde9c9))
+- properly mark book as read when finished on Kobo ([c3fc37a](https://github.com/gotson/komga/commits/c3fc37a))
+
+**webui**
+- only show API key copy button if clipboard is available ([4351086](https://github.com/gotson/komga/commits/4351086)), closes [#1675](https://github.com/gotson/komga/issues/1675)
+
+## 🔄️ Changes
+
+- adjust loglevel for LoginListener ([2c260b1](https://github.com/gotson/komga/commits/2c260b1))
+
+## 🛠  Build
+**webui**
+- update Browserslist db ([63e1c0c](https://github.com/gotson/komga/commits/63e1c0c))
+
+## 📝 Documentation
+
+- add kobo sync in readme ([02e8d30](https://github.com/gotson/komga/commits/02e8d30))
+
 # [1.12.0](https://github.com/gotson/komga/compare/1.11.3...1.12.0) (2024-08-29)
 ## 🚀 Features
 **kobo**

conveyor.conf

@@ -45,12 +45,16 @@ app {
         exe-installer-basename = "KomgaInstaller"
         manifests.msix.background-color = transparent
         inputs += ./komga-tray/lib/windows/x64/
+        amd64.inputs += "https://github.com/pgaskin/kepubify/releases/latest/download/kepubify-windows-64bit.exe" -> kepubify.exe
+        aarch64.inputs += "https://github.com/pgaskin/kepubify/releases/latest/download/kepubify-windows-arm64.exe" -> kepubify.exe
     }
 
     mac {
         info-plist.LSMinimumSystemVersion = 12
         aarch64.inputs += ./komga-tray/lib/mac/aarch64/
+        aarch64.inputs += "https://github.com/pgaskin/kepubify/releases/latest/download/kepubify-darwin-arm64" -> kepubify
         amd64.inputs += ./komga-tray/lib/mac/x64/
+        amd64.inputs += "https://github.com/pgaskin/kepubify/releases/latest/download/kepubify-darwin-64bit" -> kepubify
     }
 
     site {

gradle.properties

@@ -1,2 +1,2 @@
-version=1.12.0
+version=1.14.0
 org.gradle.jvmargs=-Xmx2G

komga-tray/src/main/resources/application-mac.yml

@@ -3,3 +3,10 @@ logging:
     name: ${user.home}/Library/Logs/Komga/komga.log
 komga:
   config-dir: ${user.home}/Library/Application Support/Komga
+  kobo.kepubify-path: kepubify
+spring:
+  config:
+    import:
+      - "optional:file:${komga.config-dir}/application.yml"
+      - "optional:file:${komga.config-dir}/application.yaml"
+      - "optional:file:${komga.config-dir}/application.properties"

komga-tray/src/main/resources/application-windows.yml

@@ -1,2 +1,9 @@
 komga:
   config-dir: ${LOCALAPPDATA}/Komga
+  kobo.kepubify-path: kepubify.exe
+spring:
+  config:
+    import:
+      - "optional:file:${komga.config-dir}/application.yml"
+      - "optional:file:${komga.config-dir}/application.yaml"
+      - "optional:file:${komga.config-dir}/application.properties"

komga-tray/src/main/resources/org/gotson/komga/messages_da.properties

@@ -0,0 +1,9 @@
+dialog_error.close=Luk
+dialog_error.copy_clipboard=Kopier til udklipsholder
+dialog_error.title=Komga kunne ikke starte
+error_message.port_in_use=Port {} er allerede i brug.\nKomga kører sandsynligvis allerede.\nTjek systembakken eller menulinjen for Komga-ikonet.
+error_message.unexpected=Der opstod en uventet fejl.
+menu.open_komga=Åbn Komga
+menu.quit=Afslut Komga
+menu.show_conf_dir=Åbn konfigurationsmappen
+menu.show_log=Vis logfil

komga-tray/src/main/resources/org/gotson/komga/messages_hr.properties

@@ -0,0 +1,9 @@
+dialog_error.close=Zatvori
+dialog_error.copy_clipboard=Kopiraj u međuspremnik
+dialog_error.title=Komga se nije mogao pokrenuti
+error_message.port_in_use=Priključak {} se već koristi.\nKomga vjerojatno već radi.\nPotraži Komga ikonu u traci ikona ili traci izbornika.
+error_message.unexpected=Dogodila se neočekivana greška.
+menu.open_komga=Otvori Komga
+menu.quit=Zatvori Komga
+menu.show_conf_dir=Otvori mapu konfiguracije
+menu.show_log=Prikaži log-datoteku

komga-tray/src/main/resources/org/gotson/komga/messages_pt.properties

@@ -0,0 +1,4 @@
+dialog_error.close=Fechar
+error_message.unexpected=Ocorreu um erro inesperado.
+menu.open_komga=Abrir Komga
+menu.quit=Fechar Komga