Merge branch 'main' into paging-seal

Stirling-Tools · Aug 12, 2024 · 3b8d726 · 3b8d726
2 parents 02e43ec + 68c3870
commit 3b8d726
Show file tree

Hide file tree

Showing 80 changed files with 4,819 additions and 510 deletions.
diff --git a/.github/ISSUE_TEMPLATE/2-feature.yml b/.github/ISSUE_TEMPLATE/2-feature.yml
@@ -1,6 +1,8 @@
 name: Feature Request
 description: Submit a new feature request.
 title: "[Feature Request]: "
+labels:
+  - enhancement
 body:
   - type: markdown
     attributes:

diff --git a/.github/labeler-config.yml b/.github/labeler-config.yml
@@ -1,6 +1,7 @@
 Translation:
   - changed-files:
     - any-glob-to-any-file: 'src/main/resources/messages_*_*.properties'
+    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
 
 Front End:
   - changed-files:
@@ -45,4 +46,4 @@ Docker:
 Test:
   - changed-files:
     - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'test*'
+    - any-glob-to-any-file: 'src/test**/*'
diff --git a/.github/labels.yml b/.github/labels.yml
@@ -88,4 +88,6 @@
   description: "API-related issues or pull requests"
 - name: "Test"
   color: "FF9E1F"
-  description: "Testing-related issues or pull requests"
+  description: "Testing-related issues or pull requests"
+- name: "Stale"
+  color: "000000"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,8 +29,8 @@ jobs:
 
       - name: Install Docker Compose
         run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          # sudo chmod +x /usr/local/bin/docker-compose
+          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo chmod +x /usr/local/bin/docker-compose
 
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-
-
 ### Eclipse ###
 .metadata
 bin/
@@ -22,7 +20,6 @@ customFiles/
 configs/
 watchedFolders/
 
-
 # Gradle
 .gradle
 .lock
@@ -119,12 +116,48 @@ watchedFolders/
 *.db
 /build
 
-/.vscode
-/.idea
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*.pyo
+
+# Virtual environments
+.env*
+.venv*
+env*/
+venv*/
+ENV/
+env.bak/
+venv.bak/
+
+# VS Code
+/.vscode/**/*
+!/.vscode/settings.json
+
+# IntelliJ IDEA
+.idea/
+*.iml
+out/
 
 # Ignore Mac DS_Store files
 .DS_Store
 **/.DS_Store
 
-#cucumber
-/cucumber/reports/**
+# cucumber
+/cucumber/reports/**
+
+# Certs
+*.p12
+*.pem
+*.crt
+*.cer
+*.der
+*.key
+*.csr
+
+# cache
+.ruff_cache
+.mypy_cache
+.pytest_cache
+.ipynb_checkpoints
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,53 @@
+{
+  "java.compile.nullAnalysis.mode": "automatic",
+  "files.eol": "auto",
+  "java.configuration.updateBuildConfiguration": "interactive",
+  "black-formatter.args": ["--line-length", "127"],
+  "flake8.args": ["--max-line-length", "127"],
+  "pylint.args": ["max-line-length", "127"],
+  "[java]": {
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[python]": {
+    "editor.tabSize": 2,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[gradle-build]": {
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[gradle]": {
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[html]": {
+    "editor.tabSize": 2,
+    "editor.rulers": [127],
+    "files.trimFinalNewlines": false,
+    "files.insertFinalNewline": false
+  },
+  "[javascript]": {
+    "editor.tabSize": 2,
+    "editor.rulers": [127]
+  },
+  "[yaml]": {
+    "files.trimFinalNewlines": false,
+    "files.insertFinalNewline": false
+  },
+  "diffEditor.maxComputationTime": 0,
+  "editor.wordSegmenterLocales": null,
+  "editor.guides.bracketPairs": "active",
+  "editor.guides.bracketPairsHorizontal": "active",
+  "files.insertFinalNewline": true,
+  "files.trimFinalNewlines": true,
+  "files.trimTrailingWhitespace": true,
+  "editor.indentSize": "tabSize",
+  "editor.stickyScroll.enabled": false,
+  "editor.minimap.enabled": false,
+  "editor.formatOnSave": true
+}
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Main stage
-FROM alpine:3.20.0
+FROM alpine:3.20.2
 
 # Copy necessary files
 COPY scripts /scripts
@@ -45,8 +45,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # CV
         py3-opencv \
 # python3/pip
-        python3 && \
-    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
+        python3 \
+    py3-pip && \
 # uno unoconv and HTML
     pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \

diff --git a/Dockerfile-fat b/Dockerfile-fat
@@ -12,7 +12,7 @@ RUN DOCKER_ENABLE_SECURITY=true \
 ./gradlew clean build 
 
 # Main stage
-FROM alpine:3.20.0
+FROM alpine:3.20.2
 
 # Copy necessary files
 COPY scripts /scripts
@@ -61,8 +61,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # CV
         py3-opencv \
 # python3/pip
-        python3 && \
-    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
+        python3 \
+    py3-pip && \
 # uno unoconv and HTML
     pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \

diff --git a/Dockerfile-ultra-lite b/Dockerfile-ultra-lite
@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.20.0
+FROM alpine:3.20.2
 
 ARG VERSION_TAG
 

diff --git a/README.md b/README.md
@@ -165,43 +165,46 @@ Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR
 
 ## Supported Languages
 
-Stirling PDF currently supports 33!
+Stirling PDF currently supports 38!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
-| English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
-| English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
 | Arabic (العربية) (ar_AR)                    | ![45%](https://geps.dev/progress/45)   |
-| German (Deutsch) (de_DE)                    | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                   | ![94%](https://geps.dev/progress/94)   |
-| Spanish (Español) (es_ES)                   | ![92%](https://geps.dev/progress/92)   |
-| Simplified Chinese (简体中文) (zh_CN)       | ![98%](https://geps.dev/progress/98)   |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![96%](https://geps.dev/progress/96)   |
+| Basque (Euskara) (eu_ES)                    | ![61%](https://geps.dev/progress/61)   |
+| Bulgarian (Български) (bg_BG)               | ![94%](https://geps.dev/progress/94)   |
 | Catalan (Català) (ca_CA)                    | ![48%](https://geps.dev/progress/48)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![94%](https://geps.dev/progress/94)   |
+| Czech (Česky) (cs_CZ)                       | ![89%](https://geps.dev/progress/89)   |
+| Danish (Dansk) (da_DK)                      | ![9%](https://geps.dev/progress/9)   |
+| Dutch (Nederlands) (nl_NL)                  | ![95%](https://geps.dev/progress/95)   |
+| English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
+| English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
+| French (Français) (fr_FR)                   | ![93%](https://geps.dev/progress/93)   |
+| German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99) |
+| Greek (Ελληνικά) (el_GR)                    | ![81%](https://geps.dev/progress/81)   |
+| Hindi (हिंदी) (hi_IN)                          | ![76%](https://geps.dev/progress/76)   |
+| Hungarian (Magyar) (hu_HU)                  | ![75%](https://geps.dev/progress/75)   |
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![76%](https://geps.dev/progress/76)   |
+| Irish (Gaeilge) (ga_IE)                     | ![98%](https://geps.dev/progress/98)   |
 | Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
-| Swedish (Svenska) (sv_SE)                   | ![39%](https://geps.dev/progress/39)   |
-| Polish (Polski) (pl_PL)                     | ![90%](https://geps.dev/progress/90)   |
-| Romanian (Română) (ro_RO)                   | ![39%](https://geps.dev/progress/39)   |
+| Japanese (日本語) (ja_JP)                   | ![92%](https://geps.dev/progress/92)   |
 | Korean (한국어) (ko_KR)                     | ![84%](https://geps.dev/progress/84)   |
-| Portuguese Brazilian (Português) (pt_BR)    | ![60%](https://geps.dev/progress/60)   |
+| Norwegian (Norsk) (no_NB)                   | ![97%](https://geps.dev/progress/97)   |
+| Polish (Polski) (pl_PL)                     | ![92%](https://geps.dev/progress/92)   |
 | Portuguese (Português) (pt_PT)              | ![78%](https://geps.dev/progress/78)   |
-| Russian (Русский) (ru_RU)                   | ![84%](https://geps.dev/progress/84)   |
-| Basque (Euskara) (eu_ES)                    | ![62%](https://geps.dev/progress/62)   |
-| Japanese (日本語) (ja_JP)                   | ![90%](https://geps.dev/progress/90)   |
-| Dutch (Nederlands) (nl_NL)                  | ![96%](https://geps.dev/progress/96)   |
-| Greek (Ελληνικά) (el_GR)                    | ![82%](https://geps.dev/progress/82)   |
-| Turkish (Türkçe) (tr_TR)                    | ![99%](https://geps.dev/progress/99)   |
-| Indonesia (Bahasa Indonesia) (id_ID)        | ![76%](https://geps.dev/progress/76)   |
-| Hindi (हिंदी) (hi_IN)                          | ![77%](https://geps.dev/progress/77)   |
-| Hungarian (Magyar) (hu_HU)                  | ![76%](https://geps.dev/progress/76)   |
-| Bulgarian (Български) (bg_BG)               | ![94%](https://geps.dev/progress/94)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![59%](https://geps.dev/progress/59)   |
+| Romanian (Română) (ro_RO)                   | ![38%](https://geps.dev/progress/38)   |
+| Russian (Русский) (ru_RU)                   | ![83%](https://geps.dev/progress/83)   |
 | Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![78%](https://geps.dev/progress/78)   |
-| Ukrainian (Українська) (uk_UA)              | ![90%](https://geps.dev/progress/90)   |
-| Slovakian (Slovensky) (sk_SK)               | ![92%](https://geps.dev/progress/92)   |
-| Czech (Česky) (cs_CZ)                       | ![90%](https://geps.dev/progress/90)   |
-| Croatian (Hrvatski) (hr_HR)                 | ![95%](https://geps.dev/progress/95)   |
-| Norwegian (Norsk) (no_NB)                   | ![96%](https://geps.dev/progress/96)   |
-| Thai (ไทย) (th_TH)                          | ![100%](https://geps.dev/progress/100) |
+| Simplified Chinese (简体中文) (zh_CN)       | ![98%](https://geps.dev/progress/98)   |
+| Slovakian (Slovensky) (sk_SK)               | ![91%](https://geps.dev/progress/91)   |
+| Spanish (Español) (es_ES)                   | ![97%](https://geps.dev/progress/97)   |
+| Swedish (Svenska) (sv_SE)                   | ![39%](https://geps.dev/progress/39)   |
+| Thai (ไทย) (th_TH)                          | ![99%](https://geps.dev/progress/99) |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![97%](https://geps.dev/progress/97)   |
+| Turkish (Türkçe) (tr_TR)                    | ![98%](https://geps.dev/progress/98)   |
+| Ukrainian (Українська) (uk_UA)              | ![89%](https://geps.dev/progress/89)   |
+| Vietnamese (Tiếng Việt) (vi_VN)             | ![98%](https://geps.dev/progress/98)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
@@ -213,7 +216,7 @@ Stirling PDF allows easy customization of the app.
 Includes things like
 
 - Custom application name
-- Custom slogans, icons, HTML, images CSS etc (via file overrides) 
+- Custom slogans, icons, HTML, images CSS etc (via file overrides)
 
 There are two options for this, either using the generated settings file ``settings.yml``
 This file is located in the ``/configs`` directory and follows standard YAML formatting

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "3.3.0"
-    id "io.spring.dependency-management" version "1.1.5"
+    id "org.springframework.boot" version "3.3.2"
+    id "io.spring.dependency-management" version "1.1.6"
     id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
     id "io.swagger.swaggerhub" version "1.3.2"
     id "edu.sc.seis.launch4j" version "3.0.5"
@@ -16,10 +16,12 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.26.2"
+version = "0.27.0"
 
-// 17 is lowest but we support and recommend 21
-sourceCompatibility = "17"
+java {
+    // 17 is lowest but we support and recommend 21
+    sourceCompatibility = JavaVersion.VERSION_17
+}
 
 repositories {
     mavenCentral()
@@ -106,7 +108,7 @@ dependencies {
 
     // implementation "org.yaml:snakeyaml:2.2"
     implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4'
-    
+
     // Exclude Tomcat and include Jetty
     implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion") {
         exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
@@ -132,8 +134,8 @@ dependencies {
     implementation "org.apache.xmlgraphics:batik-all:1.17"
 
     // TwelveMonkeys
-    implementation "com.twelvemonkeys.imageio:imageio-batik:3.10.1"
-    implementation "com.twelvemonkeys.imageio:imageio-bmp:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-batik:3.11.0"
+    implementation "com.twelvemonkeys.imageio:imageio-bmp:3.11.0"
     // implementation "com.twelvemonkeys.imageio:imageio-hdr:3.10.1"
     // implementation "com.twelvemonkeys.imageio:imageio-icns:3.10.1"
     // implementation "com.twelvemonkeys.imageio:imageio-iff:3.10.1"
@@ -145,8 +147,8 @@ dependencies {
     // implementation "com.twelvemonkeys.imageio:imageio-sgi:3.10.1"
     // implementation "com.twelvemonkeys.imageio:imageio-tga:3.10.1"
     // implementation "com.twelvemonkeys.imageio:imageio-thumbsdb:3.10.1"
-    implementation "com.twelvemonkeys.imageio:imageio-tiff:3.10.1"
-    implementation "com.twelvemonkeys.imageio:imageio-webp:3.10.1"
+    implementation "com.twelvemonkeys.imageio:imageio-tiff:3.11.0"
+    implementation "com.twelvemonkeys.imageio:imageio-webp:3.11.0"
     // implementation "com.twelvemonkeys.imageio:imageio-xwd:3.10.1"
 
     implementation "commons-io:commons-io:2.16.1"
@@ -185,7 +187,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.32"
     annotationProcessor "org.projectlombok:lombok:1.18.32"
 
-    testImplementation 'org.mockito:mockito-inline:3.12.4'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -196,7 +198,7 @@ compileJava {
     options.compilerArgs << "-parameters"
 }
 
-task writeVersion  {
+task writeVersion {
     def propsFile = file("src/main/resources/version.properties")
     def props = new Properties()
     props.setProperty("version", version)
@@ -226,6 +228,6 @@ tasks.named("test") {
     useJUnitPlatform()
 }
 
-task printVersion  {
+task printVersion {
     println project.version
 }
diff --git a/chart/stirling-pdf/Chart.yaml b/chart/stirling-pdf/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.26.2
+appVersion: 0.27.0
 description: locally hosted web application that allows you to perform various operations
   on PDF files
 home: https://github.com/Stirling-Tools/Stirling-PDF