Update build.gradle

Minor fixes

.github/workflows/codeql.yml

@@ -46,7 +46,7 @@ jobs:
    #   with:
    #     languages: java
 
-    - uses: gradle/gradle-build-action@v2.3.3
+    - uses: gradle/gradle-build-action@v2.4.2
       with:
         gradle-version: 7.6
         arguments: assemble --no-build-cache

.github/workflows/push-docker.yml

@@ -1,10 +1,10 @@
 name: Push Docker Image with VersionNumber
 
 on:
+  workflow_dispatch:
   push:
     branches: 
       - master
-      - testGit
       - main
 jobs:
   push:
@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3.5.2
     
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v3.11.0
       with:
         java-version: '17'
         distribution: 'temurin'
     
 
-    - uses: gradle/gradle-build-action@v2.3.3
+    - uses: gradle/gradle-build-action@v2.4.2
       with:
         gradle-version: 7.6
         arguments: clean build
@@ -37,43 +37,39 @@ jobs:
       uses: docker/login-action@v2.1.0
       with:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
-        password: ${{ secrets.DOCKER_HUB_API }} 
-   
-  #  - name: Check if tag exists
-  #    id: checkIdExists
-  #    continue-on-error: true
-  #    run: |
-  #      response=$(curl -s https://hub.docker.com/v2/repositories/frooodle/s-pdf/tags/?name=${{ steps.versionNumber.outputs.versionNumber }})
-  #      result=$(echo $response | jq ".results")
-  #      if [ "$result" == "[]" ]; then
-  #        echo "Tag ${{ steps.versionNumber.outputs.versionNumber }} doesnt exist. Continuing with build and push."
-  #      else
-  #        echo "Tag ${{ steps.versionNumber.outputs.versionNumber }} already exists. Skipping build and push."
-  #        exit 1;
-  #      fi
-
-   
-   
-    - name: Setup buildx
-      run: |
-        docker buildx create --name mybuilder
-        docker buildx use mybuilder
-
-    - name: Build and push versioned amd64 and v8 
-      if: github.ref == 'refs/heads/main'
-      run: | 
-        docker buildx build --platform="linux/amd64,linux/arm64/v8" --push --tag "frooodle/s-pdf:${{ steps.versionNumber.outputs.versionNumber }}-alpha" .
-
+        password: ${{ secrets.DOCKER_HUB_API }}
         
-    - name: Build and push versioned amd64 and v8 
-      if: github.ref == 'refs/heads/master'
-      run: | 
-        docker buildx build --platform="linux/amd64,linux/arm64/v8" --push --tag "frooodle/s-pdf:${{ steps.versionNumber.outputs.versionNumber }}" .
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v2.1.0
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ github.token }}
 
-   
-    - name: Build and push latest amd64 and v8
-      if: github.ref == 'refs/heads/master'
-      run: | 
-        docker buildx build --platform="linux/amd64,linux/arm64/v8" --push --tag "frooodle/s-pdf:latest" .
-        
+    - name: Generate tags
+      id: meta
+      uses: docker/metadata-action@v4.4.0
+      with:
+        images: |
+          ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+          ghcr.io/${{ github.repository_owner }}/s-pdf
+        tags: |
+          ${{ steps.versionNumber.outputs.versionNumber }}${{ github.ref == 'refs/heads/main' && '-alpha' || '' }}
+          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2.1.0
+      
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2.5.0
         
+    - name: Build and push
+      uses: docker/build-push-action@v4.0.0
+      with:
+        context: .
+        push: true
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        platforms: linux/amd64,linux/arm64/v8

.gitignore

@@ -109,4 +109,6 @@ local.properties
 *.tar.gz
 *.rar
 
-/build
+/build
+
+/.vscode

CNAME

@@ -0,0 +1 @@
+stirlingtools.com

Dockerfile

@@ -1,5 +1,9 @@
 # Build jbig2enc in a separate stage
-FROM frooodle/stirling-pdf-base:latest
+FROM frooodle/stirling-pdf-base:beta2
+
+# Create scripts folder and copy local scripts
+RUN mkdir /scripts
+COPY ./scripts/* /scripts/
 
 # Copy the application JAR file
 COPY build/libs/*.jar app.jar
@@ -13,7 +17,6 @@ ENV APP_HOME_NAME="Stirling PDF"
 #ENV APP_NAVBAR_NAME="Stirling PDF"
 
 # Run the application
-ENTRYPOINT java -jar /app.jar
-
-
-
+RUN chmod +x /scripts/init.sh
+ENTRYPOINT ["/scripts/init.sh"]
+CMD ["java", "-jar", "/app.jar"]

DockerfileBase

@@ -21,10 +21,9 @@ RUN git clone https://github.com/agl/jbig2enc && \
     make && \
     make install
 
-# Main stage
-FROM openjdk:17-jdk-slim
 
-# Install necessary dependencies
+# Main stage
+FROM openjdk:17-jdk-slim AS base
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         libreoffice-core \
@@ -33,12 +32,31 @@ RUN apt-get update && \
         libreoffice-calc \
         libreoffice-impress \
         python3-uno \
-		python3-pip \
+        python3-pip \
         unoconv \
-		pngquant \
-		unpaper \
+        pngquant \
+        unpaper \
         ocrmypdf && \
-	pip install --user --upgrade ocrmypdf
+    rm -rf /var/lib/apt/lists/* && \
+    mkdir /usr/share/tesseract-ocr-original && \
+    cp -r /usr/share/tesseract-ocr/* /usr/share/tesseract-ocr-original && \
+    rm -rf /usr/share/tesseract-ocr
 
-# Copy the jbig2enc binary from the builder stage
+# Python packages stage
+FROM base AS python-packages
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        build-essential \
+        libffi-dev \
+        libssl-dev \
+        zlib1g-dev \
+        libjpeg-dev && \
+    pip install --upgrade pip && \
+    pip install --no-cache-dir \
+        opencv-python-headless && \
+    rm -rf /var/lib/apt/lists/*
+
+# Final stage: Copy necessary files from the previous stage
+FROM base
+COPY --from=python-packages /usr/local /usr/local
 COPY --from=jbig2enc_builder /usr/local/bin/jbig2 /usr/local/bin/jbig2

HowToAddNewLanguage.md

@@ -8,11 +8,18 @@ Fork Stirling-PDF and make a new branch out of Main
 
 Then add reference to the language in the navbar by adding a new language entry to the dropdown
 
-https://github.com/Frooodle/Stirling-PDF/blob/main/src/main/resources/templates/fragments/navbar.html#L80
+https://github.com/Frooodle/Stirling-PDF/blob/main/src/main/resources/templates/fragments/navbar.html#L306
+and add a flag svg file to 
+https://github.com/Frooodle/Stirling-PDF/tree/main/src/main/resources/static/images/flags
+Any SVG flags are fine, i got most of mine from [here](https://flagicons.lipis.dev/)
+If your language isnt represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
+
 
 For example to add Polish you would add 
 ```
-<a class="dropdown-item lang_dropdown-item" href="" data-language-code="pl_PL">Polish</a>
+<a class="dropdown-item lang_dropdown-item" href="" data-language-code="pl_PL">
+    <img src="images/flags/pl.svg" alt="icon" width="20" height="15"> Polski
+</a>
 ```
 The data-language-code is the code used to reference the file in the next step.
 

HowToUseOCR.md

@@ -20,6 +20,8 @@ Depending on your requirements, you can choose the appropriate language pack for
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
 2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/4.00/tessdata`
 
+# DO NOT REMOVE EXISTING ENG.TRAINEDDATA, ITS REQUIRED.
+
 #### Docker
 
 If you are using Docker, you need to expose the Tesseract tessdata directory as a volume in order to use the additional language packs. 
@@ -32,14 +34,14 @@ services:
   your_service_name:
     image: your_docker_image_name
     volumes:
-      - /usr/share/tesseract-ocr/4.00/tessdata:/location/of/trainingData
+      - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata
 ```
 
 
 #### Docker run
 Add the following to your existing docker run command
 ```bash
--v /usr/share/tesseract-ocr/4.00/tessdata:/location/of/trainingData
+-v /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata
 ```
 
 #### Non-Docker

LocalRunGuide.md

@@ -0,0 +1,137 @@
+
+To run the application without Docker, you will need to manually install all dependencies and build the necessary components.
+
+Note that some dependencies might not be available in the standard repositories of all Linux distributions, and may require additional steps to install.
+
+The following guide assumes you have a basic understanding of using a command line interface in your operating system.
+
+It should work on most Linux distributions and MacOS. For Windows, you might need to use Windows Subsystem for Linux (WSL) for certain steps.
+The amount of dependencies is to actually reduce overall size, ie installing LibreOffice sub components rather than full LibreOffice package.
+
+### Step 1: Prerequisites
+
+Install the following software, if not already installed:
+
+- Java 17 or later
+
+- Gradle 7.0 or later (included within repo so not needed on server)
+
+- Git
+
+- Python 3 (with pip)
+
+- Make
+
+- GCC/G++
+
+- Automake
+
+- Autoconf
+
+- libtool
+
+- pkg-config
+
+- zlib1g-dev
+
+- libleptonica-dev
+
+For Debian-based systems, you can use the following command:
+
+```bash
+sudo apt-get update
+sudo apt-get install -y git  automake  autoconf  libtool  libleptonica-dev  pkg-config zlib1g-dev make g++ java-17-openjdk python3 python3-pip
+```
+
+### Step 2: Clone and Build jbig2enc (Only required for certain OCR functionality)
+
+```bash
+git clone https:github.com/agl/jbig2enc
+cd jbig2enc
+./autogen.sh
+./configure
+make
+sudo make install
+```
+
+### Step 3: Install Additional Software
+Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and opencv for patern recognition functionality.
+
+Install the following software:
+
+- libreoffice-core
+
+- libreoffice-common
+
+- libreoffice-writer
+
+- libreoffice-calc
+
+- libreoffice-impress
+
+- python3-uno
+
+- unoconv
+
+- pngquant
+
+- unpaper
+
+- ocrmypdf
+
+- opencv-python-headless
+
+For Debian-based systems, you can use the following command:
+
+```bash
+sudo apt-get install -y libreoffice-core libreoffice-common libreoffice-writer libreoffice-calc  libreoffice-impress python3-uno  unoconv  pngquant  unpaper  ocrmypdf
+pip3 install opencv-python-headless
+```
+
+### Step 4: Clone and Build Stirling-PDF
+
+```bash
+git clone https://github.com/Frooodle/Stirling-PDF.git
+cd Stirling-PDF
+./gradlew build
+```
+
+
+### Step 5: Move jar to desired location
+
+After the build process, a `.jar` file will be generated in the `build/libs` directory.
+You can move this file to a desired location, for example, `/opt/Stirling-PDF/`.
+You must also move the Script folder within the Stirling-PDF repo that you have downloaded to this directory.
+This folder is required for the python scripts using OpenCV
+
+### Step 6: Other files
+#### OCR
+If you plan to use the OCR (Optical Character Recognition) functionality, you might need to install language packs for Tesseract if running none english scanning.
+
+##### Installing Language Packs
+
+1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
+2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/4.00/tessdata`
+Please view  [OCRmyPDF install guide](https:ocrmypdf.readthedocs.io/en/latest/installation.html) for more info.
+**IMPORTANT:** DO NOT REMOVE EXISTING `eng.traineddata`, IT'S REQUIRED.
+
+
+
+### Step 7: Run Stirling-PDF
+
+```bash
+./gradlew bootRun
+or
+java -jar build/libs/app.jar
+```
+
+Remember to set the necessary environment variables before running the project if you want to customize the application the list can be seen in the main readme.
+
+You can do this in the terminal by using the `export` command or -D arguements to java -jar command:
+
+```bash
+export APP_HOME_NAME="Stirling PDF"
+or
+-DAPP_HOME_NAME="Stirling PDF" 
+```
+

README.md

@@ -10,7 +10,7 @@
 
 This is a powerful locally hosted web based PDF manipulation tool using docker that allows you to perform various operations on PDF files, such as splitting merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application started as a 100% ChatGPT-made application and has evolved to include a wide range of features to handle all your PDF needs.
 
-Feel free to request any features of bug fixes either in github issues or our [Discord](https://discord.gg/Cn8pWhQRxZ)
+Feel free to request any features or bug fixes either in github issues or our [Discord](https://discord.gg/Cn8pWhQRxZ)
 
 
 ![stirling-home](images/stirling-home.png)
@@ -21,7 +21,12 @@ Feel free to request any features of bug fixes either in github issues or our [D
 - Merge multiple PDFs together into a single resultant file
 - Convert PDFs to and from images
 - Reorganize PDF pages into different orders.
-- Add images to PDFs at specified locations. (WIP)
+- Add/Generate signatures
+- Flatten PDFs
+- Repair PDFs
+- Detect and remove blank pages
+- Compare 2 PDFs and show differences in text
+- Add images to PDFs
 - Rotating PDFs in 90 degree increments.
 - Compressing PDFs to decrease their filesize. (Using OCRMyPDF)
 - Add and remove passwords
@@ -35,6 +40,9 @@ Feel free to request any features of bug fixes either in github issues or our [D
 - Dark mode support.
 - Custom download options (see [here](https://github.com/Frooodle/Stirling-PDF/blob/main/images/settings.png) for example)
 - Parallel file processing and downloads
+- API for integration with external scripts 
+
+Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) hosted by the team at adminforge.de
 
 ## Technologies used
 - Spring Boot + Thymeleaf
@@ -49,31 +57,47 @@ Feel free to request any features of bug fixes either in github issues or our [D
 ## How to use
 
 ### Locally
-
-Prerequisites
-- Java 17 or later
-- Gradle 7.0 or later
-
-1. Clone or download the repository.
-2. Build the project using Gradle by running `./gradlew build`
-3. Start the application by running `./gradlew bootRun` or by calling the build jar in build/libs with java -jar jarName.jar
-
+Please view https://github.com/Frooodle/Stirling-PDF/blob/main/LocalRunGuide.md
 
 ### Docker
 https://hub.docker.com/r/frooodle/s-pdf
 
 Docker Run
 ```
-docker run -p 8080:8080 frooodle/s-pdf
+docker run -d \
+  -p 8080:8080 \
+  -v /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata \
+  --name stirling-pdf \
+  frooodle/s-pdf
+  
+  
+  Can also add these for customisation but are not required
+  -e APP_HOME_NAME="Stirling PDF" \
+  -e APP_HOME_DESCRIPTION="Your locally hosted one-stop-shop for all your PDF needs." \
+  -e APP_NAVBAR_NAME="Stirling PDF" \
+  -e ALLOW_GOOGLE_VISABILITY="true" \
+  -e APP_ROOT_PATH="/" \
+  -e APP_LOCALE="en_GB" \
 ```
 Docker Compose
 ```
 version: '3.3'
 services:
-    s-pdf:
-        ports:
-            - '8080:8080'
-        image: frooodle/s-pdf
+  stirling-pdf:
+    image: frooodle/s-pdf
+    ports:
+      - '8080:8080'
+    volumes:
+      - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata #Required for extra OCR languages
+#      - /location/of/extraConfigs:/configs
+#    environment:
+#      APP_LOCALE: en_GB
+#      APP_HOME_NAME: Stirling PDF
+#      APP_HOME_DESCRIPTION: Your locally hosted one-stop-shop for all your PDF needs.
+#      APP_NAVBAR_NAME: Stirling PDF
+#      APP_ROOT_PATH: /
+#      ALLOW_GOOGLE_VISABILITY: true
+
 ```
 
 
@@ -81,6 +105,14 @@ services:
 Please view https://github.com/Frooodle/Stirling-PDF/blob/main/HowToUseOCR.md
 
 ## Want to add your own language?
+Stirling PDF currently supports
+- English
+- Arabic (العربية)
+- German (Deutsch)
+- French (Français)
+- Spanish (Español)
+- Chinese (简体中文)
+
 If you want to add your own language to Stirling-PDF please refer
 https://github.com/Frooodle/Stirling-PDF/blob/main/HowToAddNewLanguage.md
 
@@ -98,4 +130,11 @@ Stirling PDF allows easy customization of the visible application name.
 Simply use environment variables APP_HOME_NAME, APP_HOME_DESCRIPTION and APP_NAVBAR_NAME with Docker or Java. 
 If running Java directly, you can also pass these as properties using -D arguments.
 
-Using the same method you can also change the default language by providing APP_LOCALE with values like de-DE fr-FR or ar-AR to select your default language (Will always default to English on invalid locale)
+Using the same method you can also change 
+- The default language by providing APP_LOCALE with values like de-DE fr-FR or ar-AR to select your default language (Will always default to English on invalid locale)
+- Enable/Disable search engine visablility with ALLOW_GOOGLE_VISABILITY with true / false values. Default disable visability.
+- Change root URI for Stirling-PDF ie change server.com/ to server.com/pdf-app by running APP_ROOT_PATH as pdf-app
+
+## API
+For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
+[here](https://app.swaggerhub.com/apis-docs/Frooodle/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation 

build.gradle

@@ -1,11 +1,11 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.0.5'
+	id 'org.springframework.boot' version '3.0.6'
 	id 'io.spring.dependency-management' version '1.1.0'
 }
 
 group = 'stirling.software'
-version = '0.6.0'
+version = '0.8.1'
 sourceCompatibility = '17'
 
 repositories {
@@ -13,17 +13,17 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-web:3.0.5'
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.5'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.0.5'
+	implementation 'org.springframework.boot:spring-boot-starter-web:3.0.6'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.6'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.0.6'
 	// https://mvnrepository.com/artifact/org.apache.pdfbox/jbig2-imageio
 	implementation group: 'org.apache.pdfbox', name: 'jbig2-imageio', version: '3.0.4'
 	implementation 'commons-io:commons-io:2.11.0'
-		
+	
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
+    
 	//general PDF
     implementation 'org.apache.pdfbox:pdfbox:2.0.28'
-        
-    implementation 'com.itextpdf:itextpdf:5.5.13.3'
     developmentOnly("org.springframework.boot:spring-boot-devtools")
 
 }

scripts/detect-blank-pages.py

@@ -0,0 +1,40 @@
+import cv2
+import numpy as np
+import sys
+import argparse
+
+def is_blank_image(image_path, threshold=10, white_percent=99, white_value=255, blur_size=5):
+    image = cv2.imread(image_path, cv2.IMREAD_GRAYSCALE)
+    
+    if image is None:
+        print(f"Error: Unable to read the image file: {image_path}")
+        return False
+
+    # Apply Gaussian blur to reduce noise
+    blurred_image = cv2.GaussianBlur(image, (blur_size, blur_size), 0)
+
+    _, thresholded_image = cv2.threshold(blurred_image, white_value - threshold, white_value, cv2.THRESH_BINARY)
+    
+    # Calculate the percentage of white pixels in the thresholded image
+    white_pixels = np.sum(thresholded_image == white_value)
+    total_pixels = thresholded_image.size
+    white_pixel_percentage = (white_pixels / total_pixels) * 100
+    print(f"Page has white pixel percent of {white_pixel_percentage}")
+    return white_pixel_percentage > white_percent
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Detect if an image is considered blank or not.')
+    parser.add_argument('image_path', help='The path to the image file.')
+    parser.add_argument('-t', '--threshold', type=int, default=10, help='Threshold for determining white pixels. The default value is 10.')
+    parser.add_argument('-w', '--white_percent', type=float, default=99, help='The percentage of white pixels for an image to be considered blank. The default value is 99.')
+    args = parser.parse_args()
+
+    blank = is_blank_image(args.image_path, args.threshold, args.white_percent)
+
+    if blank:
+        # Return code 1: The image is considered blank.
+        sys.exit(1)
+    else:
+        # Return code 0: The image is not considered blank.
+        sys.exit(0)

scripts/init.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Copy the original tesseract-ocr files to the volume directory without overwriting existing files
+echo "Copying original files without overwriting existing files"
+mkdir -p /usr/share/tesseract-ocr
+cp -rn /usr/share/tesseract-ocr-original/* /usr/share/tesseract-ocr
+
+# Run the main command
+exec "$@"

scripts/split_photos.py

@@ -0,0 +1,134 @@
+import sys
+import cv2
+import numpy as np
+import os 
+
+def find_photo_boundaries(image, background_color, tolerance=30, min_area=10000, min_contour_area=500):
+    mask = cv2.inRange(image, background_color - tolerance, background_color + tolerance)
+    mask = cv2.bitwise_not(mask)
+    kernel = np.ones((5,5),np.uint8)
+    mask = cv2.dilate(mask, kernel, iterations=2)
+    contours, _ = cv2.findContours(mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
+
+    photo_boundaries = []
+    for contour in contours:
+        x, y, w, h = cv2.boundingRect(contour)
+        area = w * h
+        contour_area = cv2.contourArea(contour)
+        if area >= min_area and contour_area >= min_contour_area:
+            photo_boundaries.append((x, y, w, h))
+
+    return photo_boundaries
+
+def estimate_background_color(image, sample_points=5):
+    h, w, _ = image.shape
+    points = [
+        (0, 0),
+        (w - 1, 0),
+        (w - 1, h - 1),
+        (0, h - 1),
+        (w // 2, h // 2),
+    ]
+
+    colors = []
+    for x, y in points:
+        colors.append(image[y, x])
+
+    return np.median(colors, axis=0)
+
+def auto_rotate(image, angle_threshold=10):
+    gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
+    ret, binary = cv2.threshold(gray, 0, 255, cv2.THRESH_BINARY_INV + cv2.THRESH_OTSU)
+    contours, _ = cv2.findContours(binary, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
+
+    if len(contours) == 0:
+        return image
+
+    largest_contour = max(contours, key=cv2.contourArea)
+    mu = cv2.moments(largest_contour)
+    
+    if mu["m00"] == 0:
+        return image
+    
+    x_centroid = int(mu["m10"] / mu["m00"])
+    y_centroid = int(mu["m01"] / mu["m00"])
+
+    coords = np.column_stack(np.where(binary > 0))
+    u, _, vt = np.linalg.svd(coords - np.array([[y_centroid, x_centroid]]), full_matrices=False)
+
+    angle = np.arctan2(u[1, 0], u[0, 0]) * 180 / np.pi
+
+    if angle < -45:
+        angle = -(90 + angle)
+    else:
+        angle = -angle
+
+    if abs(angle) < angle_threshold:
+        return image
+
+    (h, w) = image.shape[:2]
+    center = (w // 2, h // 2)
+    M = cv2.getRotationMatrix2D(center, angle, 1.0)
+    return cv2.warpAffine(image, M, (w, h), flags=cv2.INTER_CUBIC, borderMode=cv2.BORDER_REPLICATE)
+
+
+
+def crop_borders(image, border_color, tolerance=30):
+    mask = cv2.inRange(image, border_color - tolerance, border_color + tolerance)
+    
+    contours, _ = cv2.findContours(mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
+    if len(contours) == 0:
+        return image
+
+    largest_contour = max(contours, key=cv2.contourArea)
+    x, y, w, h = cv2.boundingRect(largest_contour)
+    
+    return image[y:y+h, x:x+w]
+    
+def split_photos(input_file, output_directory, tolerance=30, min_area=10000, min_contour_area=500, angle_threshold=10, border_size=0):
+    image = cv2.imread(input_file)
+    background_color = estimate_background_color(image)
+
+    # Add a constant border around the image
+    image = cv2.copyMakeBorder(image, border_size, border_size, border_size, border_size, cv2.BORDER_CONSTANT, value=background_color)
+
+    photo_boundaries = find_photo_boundaries(image, background_color, tolerance)
+
+    if not os.path.exists(output_directory):
+        os.makedirs(output_directory)
+
+    # Get the input file's base name without the extension
+    input_file_basename = os.path.splitext(os.path.basename(input_file))[0]
+
+    for idx, (x, y, w, h) in enumerate(photo_boundaries):
+        cropped_image = image[y:y+h, x:x+w]
+        cropped_image = auto_rotate(cropped_image, angle_threshold)
+
+        # Remove the added border
+        cropped_image = cropped_image[border_size:-border_size, border_size:-border_size]
+
+        output_path = os.path.join(output_directory, f"{input_file_basename}_{idx+1}.png")
+        cv2.imwrite(output_path, cropped_image)
+        print(f"Saved {output_path}")
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        print("Usage: python3 split_photos.py <input_file> <output_directory> [tolerance] [min_area] [min_contour_area] [angle_threshold] [border_size]")
+        print("\nParameters:")
+        print("  <input_file>       - The input scanned image containing multiple photos.")
+        print("  <output_directory> - The directory where the result images should be placed.")
+        print("  [tolerance]        - Optional. Determines the range of color variation around the estimated background color (default: 30).")
+        print("  [min_area]         - Optional. Sets the minimum area threshold for a photo (default: 10000).")
+        print("  [min_contour_area] - Optional. Sets the minimum contour area threshold for a photo (default: 500).")
+        print("  [angle_threshold]  - Optional. Sets the minimum absolute angle required for the image to be rotated (default: 10).")
+        print("  [border_size]      - Optional. Sets the size of the border added and removed to prevent white borders in the output (default: 0).")
+        sys.exit(1)
+
+    input_file = sys.argv[1]
+    output_directory = sys.argv[2]
+    tolerance = int(sys.argv[3]) if len(sys.argv) > 3 else 20
+    min_area = int(sys.argv[4]) if len(sys.argv) > 4 else 8000
+    min_contour_area = int(sys.argv[5]) if len(sys.argv) > 5 else 500
+    angle_threshold = int(sys.argv[6]) if len(sys.argv) > 6 else 60
+    border_size = int(sys.argv[7]) if len(sys.argv) > 7 else 0
+    split_photos(input_file, output_directory, tolerance=tolerance, min_area=min_area, min_contour_area=min_contour_area, angle_threshold=angle_threshold, border_size=border_size)

src/main/java/stirling/software/SPDF/LibreOfficeListener.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF;
+
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -6,32 +7,46 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public class LibreOfficeListener {
-    
-    private static final LibreOfficeListener INSTANCE = new LibreOfficeListener();
-    
+
     private static final long ACTIVITY_TIMEOUT = 20 * 60 * 1000; // 20 minutes
+
+    private static final LibreOfficeListener INSTANCE = new LibreOfficeListener();
     private static final int LISTENER_PORT = 2002;
-    
-    private ExecutorService executorService;
-    private Process process;
-    private long lastActivityTime;
-    
-    private LibreOfficeListener() {}
-    
+
     public static LibreOfficeListener getInstance() {
         return INSTANCE;
     }
-    
+
+    private ExecutorService executorService;
+    private long lastActivityTime;
+
+    private Process process;
+
+    private LibreOfficeListener() {
+    }
+
+    private boolean isListenerRunning() {
+        try {
+            System.out.println("waiting for listener to start");
+            Socket socket = new Socket();
+            socket.connect(new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second
+            socket.close();
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
     public void start() throws IOException {
         // Check if the listener is already running
         if (process != null && process.isAlive()) {
             return;
         }
-        
+
         // Start the listener process
         process = Runtime.getRuntime().exec("unoconv --listener");
         lastActivityTime = System.currentTimeMillis();
-        
+
         // Start a background thread to monitor the activity timeout
         executorService = Executors.newSingleThreadExecutor();
         executorService.submit(() -> {
@@ -49,46 +64,33 @@ public class LibreOfficeListener {
                 }
             }
         });
-        
-        
-     // Wait for the listener to start up
+
+        // Wait for the listener to start up
         long startTime = System.currentTimeMillis();
         long timeout = 30000; // Timeout after 30 seconds
         while (System.currentTimeMillis() - startTime < timeout) {
             if (isListenerRunning()) {
-            	
+
                 lastActivityTime = System.currentTimeMillis();
                 return;
             }
             try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} // Check every 1 second
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } // Check every 1 second
         }
     }
-    
-    private boolean isListenerRunning() {
-        try {
-        	System.out.println("waiting for listener to start");
-            Socket socket = new Socket();
-            socket.connect(new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second
-            socket.close();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-    
+
     public synchronized void stop() {
         // Stop the activity timeout monitor thread
         executorService.shutdownNow();
-        
+
         // Stop the listener process
         if (process != null && process.isAlive()) {
             process.destroy();
         }
     }
-    
+
 }

src/main/java/stirling/software/SPDF/SPdfApplication.java

@@ -6,6 +6,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class SPdfApplication {
     public static void main(String[] args) {
-        SpringApplication.run(SPdfApplication.class, args);     
+        SpringApplication.run(SPdfApplication.class, args);
     }
 }

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -3,41 +3,40 @@ package stirling.software.SPDF.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-
 @Configuration
-public class AppConfig { 
+public class AppConfig {
+    @Bean(name = "appName")
+    public String appName() {
+        String appName = System.getProperty("APP_HOME_NAME");
+        if (appName == null)
+            appName = System.getenv("APP_HOME_NAME");
+        return (appName != null) ? appName : "Stirling PDF";
+    }
+
     @Bean(name = "appVersion")
     public String appVersion() {
         String version = getClass().getPackage().getImplementationVersion();
         return (version != null) ? version : "0.3.3";
     }
-    
-    @Bean(name = "appName")
-    public String appName() {
-        String appName = System.getProperty("APP_HOME_NAME");
-        if(appName == null)
-            appName = System.getenv("APP_HOME_NAME");
-        return (appName != null) ? appName : "Stirling PDF";
-    }
-    
-    @Bean(name = "navBarText")
-    public String navBarText() {
-        String navBarText = System.getProperty("APP_NAVBAR_NAME");
-        if(navBarText == null)
-        	navBarText = System.getenv("APP_NAVBAR_NAME");
-        if(navBarText == null)
-        	navBarText = System.getProperty("APP_HOME_NAME");
-        if(navBarText == null)
-        	navBarText = System.getenv("APP_HOME_NAME");
-        
-        return (navBarText != null) ? navBarText : "Stirling PDF";
-    }
-    
+
     @Bean(name = "homeText")
     public String homeText() {
         String homeText = System.getProperty("APP_HOME_DESCRIPTION");
-        if(homeText == null)
-        	homeText = System.getenv("APP_HOME_DESCRIPTION");
+        if (homeText == null)
+            homeText = System.getenv("APP_HOME_DESCRIPTION");
         return (homeText != null) ? homeText : "null";
     }
+
+    @Bean(name = "navBarText")
+    public String navBarText() {
+        String navBarText = System.getProperty("APP_NAVBAR_NAME");
+        if (navBarText == null)
+            navBarText = System.getenv("APP_NAVBAR_NAME");
+        if (navBarText == null)
+            navBarText = System.getProperty("APP_HOME_NAME");
+        if (navBarText == null)
+            navBarText = System.getenv("APP_HOME_NAME");
+
+        return (navBarText != null) ? navBarText : "Stirling PDF";
+    }
 }

src/main/java/stirling/software/SPDF/config/Beans.java

@@ -13,12 +13,25 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 @Configuration
 public class Beans implements WebMvcConfigurer {
 
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(localeChangeInterceptor());
+        registry.addInterceptor(new CleanUrlInterceptor());
+    }
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
+        lci.setParamName("lang");
+        return lci;
+    }
+
     @Bean
     public LocaleResolver localeResolver() {
         SessionLocaleResolver slr = new SessionLocaleResolver();
 
         String appLocaleEnv = System.getProperty("APP_LOCALE");
-        if(appLocaleEnv == null)
+        if (appLocaleEnv == null)
             appLocaleEnv = System.getenv("APP_LOCALE");
         Locale defaultLocale = Locale.UK; // Fallback to UK locale if environment variable is not set
 
@@ -37,16 +50,4 @@ public class Beans implements WebMvcConfigurer {
         return slr;
     }
 
-    @Bean
-    public LocaleChangeInterceptor localeChangeInterceptor() {
-        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-        lci.setParamName("lang");
-        return lci;
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(localeChangeInterceptor());
-    }
-
 }

src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java

@@ -0,0 +1,45 @@
+package stirling.software.SPDF.config;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class CleanUrlInterceptor implements HandlerInterceptor {
+
+    private static final Pattern LANG_PATTERN = Pattern.compile("&?lang=([^&]+)");
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String queryString = request.getQueryString();
+        if (queryString != null && !queryString.isEmpty()) {
+            String requestURI = request.getRequestURI();
+
+            // Keep the lang parameter if it exists
+            Matcher langMatcher = LANG_PATTERN.matcher(queryString);
+            String langQueryString = langMatcher.find() ? "lang=" + langMatcher.group(1) : "";
+
+            // Check if there are any other query parameters besides the lang parameter
+            String remainingQueryString = queryString.replaceAll(LANG_PATTERN.pattern(), "").replaceAll("&+", "&").replaceAll("^&|&$", "");
+
+            if (!remainingQueryString.isEmpty()) {
+                // Redirect to the URL without other query parameters
+                String redirectUrl = requestURI + (langQueryString.isEmpty() ? "" : "?" + langQueryString);
+                response.sendRedirect(redirectUrl);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) {
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
+    }
+}

src/main/java/stirling/software/SPDF/config/OpenApiConfig.java

@@ -0,0 +1,22 @@
+package stirling.software.SPDF.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+
+@Configuration
+public class OpenApiConfig {
+
+    @Bean
+    public OpenAPI customOpenAPI() {
+        String version = getClass().getPackage().getImplementationVersion();
+        version =  (version != null) ? version : "1.0.0";
+        
+        return new OpenAPI().components(new Components()).info(
+                new Info().title("Stirling PDF API").version(version).description("API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/MultiToolController.java

@@ -1,20 +0,0 @@
-package stirling.software.SPDF.controller;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class MultiToolController {
-
-	private static final Logger logger = LoggerFactory.getLogger(MultiToolController.class);
-
-	@GetMapping("/multi-tool")
-	public String multiToolForm(Model model) {
-		model.addAttribute("currentPage", "multi-tool");
-		return "multi-tool";
-	}
-
-}

src/main/java/stirling/software/SPDF/controller/OCRController.java

@@ -1,180 +0,0 @@
-package stirling.software.SPDF.controller;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.ModelAndView;
-
-import stirling.software.SPDF.utils.ProcessExecutor;
-@Controller
-public class OCRController {
-
-	private static final Logger logger = LoggerFactory.getLogger(OCRController.class);
-
-	@GetMapping("/ocr-pdf")
-	public ModelAndView ocrPdfPage() {
-		ModelAndView modelAndView = new ModelAndView("ocr-pdf");
-		modelAndView.addObject("languages", getAvailableTesseractLanguages());
-		modelAndView.addObject("currentPage", "ocr-pdf");
-		return modelAndView;
-	}
-	
-	@PostMapping("/ocr-pdf")
-	public ResponseEntity<byte[]> processPdfWithOCR(@RequestParam("fileInput") MultipartFile inputFile,
-			@RequestParam("languages") List<String> selectedLanguages,
-			@RequestParam(name = "sidecar", required = false) Boolean sidecar,
-			@RequestParam(name = "deskew", required = false) Boolean deskew,
-			@RequestParam(name = "clean", required = false) Boolean clean,
-			@RequestParam(name = "clean-final", required = false) Boolean cleanFinal,
-			@RequestParam(name = "ocrType", required = false) String ocrType) throws IOException, InterruptedException {
-
-	    
-		//--output-type pdfa
-		if (selectedLanguages == null || selectedLanguages.size() < 1) {
-			throw new IOException("Please select at least one language.");
-	    }
-		
-		// Validate and sanitize selected languages using regex
-        String languagePattern = "^[a-zA-Z]{3}$"; // Regex pattern for three-letter language codes
-        selectedLanguages = selectedLanguages.stream()
-                .filter(lang -> Pattern.matches(languagePattern, lang))
-                .collect(Collectors.toList());
-
-        
-        if (selectedLanguages.isEmpty()) {
-            throw new IOException("None of the selected languages are valid.");
-        }
-		// Save the uploaded file to a temporary location
-		Path tempInputFile = Files.createTempFile("input_", ".pdf");
-		Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
-
-		// Prepare the output file path
-		Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-
-		// Prepare the output file path
-        Path sidecarTextPath = null;
-        
-		// Run OCR Command
-	    String languageOption = String.join("+", selectedLanguages);
-	    
-	    List<String> command = new ArrayList<>(Arrays.asList("ocrmypdf","--verbose", "2", "--output-type", "pdf"));
-	    		
-	    
-	    if (sidecar != null && sidecar) {
-	        sidecarTextPath = Files.createTempFile("sidecar", ".txt");
-	        command.add("--sidecar");
-	        command.add(sidecarTextPath.toString());
-	    }
-	    
-	    if (deskew != null && deskew) {
-            command.add("--deskew");
-	    }
-	    if (clean != null && clean) {
-            command.add("--clean");
-        }
-	    if (cleanFinal != null && cleanFinal) {
-            command.add("--clean-final");
-        }
-	    if (ocrType != null && !ocrType.equals("")) {
-            if("skip-text".equals(ocrType)) {
-                command.add("--skip-text");
-            } else if("force-ocr".equals(ocrType)) {
-                command.add("--force-ocr");
-            } else if("Normal".equals(ocrType)) {
-                
-            }
-        }
-
-	    command.addAll(Arrays.asList("--language", languageOption,
-	            tempInputFile.toString(), tempOutputFile.toString()));
-	    
-	    //Run CLI command
-	    int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
-        
-		// Read the OCR processed PDF file
-		byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
-		
-	    
-		// Clean up the temporary files
-		Files.delete(tempInputFile);
-		// Return the OCR processed PDF as a response
-		String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.pdf";
-
-		HttpHeaders headers = new HttpHeaders();
-
-	    if (sidecar != null && sidecar) {
-	        // Create a zip file containing both the PDF and the text file
-	        String outputZipFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.zip";
-	        Path tempZipFile = Files.createTempFile("output_", ".zip");
-
-	        try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
-	            // Add PDF file to the zip
-	            ZipEntry pdfEntry = new ZipEntry(outputFilename);
-	            zipOut.putNextEntry(pdfEntry);
-	            Files.copy(tempOutputFile, zipOut);
-	            zipOut.closeEntry();
-
-	            // Add text file to the zip
-	            ZipEntry txtEntry = new ZipEntry(outputFilename.replace(".pdf", ".txt"));
-	            zipOut.putNextEntry(txtEntry);
-	            Files.copy(sidecarTextPath, zipOut);
-	            zipOut.closeEntry();
-	        }
-
-	        byte[] zipBytes = Files.readAllBytes(tempZipFile);
-
-	        // Clean up the temporary zip file
-	        Files.delete(tempZipFile);
-	        Files.delete(tempOutputFile);
-	        Files.delete(sidecarTextPath);
-	        
-	        // Return the zip file containing both the PDF and the text file
-	        headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-	        headers.setContentDispositionFormData("attachment", outputZipFilename);
-	        return ResponseEntity.ok().headers(headers).body(zipBytes);
-	    } else {
-	        // Return the OCR processed PDF as a response
-	    	Files.delete(tempOutputFile);
-	        headers.setContentType(MediaType.APPLICATION_PDF);
-	        headers.setContentDispositionFormData("attachment", outputFilename);
-	        return ResponseEntity.ok().headers(headers).body(pdfBytes);
-	    }
-	    
-	}
-
-	public List<String> getAvailableTesseractLanguages() {
-	    String tessdataDir = "/usr/share/tesseract-ocr/4.00/tessdata";
-	    File[] files = new File(tessdataDir).listFiles();
-	    if (files == null) {
-	        return Collections.emptyList();
-	    }
-	    return Arrays.stream(files)
-	            .filter(file -> file.getName().endsWith(".traineddata"))
-	            .map(file -> file.getName().replace(".traineddata", ""))
-	            .filter(lang -> !lang.equalsIgnoreCase("osd"))
-	            .collect(Collectors.toList());
-	}
-
-}

src/main/java/stirling/software/SPDF/controller/OverlayImageController.java

@@ -1,43 +0,0 @@
-package stirling.software.SPDF.controller;
-
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-
-@Controller
-public class OverlayImageController {
-
-    private static final Logger logger = LoggerFactory.getLogger(OverlayImageController.class);
-
-    @GetMapping("/add-image")
-    public String overlayImage(Model model) {
-        model.addAttribute("currentPage", "add-image");
-        return "add-image";
-    }
-
-    @PostMapping("/add-image")
-    public ResponseEntity<byte[]> overlayImage(@RequestParam("fileInput") MultipartFile pdfFile, @RequestParam("fileInput2") MultipartFile imageFile, @RequestParam("x") float x,
-            @RequestParam("y") float y, @RequestParam("everyPage") boolean everyPage) {
-        try {
-            byte[] pdfBytes = pdfFile.getBytes();
-            byte[] imageBytes = imageFile.getBytes();
-            byte[] result = PdfUtils.overlayImage(pdfBytes, imageBytes, x, y, everyPage);
-
-            return PdfUtils.bytesToWebResponse(result, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_overlayed.pdf");
-        } catch (IOException e) {
-            logger.error("Failed to add image to PDF", e);
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-    }
-}

src/main/java/stirling/software/SPDF/controller/PdfController.java

@@ -1,27 +0,0 @@
-package stirling.software.SPDF.controller;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class PdfController {
-
-    private static final Logger logger = LoggerFactory.getLogger(PdfController.class);
-    
-    @GetMapping("/home")
-    public String root(Model model) {
-        return "redirect:/";
-    }
-
-    @GetMapping("/")
-    public String home(Model model) {
-        model.addAttribute("currentPage", "home");
-        return "home";
-    }
-
-
-    
-}

src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -1,67 +1,78 @@
-package stirling.software.SPDF.controller;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-
-@Controller
-public class MergeController {
-
-    private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
-
-    @GetMapping("/merge-pdfs")
-    public String hello(Model model) {
-        model.addAttribute("currentPage", "merge-pdfs");
-        return "merge-pdfs";
-    }
-
-    @PostMapping("/merge-pdfs")
-    public ResponseEntity<byte[]> mergePdfs(@RequestParam("fileInput") MultipartFile[] files) throws IOException {
-        // Read the input PDF files into PDDocument objects
-        List<PDDocument> documents = new ArrayList<>();
-
-        // Loop through the files array and read each file into a PDDocument
-        for (MultipartFile file : files) {
-            documents.add(PDDocument.load(file.getInputStream()));
-        }
-
-        PDDocument mergedDoc = mergeDocuments(documents);
-
-        // Return the merged PDF as a response
-        return PdfUtils.pdfDocToWebResponse(mergedDoc, files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "")+ "_merged.pdf");
-    }
-
-    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
-        // Create a new empty document
-        PDDocument mergedDoc = new PDDocument();
-
-        // Iterate over the list of documents and add their pages to the merged document
-        for (PDDocument doc : documents) {
-            // Get all pages from the current document
-            PDPageTree pages = doc.getPages();
-            // Iterate over the pages and add them to the merged document
-            for (PDPage page : pages) {
-                mergedDoc.addPage(page);
-            }
-        }
-
-        // Return the merged document
-        return mergedDoc;
-    }
-
+package stirling.software.SPDF.controller.api;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+
+@RestController
+public class MergeController {
+
+    private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
+
+    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+        // Create a new empty document
+        PDDocument mergedDoc = new PDDocument();
+
+        // Iterate over the list of documents and add their pages to the merged document
+        for (PDDocument doc : documents) {
+            // Get all pages from the current document
+            PDPageTree pages = doc.getPages();
+            // Iterate over the pages and add them to the merged document
+            for (PDPage page : pages) {
+                mergedDoc.addPage(page);
+            }
+            
+            
+        }
+
+        // Return the merged document
+        return mergedDoc;
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
+    @Operation(
+        summary = "Merge multiple PDF files into one",
+        description = "This endpoint merges multiple PDF files into a single PDF file. The merged file will contain all pages from the input files in the order they were provided."
+    )
+    public ResponseEntity<byte[]> mergePdfs(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The input PDF files to be merged into a single file", required = true)
+            MultipartFile[] files) throws IOException {
+    	// Read the input PDF files into PDDocument objects
+        List<PDDocument> documents = new ArrayList<>();
+
+        // Loop through the files array and read each file into a PDDocument
+        for (MultipartFile file : files) {
+            documents.add(PDDocument.load(file.getInputStream()));
+        }
+
+        PDDocument mergedDoc = mergeDocuments(documents);
+
+        
+        // Return the merged PDF as a response
+        ResponseEntity<byte[]> response = PdfUtils.pdfDocToWebResponse(mergedDoc, files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
+        
+        for (PDDocument doc : documents) {
+            // Close the document after processing
+            doc.close();
+           }
+        
+        return response;
+    }
+
 }

src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java

@@ -1,121 +1,127 @@
-package stirling.software.SPDF.controller;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-
-@Controller
-public class RearrangePagesPDFController {
-
-    private static final Logger logger = LoggerFactory.getLogger(RearrangePagesPDFController.class);
-
-    @GetMapping("/pdf-organizer")
-    public String pageOrganizer(Model model) {
-        model.addAttribute("currentPage", "pdf-organizer");
-        return "pdf-organizer";
-    }
-
-    @GetMapping("/remove-pages")
-    public String pageDeleter(Model model) {
-        model.addAttribute("currentPage", "remove-pages");
-        return "remove-pages";
-    }
-
-    @PostMapping("/remove-pages")
-    public ResponseEntity<byte[]> deletePages(@RequestParam("fileInput") MultipartFile pdfFile, @RequestParam("pagesToDelete") String pagesToDelete) throws IOException {
-
-        PDDocument document = PDDocument.load(pdfFile.getBytes());
-
-        // Split the page order string into an array of page numbers or range of numbers
-        String[] pageOrderArr = pagesToDelete.split(",");
-
-        List<Integer> pagesToRemove = pageOrderToString(pageOrderArr, document.getNumberOfPages());
-
-        for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
-            int pageIndex = pagesToRemove.get(i);
-            document.removePage(pageIndex);
-        }
-        return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_removed_pages.pdf");
-
-    }
-
-    private List<Integer> pageOrderToString(String[] pageOrderArr, int totalPages) {
-        List<Integer> newPageOrder = new ArrayList<>();
-        // loop through the page order array
-        for (String element : pageOrderArr) {
-            // check if the element contains a range of pages
-            if (element.contains("-")) {
-                // split the range into start and end page
-                String[] range = element.split("-");
-                int start = Integer.parseInt(range[0]);
-                int end = Integer.parseInt(range[1]);
-                // check if the end page is greater than total pages
-                if (end > totalPages) {
-                    end = totalPages;
-                }
-                // loop through the range of pages
-                for (int j = start; j <= end; j++) {
-                    // print the current index
-                    newPageOrder.add(j - 1);
-                }
-            } else {
-                // if the element is a single page
-                newPageOrder.add(Integer.parseInt(element) - 1);
-            }
-        }
-
-        return newPageOrder;
-    }
-
-    @PostMapping("/rearrange-pages")
-    public ResponseEntity<byte[]> rearrangePages(@RequestParam("fileInput") MultipartFile pdfFile, @RequestParam("pageOrder") String pageOrder) {
-        try {
-            // Load the input PDF
-            PDDocument document = PDDocument.load(pdfFile.getInputStream());
-
-            // Split the page order string into an array of page numbers or range of numbers
-            String[] pageOrderArr = pageOrder.split(",");
-            // int[] newPageOrder = new int[pageOrderArr.length];
-            int totalPages = document.getNumberOfPages();
-
-            List<Integer> newPageOrder = pageOrderToString(pageOrderArr, totalPages);
-
-            // Create a new list to hold the pages in the new order
-            List<PDPage> newPages = new ArrayList<>();
-            for (int i = 0; i < newPageOrder.size(); i++) {
-                newPages.add(document.getPage(newPageOrder.get(i)));
-            }
-
-            // Remove all the pages from the original document
-            for (int i = document.getNumberOfPages() - 1; i >= 0; i--) {
-                document.removePage(i);
-            }
-
-            // Add the pages in the new order
-            for (PDPage page : newPages) {
-                document.addPage(page);
-            }
-
-            return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_rearranged.pdf");
-        } catch (IOException e) {
-
-            logger.error("Failed rearranging documents", e);
-            return null;
-        }
-    }
-
-}
+package stirling.software.SPDF.controller.api;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+
+@RestController
+public class RearrangePagesPDFController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RearrangePagesPDFController.class);
+
+
+    @PostMapping(consumes = "multipart/form-data", value = "/remove-pages")
+    @Operation(summary = "Remove pages from a PDF file",
+            description = "This endpoint removes specified pages from a given PDF file. Users can provide a comma-separated list of page numbers or ranges to delete.")
+    public ResponseEntity<byte[]> deletePages(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file from which pages will be removed")
+                    MultipartFile pdfFile,
+            @RequestParam("pagesToDelete")
+            @Parameter(description = "Comma-separated list of pages or page ranges to delete, e.g., '1,3,5-8'")
+                    String pagesToDelete) throws IOException {
+
+        PDDocument document = PDDocument.load(pdfFile.getBytes());
+
+        // Split the page order string into an array of page numbers or range of numbers
+        String[] pageOrderArr = pagesToDelete.split(",");
+
+        List<Integer> pagesToRemove = pageOrderToString(pageOrderArr, document.getNumberOfPages());
+
+        for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
+            int pageIndex = pagesToRemove.get(i);
+            document.removePage(pageIndex);
+        }
+        return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_removed_pages.pdf");
+
+    }
+
+    private List<Integer> pageOrderToString(String[] pageOrderArr, int totalPages) {
+        List<Integer> newPageOrder = new ArrayList<>();
+        // loop through the page order array
+        for (String element : pageOrderArr) {
+            // check if the element contains a range of pages
+            if (element.contains("-")) {
+                // split the range into start and end page
+                String[] range = element.split("-");
+                int start = Integer.parseInt(range[0]);
+                int end = Integer.parseInt(range[1]);
+                // check if the end page is greater than total pages
+                if (end > totalPages) {
+                    end = totalPages;
+                }
+                // loop through the range of pages
+                for (int j = start; j <= end; j++) {
+                    // print the current index
+                    newPageOrder.add(j - 1);
+                }
+            } else {
+                // if the element is a single page
+                newPageOrder.add(Integer.parseInt(element) - 1);
+            }
+        }
+
+        return newPageOrder;
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/rearrange-pages")
+    @Operation(summary = "Rearrange pages in a PDF file",
+            description = "This endpoint rearranges pages in a given PDF file based on the specified page order. Users can provide a page order as a comma-separated list of page numbers or page ranges.")
+    public ResponseEntity<byte[]> rearrangePages(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file to rearrange pages")
+                    MultipartFile pdfFile,
+            @RequestParam("pageOrder")
+            @Parameter(description = "The new page order as a comma-separated list of page numbers or page ranges (e.g., '1,3,5-7')")
+                    String pageOrder) {
+        try {
+            // Load the input PDF
+            PDDocument document = PDDocument.load(pdfFile.getInputStream());
+
+            // Split the page order string into an array of page numbers or range of numbers
+            String[] pageOrderArr = pageOrder.split(",");
+            // int[] newPageOrder = new int[pageOrderArr.length];
+            int totalPages = document.getNumberOfPages();
+
+            List<Integer> newPageOrder = pageOrderToString(pageOrderArr, totalPages);
+
+            // Create a new list to hold the pages in the new order
+            List<PDPage> newPages = new ArrayList<>();
+            for (int i = 0; i < newPageOrder.size(); i++) {
+                newPages.add(document.getPage(newPageOrder.get(i)));
+            }
+
+            // Remove all the pages from the original document
+            for (int i = document.getNumberOfPages() - 1; i >= 0; i--) {
+                document.removePage(i);
+            }
+
+            // Add the pages in the new order
+            for (PDPage page : newPages) {
+                document.addPage(page);
+            }
+
+            return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_rearranged.pdf");
+        } catch (IOException e) {
+
+            logger.error("Failed rearranging documents", e);
+            return null;
+        }
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/RotationController.java

@@ -1,48 +1,53 @@
-package stirling.software.SPDF.controller;
-
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-
-@Controller
-public class RotationController {
-
-    private static final Logger logger = LoggerFactory.getLogger(RotationController.class);
-
-    @GetMapping("/rotate-pdf")
-    public String rotatePdfForm(Model model) {
-        model.addAttribute("currentPage", "rotate-pdf");
-        return "rotate-pdf";
-    }
-
-    @PostMapping("/rotate-pdf")
-    public ResponseEntity<byte[]> rotatePDF(@RequestParam("fileInput") MultipartFile pdfFile, @RequestParam("angle") Integer angle) throws IOException {
-
-        // Load the PDF document
-        PDDocument document = PDDocument.load(pdfFile.getBytes());
-
-        // Get the list of pages in the document
-        PDPageTree pages = document.getPages();
-
-        for (PDPage page : pages) {
-            page.setRotation(page.getRotation() + angle);
-        }
-
-        return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_rotated.pdf");
-
-    }
-
-}
+package stirling.software.SPDF.controller.api;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+
+@RestController
+public class RotationController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RotationController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/rotate-pdf")
+    @Operation(
+        summary = "Rotate a PDF file",
+        description = "This endpoint rotates a given PDF file by a specified angle. The angle must be a multiple of 90."
+    )
+    public ResponseEntity<byte[]> rotatePDF(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The PDF file to be rotated", required = true)
+            MultipartFile pdfFile,
+        @RequestParam("angle")
+        @Parameter(description = "The angle by which to rotate the PDF file. This should be a multiple of 90.", example = "90", required = true)
+            Integer angle) throws IOException {
+    	
+        // Load the PDF document
+        PDDocument document = PDDocument.load(pdfFile.getBytes());
+
+        // Get the list of pages in the document
+        PDPageTree pages = document.getPages();
+
+        for (PDPage page : pages) {
+            page.setRotation(page.getRotation() + angle);
+        }
+
+        return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_rotated.pdf");
+
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java

@@ -1,134 +1,140 @@
-package stirling.software.SPDF.controller;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-@Controller
-public class SplitPDFController {
-
-    private static final Logger logger = LoggerFactory.getLogger(SplitPDFController.class);
-
-    @GetMapping("/split-pdfs")
-    public String splitPdfForm(Model model) {
-        model.addAttribute("currentPage", "split-pdfs");
-        return "split-pdfs";
-    }
-
-    @PostMapping("/split-pages")
-    public ResponseEntity<Resource> splitPdf(@RequestParam("fileInput") MultipartFile file, @RequestParam("pages") String pages) throws IOException {
-        // parse user input
-
-        // open the pdf document
-        InputStream inputStream = file.getInputStream();
-        PDDocument document = PDDocument.load(inputStream);
-
-        List<Integer> pageNumbers = new ArrayList<>();
-        pages = pages.replaceAll("\\s+", ""); // remove whitespaces
-        if (pages.toLowerCase().equals("all")) {
-            for (int i = 0; i < document.getNumberOfPages(); i++) {
-                pageNumbers.add(i);
-            }
-        } else {
-            List<String> pageNumbersStr = new ArrayList<>(Arrays.asList(pages.split(",")));
-            if (!pageNumbersStr.contains(String.valueOf(document.getNumberOfPages()))) {
-                String lastpage = String.valueOf(document.getNumberOfPages());
-                pageNumbersStr.add(lastpage);
-            }
-            for (String page : pageNumbersStr) {
-                if (page.contains("-")) {
-                    String[] range = page.split("-");
-                    int start = Integer.parseInt(range[0]);
-                    int end = Integer.parseInt(range[1]);
-                    for (int i = start; i <= end; i++) {
-                        pageNumbers.add(i);
-                    }
-                } else {
-                    pageNumbers.add(Integer.parseInt(page));
-                }
-            }
-        }
-
-        logger.info("Splitting PDF into pages: {}", pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
-
-        // split the document
-        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
-        int currentPage = 0;
-        for (int pageNumber : pageNumbers) {
-            try (PDDocument splitDocument = new PDDocument()) {
-                for (int i = currentPage; i < pageNumber; i++) {
-                    PDPage page = document.getPage(i);
-                    splitDocument.addPage(page);
-                    logger.debug("Adding page {} to split document", i);
-                }
-                currentPage = pageNumber;
-                logger.debug("Setting current page to {}", currentPage);
-
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                splitDocument.save(baos);
-
-                splitDocumentsBoas.add(baos);
-            } catch (Exception e) {
-                logger.error("Failed splitting documents and saving them", e);
-                throw e;
-            }
-        }
-
-        // closing the original document
-        document.close();
-
-        Path zipFile = Files.createTempFile("split_documents", ".zip");
-
-        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
-            // loop through the split documents and write them to the zip file
-            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
-                String fileName = "split_document_" + (i + 1) + ".pdf";
-                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
-                byte[] pdf = baos.toByteArray();
-
-                // Add PDF file to the zip
-                ZipEntry pdfEntry = new ZipEntry(fileName);
-                zipOut.putNextEntry(pdfEntry);
-                zipOut.write(pdf);
-                zipOut.closeEntry();
-
-                logger.info("Wrote split document {} to zip file", fileName);
-            }
-        } catch (Exception e) {
-            logger.error("Failed writing to zip", e);
-            throw e;
-        }
-
-        logger.info("Successfully created zip file with split documents: {}", zipFile.toString());
-        byte[] data = Files.readAllBytes(zipFile);
-        ByteArrayResource resource = new ByteArrayResource(data);
-        Files.delete(zipFile);
-
-        // return the Resource in the response
-        return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_split.zip").contentType(MediaType.APPLICATION_OCTET_STREAM)
-                .contentLength(resource.contentLength()).body(resource);
-    }
-}
+package stirling.software.SPDF.controller.api;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+
+@RestController
+public class SplitPDFController {
+
+    private static final Logger logger = LoggerFactory.getLogger(SplitPDFController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/split-pages")
+    @Operation(summary = "Split a PDF file into separate documents",
+            description = "This endpoint splits a given PDF file into separate documents based on the specified page numbers or ranges. Users can specify pages using individual numbers, ranges, or 'all' for every page.")
+    public ResponseEntity<Resource> splitPdf(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file to be split")
+                    MultipartFile file,
+            @RequestParam("pages")
+            @Parameter(description = "The pages to be included in separate documents. Specify individual page numbers (e.g., '1,3,5'), ranges (e.g., '1-3,5-7'), or 'all' for every page.")
+                    String pages) throws IOException {
+        // parse user input
+
+        // open the pdf document
+        InputStream inputStream = file.getInputStream();
+        PDDocument document = PDDocument.load(inputStream);
+
+        List<Integer> pageNumbers = new ArrayList<>();
+        pages = pages.replaceAll("\\s+", ""); // remove whitespaces
+        if (pages.toLowerCase().equals("all")) {
+            for (int i = 0; i < document.getNumberOfPages(); i++) {
+                pageNumbers.add(i);
+            }
+        } else {
+            List<String> pageNumbersStr = new ArrayList<>(Arrays.asList(pages.split(",")));
+            if (!pageNumbersStr.contains(String.valueOf(document.getNumberOfPages()))) {
+                String lastpage = String.valueOf(document.getNumberOfPages());
+                pageNumbersStr.add(lastpage);
+            }
+            for (String page : pageNumbersStr) {
+                if (page.contains("-")) {
+                    String[] range = page.split("-");
+                    int start = Integer.parseInt(range[0]);
+                    int end = Integer.parseInt(range[1]);
+                    for (int i = start; i <= end; i++) {
+                        pageNumbers.add(i);
+                    }
+                } else {
+                    pageNumbers.add(Integer.parseInt(page));
+                }
+            }
+        }
+
+        logger.info("Splitting PDF into pages: {}", pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
+
+        // split the document
+        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
+        int currentPage = 0;
+        for (int pageNumber : pageNumbers) {
+            try (PDDocument splitDocument = new PDDocument()) {
+                for (int i = currentPage; i < pageNumber; i++) {
+                    PDPage page = document.getPage(i);
+                    splitDocument.addPage(page);
+                    logger.debug("Adding page {} to split document", i);
+                }
+                currentPage = pageNumber;
+                logger.debug("Setting current page to {}", currentPage);
+
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                splitDocument.save(baos);
+
+                splitDocumentsBoas.add(baos);
+            } catch (Exception e) {
+                logger.error("Failed splitting documents and saving them", e);
+                throw e;
+            }
+        }
+
+        // closing the original document
+        document.close();
+
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            // loop through the split documents and write them to the zip file
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                String fileName = "split_document_" + (i + 1) + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                // Add PDF file to the zip
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+
+                logger.info("Wrote split document {} to zip file", fileName);
+            }
+        } catch (Exception e) {
+            logger.error("Failed writing to zip", e);
+            throw e;
+        }
+
+        logger.info("Successfully created zip file with split documents: {}", zipFile.toString());
+        byte[] data = Files.readAllBytes(zipFile);
+        ByteArrayResource resource = new ByteArrayResource(data);
+        Files.delete(zipFile);
+
+        // return the Resource in the response
+        return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_split.zip")
+                .contentType(MediaType.APPLICATION_OCTET_STREAM).contentLength(resource.contentLength()).body(resource);
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java

@@ -0,0 +1,115 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.rendering.ImageType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import stirling.software.SPDF.utils.PdfUtils;
+@RestController
+public class ConvertImgPDFController {
+
+    private static final Logger logger = LoggerFactory.getLogger(ConvertImgPDFController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf-to-img")
+    @Operation(summary = "Convert PDF to image(s)",
+            description = "This endpoint converts a PDF file to image(s) with the specified image format, color type, and DPI. Users can choose to get a single image or multiple images.")
+    public ResponseEntity<Resource> convertToImage(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file to be converted")
+                    MultipartFile file,
+            @RequestParam("imageFormat")
+            @Parameter(description = "The output image format", schema = @Schema(allowableValues = {"png", "jpeg", "jpg", "gif"}))
+                    String imageFormat,
+            @RequestParam("singleOrMultiple")
+            @Parameter(description = "Choose between a single image containing all pages or separate images for each page", schema = @Schema(allowableValues = {"single", "multiple"}))
+                    String singleOrMultiple,
+            @RequestParam("colorType")
+            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"rgb", "greyscale", "blackwhite"}))
+                    String colorType,
+            @RequestParam("dpi")
+            @Parameter(description = "The DPI (dots per inch) for the output image(s)")
+                    String dpi) throws IOException {
+
+        byte[] pdfBytes = file.getBytes();
+        ImageType colorTypeResult = ImageType.RGB;
+        if ("greyscale".equals(colorType)) {
+            colorTypeResult = ImageType.GRAY;
+        } else if ("blackwhite".equals(colorType)) {
+            colorTypeResult = ImageType.BINARY;
+        }
+        // returns bytes for image
+        boolean singleImage = singleOrMultiple.equals("single");
+        byte[] result = null;
+        try {
+            result = PdfUtils.convertFromPdf(pdfBytes, imageFormat.toUpperCase(), colorTypeResult, singleImage, Integer.valueOf(dpi));
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        if (singleImage) {
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.parseMediaType(getMediaType(imageFormat)));
+            ResponseEntity<Resource> response = new ResponseEntity<>(new ByteArrayResource(result), headers, HttpStatus.OK);
+            return response;
+        } else {
+            ByteArrayResource resource = new ByteArrayResource(result);
+            // return the Resource in the response
+            return ResponseEntity.ok()
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_convertedToImages.zip")
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM).contentLength(resource.contentLength()).body(resource);
+        }
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/img-to-pdf")
+    @Operation(summary = "Convert images to a PDF file",
+            description = "This endpoint converts one or more images to a PDF file. Users can specify whether to stretch the images to fit the PDF page, and whether to automatically rotate the images.")
+    public ResponseEntity<byte[]> convertToPdf(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input images to be converted to a PDF file")
+                    MultipartFile[] file,
+            @RequestParam(defaultValue = "false", name = "stretchToFit")
+            @Parameter(description = "Whether to stretch the images to fit the PDF page or maintain the aspect ratio", example = "false")
+                    boolean stretchToFit,
+            @RequestParam("colorType")
+            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"rgb", "greyscale", "blackwhite"}))
+                    String colorType,
+            @RequestParam(defaultValue = "false", name = "autoRotate")
+            @Parameter(description = "Whether to automatically rotate the images to better fit the PDF page", example = "true")
+                    boolean autoRotate) throws IOException {
+        // Convert the file to PDF and get the resulting bytes
+        byte[] bytes = PdfUtils.imageToPdf(file, stretchToFit, autoRotate, colorType);
+        return PdfUtils.bytesToWebResponse(bytes, file[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_coverted.pdf");
+    }
+
+    private String getMediaType(String imageFormat) {
+        if (imageFormat.equalsIgnoreCase("PNG"))
+            return "image/png";
+        else if (imageFormat.equalsIgnoreCase("JPEG") || imageFormat.equalsIgnoreCase("JPG"))
+            return "image/jpeg";
+        else if (imageFormat.equalsIgnoreCase("GIF"))
+            return "image/gif";
+        else
+            return "application/octet-stream";
+    }
+
+
+}

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java

@@ -0,0 +1,78 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.ProcessExecutor;
+
+@RestController
+public class ConvertOfficeController {
+
+    public byte[] convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
+        // Check for valid file extension
+        String originalFilename = inputFile.getOriginalFilename();
+        if (originalFilename == null || !isValidFileExtension(FilenameUtils.getExtension(originalFilename))) {
+            throw new IllegalArgumentException("Invalid file extension");
+        }
+
+        // Save the uploaded file to a temporary location
+        Path tempInputFile = Files.createTempFile("input_", "." + FilenameUtils.getExtension(originalFilename));
+        Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
+
+        // Prepare the output file path
+        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
+
+        // Run the LibreOffice command
+        List<String> command = new ArrayList<>(Arrays.asList("unoconv", "-vvv", "-f", "pdf", "-o", tempOutputFile.toString(), tempInputFile.toString()));
+        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
+
+        // Read the converted PDF file
+        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+
+        // Clean up the temporary files
+        Files.delete(tempInputFile);
+        Files.delete(tempOutputFile);
+
+        return pdfBytes;
+    }
+    private boolean isValidFileExtension(String fileExtension) {
+        String extensionPattern = "^(?i)[a-z0-9]{2,4}$";
+        return fileExtension.matches(extensionPattern);
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/file-to-pdf")
+    @Operation(
+        summary = "Convert a file to a PDF using OCR",
+        description = "This endpoint converts a given file to a PDF using Optical Character Recognition (OCR). The filename of the resulting PDF will be the original filename with '_convertedToPDF.pdf' appended."
+    )
+    public ResponseEntity<byte[]> processPdfWithOCR(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(
+            description = "The input file to be converted to a PDF file using OCR",
+            required = true
+        )
+            MultipartFile inputFile
+    ) throws IOException, InterruptedException {
+        // unused but can start server instance if startup time is to long
+        // LibreOfficeListener.getInstance().start();
+
+        byte[] pdfByteArray = convertToPdf(inputFile);
+        return PdfUtils.bytesToWebResponse(pdfByteArray, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_convertedToPDF.pdf");
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java

@@ -0,0 +1,72 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.IOException;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import stirling.software.SPDF.utils.PDFToFile;
+
+@RestController
+public class ConvertPDFToOffice {
+
+	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-html")
+	@Operation(summary = "Convert PDF to HTML", description = "This endpoint converts a PDF file to HTML format.")
+	public ResponseEntity<byte[]> processPdfToHTML(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to HTML format", required = true) MultipartFile inputFile)
+			throws IOException, InterruptedException {
+		PDFToFile pdfToFile = new PDFToFile();
+		return pdfToFile.processPdfToOfficeFormat(inputFile, "html", "writer_pdf_import");
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-presentation")
+	@Operation(summary = "Convert PDF to Presentation format", description = "This endpoint converts a given PDF file to a Presentation format.")
+	public ResponseEntity<byte[]> processPdfToPresentation(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file") MultipartFile inputFile,
+			@RequestParam("outputFormat") @Parameter(description = "The output Presentation format", schema = @Schema(allowableValues = {
+					"ppt", "pptx", "odp" })) String outputFormat)
+			throws IOException, InterruptedException {
+		PDFToFile pdfToFile = new PDFToFile();
+		return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "impress_pdf_import");
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-text")
+	@Operation(summary = "Convert PDF to Text or RTF format", description = "This endpoint converts a given PDF file to Text or RTF format.")
+	public ResponseEntity<byte[]> processPdfToRTForTXT(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file") MultipartFile inputFile,
+			@RequestParam("outputFormat") @Parameter(description = "The output Text or RTF format", schema = @Schema(allowableValues = {
+					"rtf", "txt:Text" })) String outputFormat)
+			throws IOException, InterruptedException {
+		PDFToFile pdfToFile = new PDFToFile();
+		return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-word")
+	@Operation(summary = "Convert PDF to Word document", description = "This endpoint converts a given PDF file to a Word document format.")
+	public ResponseEntity<byte[]> processPdfToWord(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file") MultipartFile inputFile,
+			@RequestParam("outputFormat") @Parameter(description = "The output Word document format", schema = @Schema(allowableValues = {
+					"doc", "docx", "odt" })) String outputFormat)
+			throws IOException, InterruptedException {
+		PDFToFile pdfToFile = new PDFToFile();
+		return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-xml")
+	@Operation(summary = "Convert PDF to XML", description = "This endpoint converts a PDF file to an XML file.")
+	public ResponseEntity<byte[]> processPdfToXML(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to an XML file", required = true) MultipartFile inputFile)
+			throws IOException, InterruptedException {
+
+		PDFToFile pdfToFile = new PDFToFile();
+		return pdfToFile.processPdfToOfficeFormat(inputFile, "xml", "writer_pdf_import");
+	}
+
+}

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.converters;
+package stirling.software.SPDF.controller.api.converters;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -6,32 +6,30 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
-@Controller
+
+@RestController
 public class ConvertPDFToPDFA {
 
-	@GetMapping("/pdf-to-pdfa")
-    public String pdfToPdfAForm(Model model) {
-        model.addAttribute("currentPage", "pdf-to-pdfa");
-        return "convert/pdf-to-pdfa";
-    }
+	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-pdfa")
+	@Operation(
+	    summary = "Convert a PDF to a PDF/A",
+	    description = "This endpoint converts a PDF file to a PDF/A file. PDF/A is a format designed for long-term archiving of digital documents."
+	)
+	public ResponseEntity<byte[]> pdfToPdfA(
+	    @RequestPart(required = true, value = "fileInput")
+	    @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true)
+	        MultipartFile inputFile) throws IOException, InterruptedException {
 
-    
-    @PostMapping("/pdf-to-pdfa")
-    public ResponseEntity<byte[]> pdfToPdfA(
-            @RequestParam("fileInput") MultipartFile inputFile) throws IOException, InterruptedException {
-
-    	
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
         inputFile.transferTo(tempInputFile.toFile());
@@ -50,7 +48,7 @@ public class ConvertPDFToPDFA {
         command.add(tempOutputFile.toString());
 
         int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
-        
+
         // Read the optimized PDF file
         byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
 
@@ -60,11 +58,7 @@ public class ConvertPDFToPDFA {
 
         // Return the optimized PDF as a response
         String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_PDFA.pdf";
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_PDF);
-        headers.setContentDispositionFormData("attachment", outputFilename);
-        return ResponseEntity.ok().headers(headers).body(pdfBytes);
-}
-
+        return PdfUtils.bytesToWebResponse(pdfBytes, outputFilename);
+    }
 
 }

src/main/java/stirling/software/SPDF/controller/api/other/BlankPageController.java

@@ -0,0 +1,128 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.ImageFinder;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.ProcessExecutor;
+
+@RestController
+public class BlankPageController {
+
+	@PostMapping(consumes = "multipart/form-data", value = "/remove-blanks")
+	@Operation(
+	    summary = "Remove blank pages from a PDF file",
+	    description = "This endpoint removes blank pages from a given PDF file. Users can specify the threshold and white percentage to tune the detection of blank pages."
+	)
+	public ResponseEntity<byte[]> removeBlankPages(
+	    @RequestPart(required = true, value = "fileInput")
+	    @Parameter(description = "The input PDF file from which blank pages will be removed", required = true)
+	        MultipartFile inputFile,
+	    @RequestParam(defaultValue = "10", name = "threshold")
+	    @Parameter(description = "The threshold value to determine blank pages", example = "10")
+	        int threshold,
+	    @RequestParam(defaultValue = "99.9", name = "whitePercent")
+	    @Parameter(description = "The percentage of white color on a page to consider it as blank", example = "99.9")
+	        float whitePercent) throws IOException, InterruptedException {
+		
+    	PDDocument document = null;
+        try {
+            document = PDDocument.load(inputFile.getInputStream());
+            PDPageTree pages = document.getDocumentCatalog().getPages();
+            PDFTextStripper textStripper = new PDFTextStripper();
+
+            List<Integer> pagesToKeepIndex = new ArrayList<>();
+            int pageIndex = 0;
+            PDFRenderer pdfRenderer = new PDFRenderer(document);
+
+            for (PDPage page : pages) {
+                System.out.println("checking page " + pageIndex);
+                textStripper.setStartPage(pageIndex + 1);
+                textStripper.setEndPage(pageIndex + 1);
+                String pageText = textStripper.getText(document);
+                boolean hasText = !pageText.trim().isEmpty();
+                if (hasText) {
+                    pagesToKeepIndex.add(pageIndex);
+                    System.out.println("page " + pageIndex + " has text");
+                } else {
+                    boolean hasImages = hasImagesOnPage(page);
+                    if (hasImages) {
+                        System.out.println("page " + pageIndex + " has image");
+    
+                        Path tempFile = Files.createTempFile("image_", ".png");
+    
+                        // Render image and save as temp file
+                        BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, 300);
+                        ImageIO.write(image, "png", tempFile.toFile());
+    
+                        List<String> command = new ArrayList<>(Arrays.asList("python3", System.getProperty("user.dir") + "scripts/detect-blank-pages.py", tempFile.toString() ,"--threshold", String.valueOf(threshold), "--white_percent", String.valueOf(whitePercent)));
+    
+                        // Run CLI command
+                        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
+    
+                        // does contain data
+                        if (returnCode == 0) {
+                            System.out.println("page " + pageIndex + " has image which is not blank");
+                            pagesToKeepIndex.add(pageIndex);
+                        } else {
+                            System.out.println("Skipping, Image was blank for page #" + pageIndex);
+                        }
+                    }
+                }
+                pageIndex++;
+                
+            }
+            System.out.print("pagesToKeep=" + pagesToKeepIndex.size());
+
+            // Remove pages not present in pagesToKeepIndex
+            List<Integer> pageIndices = IntStream.range(0, pages.getCount()).boxed().collect(Collectors.toList());
+            Collections.reverse(pageIndices); // Reverse to prevent index shifting during removal
+            for (Integer i : pageIndices) {
+                if (!pagesToKeepIndex.contains(i)) {
+                    pages.remove(i);
+                }
+            }
+
+            return PdfUtils.pdfDocToWebResponse(document, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_blanksRemoved.pdf");
+        } catch (IOException e) {
+            e.printStackTrace();
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        } finally {
+            if (document != null)
+                document.close();
+        }
+    }
+
+
+    private static boolean hasImagesOnPage(PDPage page) throws IOException {
+        ImageFinder imageFinder = new ImageFinder(page);
+        imageFinder.processPage(page);
+        return imageFinder.hasImages();
+    }
+}

src/main/java/stirling/software/SPDF/controller/api/other/CompressController.java

@@ -1,92 +1,94 @@
-package stirling.software.SPDF.controller;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.ProcessExecutor;
-
-
-@Controller
-public class CompressController {
-
-    private static final Logger logger = LoggerFactory.getLogger(CompressController.class);
-
-    @GetMapping("/compress-pdf")
-    public String compressPdfForm(Model model) {
-        model.addAttribute("currentPage", "compress-pdf");
-        return "compress-pdf";
-    }
-
-    
-    @PostMapping("/compress-pdf")
-    public ResponseEntity<byte[]> optimizePdf(
-            @RequestParam("fileInput") MultipartFile inputFile,
-            @RequestParam("optimizeLevel") int optimizeLevel,
-            @RequestParam(name = "fastWebView", required = false) Boolean fastWebView,
-            @RequestParam(name = "jbig2Lossy", required = false) Boolean jbig2Lossy) throws IOException, InterruptedException {
-
-        // Save the uploaded file to a temporary location
-        Path tempInputFile = Files.createTempFile("input_", ".pdf");
-        inputFile.transferTo(tempInputFile.toFile());
-
-        // Prepare the output file path
-        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-
-        // Prepare the OCRmyPDF command
-        List<String> command = new ArrayList<>();
-        command.add("ocrmypdf");
-        command.add("--skip-text");
-        command.add("--tesseract-timeout=0");
-        command.add("--optimize");
-        command.add(String.valueOf(optimizeLevel));
-        command.add("--output-type");
-        command.add("pdf");
-
-
-        if (fastWebView != null && fastWebView) {
-            long fileSize = inputFile.getSize();
-            long fastWebViewSize = (long) (fileSize * 1.25); // 25% higher than file size
-            command.add("--fast-web-view");
-            command.add(String.valueOf(fastWebViewSize));
-        }
-
-        if (jbig2Lossy != null && jbig2Lossy) {
-            command.add("--jbig2-lossy");
-        }
-
-        command.add(tempInputFile.toString());
-        command.add(tempOutputFile.toString());
-
-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
-        
-        // Read the optimized PDF file
-        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
-
-        // Clean up the temporary files
-        Files.delete(tempInputFile);
-        Files.delete(tempOutputFile);
-
-        // Return the optimized PDF as a response
-        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_Optimized.pdf";
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_PDF);
-        headers.setContentDispositionFormData("attachment", outputFilename);
-        return ResponseEntity.ok().headers(headers).body(pdfBytes);
-}
-
-}
+package stirling.software.SPDF.controller.api.other;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.ProcessExecutor;
+import io.swagger.v3.oas.annotations.media.Schema;
+@RestController
+public class CompressController {
+
+    private static final Logger logger = LoggerFactory.getLogger(CompressController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/compress-pdf")
+    @Operation(
+        summary = "Optimize PDF file",
+        description = "This endpoint accepts a PDF file and optimizes it based on the provided parameters."
+    )
+    public ResponseEntity<byte[]> optimizePdf(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The input PDF file to be optimized.", required = true)
+            MultipartFile inputFile,
+        @RequestParam("optimizeLevel")
+        @Parameter(description = "The level of optimization to apply to the PDF file. Higher values indicate greater compression but may reduce quality.", 
+                    schema = @Schema(allowableValues = {"0", "1", "2", "3"}), example = "1")
+            int optimizeLevel,
+        @RequestParam(name = "fastWebView", required = false)
+        @Parameter(description = "If true, optimize the PDF for fast web view. This increases the file size by about 25%.", example = "false")
+            Boolean fastWebView,
+        @RequestParam(name = "jbig2Lossy", required = false)
+        @Parameter(description = "If true, apply lossy JB2 compression to the PDF file.", example = "false")
+            Boolean jbig2Lossy)
+        throws IOException, InterruptedException {
+
+        // Save the uploaded file to a temporary location
+        Path tempInputFile = Files.createTempFile("input_", ".pdf");
+        inputFile.transferTo(tempInputFile.toFile());
+
+        // Prepare the output file path
+        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
+
+        // Prepare the OCRmyPDF command
+        List<String> command = new ArrayList<>();
+        command.add("ocrmypdf");
+        command.add("--skip-text");
+        command.add("--tesseract-timeout=0");
+        command.add("--optimize");
+        command.add(String.valueOf(optimizeLevel));
+        command.add("--output-type");
+        command.add("pdf");
+
+        if (fastWebView != null && fastWebView) {
+            long fileSize = inputFile.getSize();
+            long fastWebViewSize = (long) (fileSize * 1.25); // 25% higher than file size
+            command.add("--fast-web-view");
+            command.add(String.valueOf(fastWebViewSize));
+        }
+
+        if (jbig2Lossy != null && jbig2Lossy) {
+            command.add("--jbig2-lossy");
+        }
+
+        command.add(tempInputFile.toString());
+        command.add(tempOutputFile.toString());
+
+        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+
+        // Read the optimized PDF file
+        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+
+        // Clean up the temporary files
+        Files.delete(tempInputFile);
+        Files.delete(tempOutputFile);
+
+        // Return the optimized PDF as a response
+        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_Optimized.pdf";
+        return PdfUtils.bytesToWebResponse(pdfBytes, outputFilename);
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/other/ExtractImageScansController.java

@@ -0,0 +1,159 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.imageio.ImageIO;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.ProcessExecutor;
+
+@RestController
+public class ExtractImageScansController {
+
+    private static final Logger logger = LoggerFactory.getLogger(ExtractImageScansController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/extract-image-scans")
+    @Operation(summary = "Extract image scans from an input file",
+            description = "This endpoint extracts image scans from a given file based on certain parameters. Users can specify angle threshold, tolerance, minimum area, minimum contour area, and border size.")
+    public ResponseEntity<byte[]> extractImageScans(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input file containing image scans")
+                    MultipartFile inputFile,
+            @RequestParam(name = "angle_threshold", defaultValue = "5")
+            @Parameter(description = "The angle threshold for the image scan extraction", example = "5")
+                    int angleThreshold,
+            @RequestParam(name = "tolerance", defaultValue = "20")
+            @Parameter(description = "The tolerance for the image scan extraction", example = "20")
+                    int tolerance,
+            @RequestParam(name = "min_area", defaultValue = "8000")
+            @Parameter(description = "The minimum area for the image scan extraction", example = "8000")
+                    int minArea,
+            @RequestParam(name = "min_contour_area", defaultValue = "500")
+            @Parameter(description = "The minimum contour area for the image scan extraction", example = "500")
+                    int minContourArea,
+            @RequestParam(name = "border_size", defaultValue = "1")
+            @Parameter(description = "The border size for the image scan extraction", example = "1")
+                    int borderSize) throws IOException, InterruptedException {
+
+        String fileName = inputFile.getOriginalFilename();
+        String extension = fileName.substring(fileName.lastIndexOf(".") + 1);
+
+        List<String> images = new ArrayList<>();
+
+        // Check if input file is a PDF
+        if (extension.equalsIgnoreCase("pdf")) {
+            // Load PDF document
+            try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputFile.getBytes()))) {
+                PDFRenderer pdfRenderer = new PDFRenderer(document);
+                int pageCount = document.getNumberOfPages();
+                images = new ArrayList<>();
+
+                // Create images of all pages
+                for (int i = 0; i < pageCount; i++) {
+                    // Create temp file to save the image
+                    Path tempFile = Files.createTempFile("image_", ".png");
+
+                    // Render image and save as temp file
+                    BufferedImage image = pdfRenderer.renderImageWithDPI(i, 300);
+                    ImageIO.write(image, "png", tempFile.toFile());
+
+                    // Add temp file path to images list
+                    images.add(tempFile.toString());
+                }
+            }
+        } else {
+            Path tempInputFile = Files.createTempFile("input_", "." + extension);
+            Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
+            // Add input file path to images list
+            images.add(tempInputFile.toString());
+        }
+
+        List<byte[]> processedImageBytes = new ArrayList<>();
+
+        // Process each image
+        for (int i = 0; i < images.size(); i++) {
+
+            Path tempDir = Files.createTempDirectory("openCV_output");
+            List<String> command = new ArrayList<>(Arrays.asList(
+                    "python3", 
+                    "./scripts/split_photos.py", 
+                    images.get(i), 
+                    tempDir.toString(), 
+                    "--angle_threshold", String.valueOf(angleThreshold),
+                    "--tolerance", String.valueOf(tolerance),
+                    "--min_area", String.valueOf(minArea),
+                    "--min_contour_area", String.valueOf(minContourArea),
+                    "--border_size", String.valueOf(borderSize)
+                ));
+
+
+            // Run CLI command
+            int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
+
+            // Read the output photos in temp directory
+            List<Path> tempOutputFiles = Files.list(tempDir).sorted().collect(Collectors.toList());
+            for (Path tempOutputFile : tempOutputFiles) {
+                byte[] imageBytes = Files.readAllBytes(tempOutputFile);
+                processedImageBytes.add(imageBytes);
+            }
+            // Clean up the temporary directory
+            FileUtils.deleteDirectory(tempDir.toFile());
+        }
+
+        // Create zip file if multiple images
+        if (processedImageBytes.size() > 1) {
+            String outputZipFilename = fileName.replaceFirst("[.][^.]+$", "") + "_processed.zip";
+            Path tempZipFile = Files.createTempFile("output_", ".zip");
+
+            try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
+                // Add processed images to the zip
+                for (int i = 0; i < processedImageBytes.size(); i++) {
+                    ZipEntry entry = new ZipEntry(fileName.replaceFirst("[.][^.]+$", "") + "_" + (i + 1) + ".png");
+                    zipOut.putNextEntry(entry);
+                    zipOut.write(processedImageBytes.get(i));
+                    zipOut.closeEntry();
+                }
+            }
+
+            byte[] zipBytes = Files.readAllBytes(tempZipFile);
+
+            // Clean up the temporary zip file
+            Files.delete(tempZipFile);
+
+            return PdfUtils.bytesToWebResponse(zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
+        } else {
+            // Return the processed image as a response
+            byte[] imageBytes = processedImageBytes.get(0);
+            return PdfUtils.bytesToWebResponse(imageBytes, fileName.replaceFirst("[.][^.]+$", "") + ".png", MediaType.IMAGE_PNG);
+        }
+
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/other/ExtractImagesController.java

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller;
+package stirling.software.SPDF.controller.api.other;
 
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -18,33 +18,34 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-@Controller
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import stirling.software.SPDF.utils.PdfUtils;
+@RestController
 public class ExtractImagesController {
 
     private static final Logger logger = LoggerFactory.getLogger(ExtractImagesController.class);
 
-    @GetMapping("/extract-images")
-    public String extractImagesForm(Model model) {
-        model.addAttribute("currentPage", "extract-images");
-        return "extract-images";
-    }
+    @PostMapping(consumes = "multipart/form-data", value = "/extract-images")
+    @Operation(summary = "Extract images from a PDF file",
+            description = "This endpoint extracts images from a given PDF file and returns them in a zip file. Users can specify the output image format.")
+    public ResponseEntity<byte[]> extractImages(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file containing images")
+                    MultipartFile file,
+            @RequestParam("format")
+            @Parameter(description = "The output image format e.g., 'png', 'jpeg', or 'gif'", schema = @Schema(allowableValues = {"png", "jpeg", "gif"}))
+                    String format) throws IOException {
 
-    @PostMapping("/extract-images")
-    public ResponseEntity<Resource> extractImages(@RequestParam("fileInput") MultipartFile file, @RequestParam("format") String format) throws IOException {
-        
         System.out.println(System.currentTimeMillis() + "file=" + file.getName() + ", format=" + format);
         PDDocument document = PDDocument.load(file.getBytes());
 
@@ -58,7 +59,7 @@ public class ExtractImagesController {
         zos.setLevel(Deflater.BEST_COMPRESSION);
 
         int imageIndex = 1;
-        
+
         int pageNum = 1;
         // Iterate over each page
         for (PDPage page : document.getPages()) {
@@ -72,21 +73,18 @@ public class ExtractImagesController {
                     RenderedImage renderedImage = image.getImage();
                     BufferedImage bufferedImage = null;
                     if (format.equalsIgnoreCase("png")) {
-                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(),
-                                BufferedImage.TYPE_INT_ARGB);
+                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(), BufferedImage.TYPE_INT_ARGB);
                     } else if (format.equalsIgnoreCase("jpeg") || format.equalsIgnoreCase("jpg")) {
-                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(),
-                                BufferedImage.TYPE_INT_RGB);
+                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(), BufferedImage.TYPE_INT_RGB);
                     } else if (format.equalsIgnoreCase("gif")) {
-                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(),
-                                BufferedImage.TYPE_BYTE_INDEXED);
-                    } 
+                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(), BufferedImage.TYPE_BYTE_INDEXED);
+                    }
 
                     // Write image to zip file
                     String imageName = "Image " + imageIndex + " (Page " + pageNum + ")." + format;
                     ZipEntry zipEntry = new ZipEntry(imageName);
                     zos.putNextEntry(zipEntry);
-                    
+
                     Graphics2D g = bufferedImage.createGraphics();
                     g.drawImage((Image) renderedImage, 0, 0, null);
                     g.dispose();
@@ -94,12 +92,11 @@ public class ExtractImagesController {
                     ByteArrayOutputStream imageBaos = new ByteArrayOutputStream();
                     ImageIO.write(bufferedImage, format, imageBaos);
                     zos.write(imageBaos.toByteArray());
-                
-                    
+
                     zos.closeEntry();
                     imageIndex++;
                 }
-            }       
+            }
         }
 
         // Close ZipOutputStream and PDDocument
@@ -108,22 +105,8 @@ public class ExtractImagesController {
 
         // Create ByteArrayResource from byte array
         byte[] zipContents = baos.toByteArray();
-        ByteArrayResource resource = new ByteArrayResource(zipContents);
 
-        // Set content disposition header to indicate that the response should be downloaded as a file
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentLength(zipContents.length);
-        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_extracted-images.zip");
-        
-        // Return ResponseEntity with ByteArrayResource and headers
-        return ResponseEntity
-                .status(HttpStatus.OK)
-                .headers(headers)
-                
-                .header("Cache-Control", "no-cache")
-                .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                .body(resource);
+        return PdfUtils.boasToWebResponse(baos, file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_extracted-images.zip", MediaType.APPLICATION_OCTET_STREAM);
     }
-    
-    
+
 }

src/main/java/stirling/software/SPDF/controller/api/other/MetadataController.java

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.security;
+package stirling.software.SPDF.controller.api.other;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -11,49 +11,77 @@ import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import stirling.software.SPDF.utils.PdfUtils;
 
-@Controller
+@RestController
 public class MetadataController {
 
-    @GetMapping("/change-metadata")
-    public String addWatermarkForm(Model model) {
-        model.addAttribute("currentPage", "change-metadata");
-        return "security/change-metadata";
-    }
 
     private String checkUndefined(String entry) {
         // Check if the string is "undefined"
-        if("undefined".equals(entry)) {
+        if ("undefined".equals(entry)) {
             // Return null if it is
             return null;
         }
         // Return the original string if it's not "undefined"
         return entry;
-        
+
     }
-    @PostMapping("/update-metadata")
-    public ResponseEntity<byte[]> metadata(@RequestParam("fileInput") MultipartFile pdfFile,
-            @RequestParam(value = "deleteAll", required = false, defaultValue = "false") Boolean deleteAll, @RequestParam(value = "author", required = false) String author,
-            @RequestParam(value = "creationDate", required = false) String creationDate, @RequestParam(value = "creator", required = false) String creator,
-            @RequestParam(value = "keywords", required = false) String keywords, @RequestParam(value = "modificationDate", required = false) String modificationDate,
-            @RequestParam(value = "producer", required = false) String producer, @RequestParam(value = "subject", required = false) String subject,
-            @RequestParam(value = "title", required = false) String title, @RequestParam(value = "trapped", required = false) String trapped,
-            @RequestParam Map<String, String> allRequestParams) throws IOException {
+
+    @PostMapping(consumes = "multipart/form-data", value = "/update-metadata")
+    @Operation(summary = "Update metadata of a PDF file",
+            description = "This endpoint allows you to update the metadata of a given PDF file. You can add, modify, or delete standard and custom metadata fields.")
+    public ResponseEntity<byte[]> metadata(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file to update metadata")
+                    MultipartFile pdfFile,
+            @RequestParam(value = "deleteAll", required = false, defaultValue = "false")
+            @Parameter(description = "Delete all metadata if set to true")
+                    Boolean deleteAll,
+            @RequestParam(value = "author", required = false)
+            @Parameter(description = "The author of the document")
+                    String author,
+            @RequestParam(value = "creationDate", required = false)
+            @Parameter(description = "The creation date of the document (format: yyyy/MM/dd HH:mm:ss)")
+                    String creationDate,
+            @RequestParam(value = "creator", required = false)
+            @Parameter(description = "The creator of the document")
+                    String creator,
+            @RequestParam(value = "keywords", required = false)
+            @Parameter(description = "The keywords for the document")
+                    String keywords,
+            @RequestParam(value = "modificationDate", required = false)
+            @Parameter(description = "The modification date of the document (format: yyyy/MM/dd HH:mm:ss)")
+                    String modificationDate,
+            @RequestParam(value = "producer", required = false)
+            @Parameter(description = "The producer of the document")
+                    String producer,
+            @RequestParam(value = "subject", required = false)
+            @Parameter(description = "The subject of the document")
+                    String subject,
+            @RequestParam(value = "title", required = false)
+            @Parameter(description = "The title of the document")
+                    String title,
+            @RequestParam(value = "trapped", required = false)
+            @Parameter(description = "The trapped status of the document")
+                    String trapped,
+            @RequestParam Map<String, String> allRequestParams)
+            throws IOException {
 
         // Load the PDF file into a PDDocument
         PDDocument document = PDDocument.load(pdfFile.getBytes());
-        
+
         // Get the document information from the PDF
         PDDocumentInformation info = document.getDocumentInformation();
-        
+
         // Check if each metadata value is "undefined" and set it to null if it is
         author = checkUndefined(author);
         creationDate = checkUndefined(creationDate);
@@ -64,8 +92,9 @@ public class MetadataController {
         subject = checkUndefined(subject);
         title = checkUndefined(title);
         trapped = checkUndefined(trapped);
-     
-     // If the "deleteAll" flag is set, remove all metadata from the document information
+
+        // If the "deleteAll" flag is set, remove all metadata from the document
+        // information
         if (deleteAll) {
             for (String key : info.getMetadataKeys()) {
                 info.setCustomMetadataValue(key, null);
@@ -83,7 +112,7 @@ public class MetadataController {
             title = null;
             trapped = null;
         } else {
-         // Iterate through the request parameters and set the metadata values
+            // Iterate through the request parameters and set the metadata values
             for (Entry<String, String> entry : allRequestParams.entrySet()) {
                 String key = entry.getKey();
                 // Check if the key is a standard metadata key
@@ -128,11 +157,9 @@ public class MetadataController {
         info.setSubject(subject);
         info.setTitle(title);
         info.setTrapped(trapped);
-        
+
         document.setDocumentInformation(info);
         return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_metadata.pdf");
     }
-    
-    
-    
+
 }

src/main/java/stirling/software/SPDF/controller/api/other/OCRController.java

@@ -0,0 +1,201 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.ProcessExecutor;
+
+@RestController
+public class OCRController {
+
+    private static final Logger logger = LoggerFactory.getLogger(OCRController.class);
+
+    public List<String> getAvailableTesseractLanguages() {
+        String tessdataDir = "/usr/share/tesseract-ocr/4.00/tessdata";
+        File[] files = new File(tessdataDir).listFiles();
+        if (files == null) {
+            return Collections.emptyList();
+        }
+        return Arrays.stream(files).filter(file -> file.getName().endsWith(".traineddata")).map(file -> file.getName().replace(".traineddata", ""))
+                .filter(lang -> !lang.equalsIgnoreCase("osd")).collect(Collectors.toList());
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
+    @Operation(summary = "Process a PDF file with OCR",
+            description = "This endpoint processes a PDF file using OCR (Optical Character Recognition). Users can specify languages, sidecar, deskew, clean, cleanFinal, ocrType, ocrRenderType, and removeImagesAfter options.")
+    public ResponseEntity<byte[]> processPdfWithOCR(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file to be processed with OCR")
+                    MultipartFile inputFile,
+            @RequestParam("languages")
+            @Parameter(description = "List of languages to use in OCR processing")
+                    List<String> selectedLanguages,
+            @RequestParam(name = "sidecar", required = false)
+            @Parameter(description = "Include OCR text in a sidecar text file if set to true")
+                    Boolean sidecar,
+            @RequestParam(name = "deskew", required = false)
+            @Parameter(description = "Deskew the input file if set to true")
+                    Boolean deskew,
+            @RequestParam(name = "clean", required = false)
+            @Parameter(description = "Clean the input file if set to true")
+                    Boolean clean,
+            @RequestParam(name = "clean-final", required = false)
+            @Parameter(description = "Clean the final output if set to true")
+                    Boolean cleanFinal,
+            @RequestParam(name = "ocrType", required = false)
+            @Parameter(description = "Specify the OCR type, e.g., 'skip-text', 'force-ocr', or 'Normal'", schema = @Schema(allowableValues = {"skip-text", "force-ocr", "Normal"}))
+                    String ocrType,
+            @RequestParam(name = "ocrRenderType", required = false, defaultValue = "hocr")
+            @Parameter(description = "Specify the OCR render type, either 'hocr' or 'sandwich'", schema = @Schema(allowableValues = {"hocr", "sandwich"}))
+                    String ocrRenderType,
+            @RequestParam(name = "removeImagesAfter", required = false)
+            @Parameter(description = "Remove images from the output PDF if set to true")
+                    Boolean removeImagesAfter) throws IOException, InterruptedException {
+
+        // --output-type pdfa
+        if (selectedLanguages == null || selectedLanguages.isEmpty()) {
+            throw new IOException("Please select at least one language.");
+        }
+        
+        if(!ocrRenderType.equals("hocr") && !ocrRenderType.equals("sandwich")) {
+            throw new IOException("ocrRenderType wrong");
+        }
+        
+        // Get available Tesseract languages
+        List<String> availableLanguages = getAvailableTesseractLanguages();
+
+        // Validate selected languages
+        selectedLanguages = selectedLanguages.stream().filter(availableLanguages::contains).toList();
+
+        if (selectedLanguages.isEmpty()) {
+            throw new IOException("None of the selected languages are valid.");
+        }
+        // Save the uploaded file to a temporary location
+        Path tempInputFile = Files.createTempFile("input_", ".pdf");
+        Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
+
+        // Prepare the output file path
+        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
+
+        // Prepare the output file path
+        Path sidecarTextPath = null;
+
+        // Run OCR Command
+        String languageOption = String.join("+", selectedLanguages);
+
+        
+        List<String> command = new ArrayList<>(Arrays.asList("ocrmypdf", "--verbose", "2", "--output-type", "pdf", "--pdf-renderer" , ocrRenderType));
+
+        if (sidecar != null && sidecar) {
+            sidecarTextPath = Files.createTempFile("sidecar", ".txt");
+            command.add("--sidecar");
+            command.add(sidecarTextPath.toString());
+        }
+
+        if (deskew != null && deskew) {
+            command.add("--deskew");
+        }
+        if (clean != null && clean) {
+            command.add("--clean");
+        }
+        if (cleanFinal != null && cleanFinal) {
+            command.add("--clean-final");
+        }
+        if (ocrType != null && !ocrType.equals("")) {
+            if ("skip-text".equals(ocrType)) {
+                command.add("--skip-text");
+            } else if ("force-ocr".equals(ocrType)) {
+                command.add("--force-ocr");
+            } else if ("Normal".equals(ocrType)) {
+
+            }
+        }
+
+        command.addAll(Arrays.asList("--language", languageOption, tempInputFile.toString(), tempOutputFile.toString()));
+
+        // Run CLI command
+        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+
+        
+
+        
+        
+        // Remove images from the OCR processed PDF if the flag is set to true
+        if (removeImagesAfter != null && removeImagesAfter) {
+            Path tempPdfWithoutImages = Files.createTempFile("output_", "_no_images.pdf");
+
+            List<String> gsCommand = Arrays.asList("gs", "-sDEVICE=pdfwrite", "-dFILTERIMAGE", "-o", tempPdfWithoutImages.toString(), tempOutputFile.toString());
+
+            int gsReturnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(gsCommand);
+            tempOutputFile = tempPdfWithoutImages;
+        }
+        // Read the OCR processed PDF file
+        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+        // Clean up the temporary files
+        Files.delete(tempInputFile);
+        
+        // Return the OCR processed PDF as a response
+        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.pdf";
+
+        if (sidecar != null && sidecar) {
+            // Create a zip file containing both the PDF and the text file
+            String outputZipFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.zip";
+            Path tempZipFile = Files.createTempFile("output_", ".zip");
+
+            try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
+                // Add PDF file to the zip
+                ZipEntry pdfEntry = new ZipEntry(outputFilename);
+                zipOut.putNextEntry(pdfEntry);
+                Files.copy(tempOutputFile, zipOut);
+                zipOut.closeEntry();
+
+                // Add text file to the zip
+                ZipEntry txtEntry = new ZipEntry(outputFilename.replace(".pdf", ".txt"));
+                zipOut.putNextEntry(txtEntry);
+                Files.copy(sidecarTextPath, zipOut);
+                zipOut.closeEntry();
+            }
+
+            byte[] zipBytes = Files.readAllBytes(tempZipFile);
+
+            // Clean up the temporary zip file
+            Files.delete(tempZipFile);
+            Files.delete(tempOutputFile);
+            Files.delete(sidecarTextPath);
+
+            // Return the zip file containing both the PDF and the text file
+            return PdfUtils.bytesToWebResponse(pdfBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
+        } else {
+            // Return the OCR processed PDF as a response
+            Files.delete(tempOutputFile);
+            return PdfUtils.bytesToWebResponse(pdfBytes, outputFilename);
+        }
+
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/other/OverlayImageController.java

@@ -0,0 +1,56 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+
+@RestController
+public class OverlayImageController {
+
+    private static final Logger logger = LoggerFactory.getLogger(OverlayImageController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/add-image")
+    @Operation(
+        summary = "Overlay image onto a PDF file",
+        description = "This endpoint overlays an image onto a PDF file at the specified coordinates. The image can be overlaid on every page of the PDF if specified."
+    )
+    public ResponseEntity<byte[]> overlayImage(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The input PDF file to overlay the image onto.", required = true)
+            MultipartFile pdfFile,
+        @RequestParam("fileInput2")
+        @Parameter(description = "The image file to be overlaid onto the PDF.", required = true)
+            MultipartFile imageFile,
+        @RequestParam("x")
+        @Parameter(description = "The x-coordinate at which to place the top-left corner of the image.", example = "0")
+            float x,
+        @RequestParam("y")
+        @Parameter(description = "The y-coordinate at which to place the top-left corner of the image.", example = "0")
+            float y,
+        @RequestParam("everyPage")
+        @Parameter(description = "Whether to overlay the image onto every page of the PDF.", example = "false")
+            boolean everyPage) {
+        try {
+            byte[] pdfBytes = pdfFile.getBytes();
+            byte[] imageBytes = imageFile.getBytes();
+            byte[] result = PdfUtils.overlayImage(pdfBytes, imageBytes, x, y, everyPage);
+
+            return PdfUtils.bytesToWebResponse(result, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_overlayed.pdf");
+        } catch (IOException e) {
+            logger.error("Failed to add image to PDF", e);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
+    }
+}

src/main/java/stirling/software/SPDF/controller/api/other/RepairController.java

@@ -0,0 +1,66 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.ProcessExecutor;
+
+@RestController
+public class RepairController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RepairController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/repair")
+    @Operation(
+        summary = "Repair a PDF file",
+        description = "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response."
+    )
+    public ResponseEntity<byte[]> repairPdf(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The input PDF file to be repaired", required = true)
+            MultipartFile inputFile) throws IOException, InterruptedException {
+
+        // Save the uploaded file to a temporary location
+        Path tempInputFile = Files.createTempFile("input_", ".pdf");
+        inputFile.transferTo(tempInputFile.toFile());
+
+        // Prepare the output file path
+        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
+
+        List<String> command = new ArrayList<>();
+        command.add("gs");
+        command.add("-o");
+        command.add(tempOutputFile.toString());
+        command.add("-sDEVICE=pdfwrite");
+        command.add(tempInputFile.toString());
+
+
+        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);
+
+        // Read the optimized PDF file
+        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+
+        // Clean up the temporary files
+        Files.delete(tempInputFile);
+        Files.delete(tempOutputFile);
+
+        // Return the optimized PDF as a response
+        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_repaired.pdf";
+        return PdfUtils.bytesToWebResponse(pdfBytes, outputFilename);
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java

@@ -0,0 +1,107 @@
+package stirling.software.SPDF.controller.api.security;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
+import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+import io.swagger.v3.oas.annotations.media.Schema;
+@RestController
+public class PasswordController {
+
+    private static final Logger logger = LoggerFactory.getLogger(PasswordController.class);
+
+
+    @PostMapping(consumes = "multipart/form-data", value = "/remove-password")
+    @Operation(
+        summary = "Remove password from a PDF file",
+        description = "This endpoint removes the password from a protected PDF file. Users need to provide the existing password."
+    )
+    public ResponseEntity<byte[]> removePassword(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The input PDF file from which the password should be removed", required = true)
+            MultipartFile fileInput,
+        @RequestParam(name = "password")
+        @Parameter(description = "The password of the PDF file", required = true)
+            String password) throws IOException {
+        PDDocument document = PDDocument.load(fileInput.getBytes(), password);
+        document.setAllSecurityToBeRemoved(true);
+        return PdfUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_password_removed.pdf");
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/add-password")
+    @Operation(
+        summary = "Add password to a PDF file",
+        description = "This endpoint adds password protection to a PDF file. Users can specify a set of permissions that should be applied to the file."
+    )
+    public ResponseEntity<byte[]> addPassword(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The input PDF file to which the password should be added", required = true)
+            MultipartFile fileInput,
+        @RequestParam(defaultValue = "", name = "password")
+        @Parameter(description = "The password to be added to the PDF file")
+            String password,
+        @RequestParam(defaultValue = "128", name = "keyLength")
+        @Parameter(description = "The length of the encryption key", schema = @Schema(allowableValues = {"40", "128", "256"}))
+            int keyLength,
+        @RequestParam(defaultValue = "false", name = "canAssembleDocument")
+        @Parameter(description = "Whether the document assembly is allowed", example = "false")
+            boolean canAssembleDocument,
+        @RequestParam(defaultValue = "false", name = "canExtractContent")
+        @Parameter(description = "Whether content extraction for accessibility is allowed", example = "false")
+            boolean canExtractContent,
+        @RequestParam(defaultValue = "false", name = "canExtractForAccessibility")
+        @Parameter(description = "Whether content extraction for accessibility is allowed", example = "false")
+            boolean canExtractForAccessibility,
+        @RequestParam(defaultValue = "false", name = "canFillInForm")
+        @Parameter(description = "Whether form filling is allowed", example = "false")
+            boolean canFillInForm,
+        @RequestParam(defaultValue = "false", name = "canModify")
+        @Parameter(description = "Whether the document modification is allowed", example = "false")
+            boolean canModify,
+        @RequestParam(defaultValue = "false", name = "canModifyAnnotations")
+        @Parameter(description = "Whether modification of annotations is allowed", example = "false")
+            boolean canModifyAnnotations,
+        @RequestParam(defaultValue = "false", name = "canPrint")
+        @Parameter(description = "Whether printing of the document is allowed", example = "false")
+            boolean canPrint,
+        @RequestParam(defaultValue = "false", name = "canPrintFaithful")
+        @Parameter(description = "Whether faithful printing is allowed", example = "false")
+            boolean canPrintFaithful
+    ) throws IOException {
+
+        PDDocument document = PDDocument.load(fileInput.getBytes());
+        AccessPermission ap = new AccessPermission();
+
+        ap.setCanAssembleDocument(!canAssembleDocument);
+        ap.setCanExtractContent(!canExtractContent);
+        ap.setCanExtractForAccessibility(!canExtractForAccessibility);
+        ap.setCanFillInForm(!canFillInForm);
+        ap.setCanModify(!canModify);
+        ap.setCanModifyAnnotations(!canModifyAnnotations);
+        ap.setCanPrint(!canPrint);
+        ap.setCanPrintFaithful(!canPrintFaithful);
+        StandardProtectionPolicy spp = new StandardProtectionPolicy(password, password, ap);
+        spp.setEncryptionKeyLength(keyLength);
+
+        spp.setPermissions(ap);
+
+        document.protect(spp);
+
+        return PdfUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_passworded.pdf");
+    }
+
+
+}

src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java

@@ -0,0 +1,97 @@
+package stirling.software.SPDF.controller.api.security;
+
+import java.awt.Color;
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
+import org.apache.pdfbox.util.Matrix;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.PdfUtils;
+
+@RestController
+public class WatermarkController {
+
+    @PostMapping(consumes = "multipart/form-data", value = "/add-watermark")
+    @Operation(summary = "Add watermark to a PDF file",
+            description = "This endpoint adds a watermark to a given PDF file. Users can specify the watermark text, font size, rotation, opacity, width spacer, and height spacer.")
+    public ResponseEntity<byte[]> addWatermark(
+            @RequestPart(required = true, value = "fileInput")
+            @Parameter(description = "The input PDF file to add a watermark")
+                    MultipartFile pdfFile,
+            @RequestParam("watermarkText")
+            @Parameter(description = "The watermark text to add to the PDF file")
+                    String watermarkText,
+            @RequestParam(defaultValue = "30", name = "fontSize")
+            @Parameter(description = "The font size of the watermark text", example = "30")
+                    float fontSize,
+            @RequestParam(defaultValue = "0", name = "rotation")
+            @Parameter(description = "The rotation of the watermark text in degrees", example = "0")
+                    float rotation,
+            @RequestParam(defaultValue = "0.5", name = "opacity")
+            @Parameter(description = "The opacity of the watermark text (0.0 - 1.0)", example = "0.5")
+                    float opacity,
+            @RequestParam(defaultValue = "50", name = "widthSpacer")
+            @Parameter(description = "The width spacer between watermark texts", example = "50")
+                    int widthSpacer,
+            @RequestParam(defaultValue = "50", name = "heightSpacer")
+            @Parameter(description = "The height spacer between watermark texts", example = "50")
+                    int heightSpacer) throws IOException {
+
+        // Load the input PDF
+        PDDocument document = PDDocument.load(pdfFile.getInputStream());
+
+        // Create a page in the document
+        for (PDPage page : document.getPages()) {
+
+            // Get the page's content stream
+            PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true);
+
+            // Set transparency
+            PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
+            graphicsState.setNonStrokingAlphaConstant(opacity);
+            contentStream.setGraphicsStateParameters(graphicsState);
+
+            // Set font of watermark
+            PDFont font = PDType1Font.HELVETICA_BOLD;
+            contentStream.beginText();
+            contentStream.setFont(font, fontSize);
+            contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
+
+            // Set size and location of watermark
+            float pageWidth = page.getMediaBox().getWidth();
+            float pageHeight = page.getMediaBox().getHeight();
+            float watermarkWidth = widthSpacer + font.getStringWidth(watermarkText) * fontSize / 1000;
+            float watermarkHeight = heightSpacer + fontSize;
+            int watermarkRows = (int) (pageHeight / watermarkHeight + 1);
+            int watermarkCols = (int) (pageWidth / watermarkWidth + 1);
+
+            // Add the watermark text
+            for (int i = 0; i < watermarkRows; i++) {
+                for (int j = 0; j < watermarkCols; j++) {
+                    contentStream.setTextMatrix(Matrix.getRotateInstance((float) Math.toRadians(rotation), j * watermarkWidth, i * watermarkHeight));
+                    contentStream.showTextWithPositioning(new Object[] { watermarkText });
+                }
+            }
+
+            contentStream.endText();
+
+            // Close the content stream
+            contentStream.close();
+        }
+        return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_watermarked.pdf");
+    }
+
+}

src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java

@@ -1,97 +0,0 @@
-package stirling.software.SPDF.controller.converters;
-
-import java.io.IOException;
-
-import org.apache.pdfbox.rendering.ImageType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-
-@Controller
-public class ConvertImgPDFController {
-
-    private static final Logger logger = LoggerFactory.getLogger(ConvertImgPDFController.class);
-
-    @GetMapping("/img-to-pdf")
-    public String convertToPdfForm(Model model) {
-        model.addAttribute("currentPage", "img-to-pdf");
-        return "convert/img-to-pdf";
-    }
-
-    @GetMapping("/pdf-to-img")
-    public String pdfToimgForm(Model model) {
-        model.addAttribute("currentPage", "pdf-to-img");
-        return "convert/pdf-to-img";
-    }
-
-    @PostMapping("/img-to-pdf")
-    public ResponseEntity<byte[]> convertToPdf(@RequestParam("fileInput") MultipartFile[] file,
-            @RequestParam(defaultValue = "false", name = "stretchToFit") boolean stretchToFit,
-            @RequestParam(defaultValue = "true", name = "autoRotate") boolean autoRotate) throws IOException {
-        // Convert the file to PDF and get the resulting bytes
-        System.out.println(stretchToFit);
-        byte[] bytes = PdfUtils.imageToPdf(file, stretchToFit, autoRotate);
-        return PdfUtils.bytesToWebResponse(bytes, file[0].getOriginalFilename().replaceFirst("[.][^.]+$", "")+ "_coverted.pdf");
-    }
-
-    @PostMapping("/pdf-to-img")
-    public ResponseEntity<Resource> convertToImage(@RequestParam("fileInput") MultipartFile file, @RequestParam("imageFormat") String imageFormat,
-            @RequestParam("singleOrMultiple") String singleOrMultiple, @RequestParam("colorType") String colorType, @RequestParam("dpi") String dpi) throws IOException {
-
-        byte[] pdfBytes = file.getBytes();
-        ImageType colorTypeResult = ImageType.RGB;
-        if ("greyscale".equals(colorType)) {
-            colorTypeResult = ImageType.GRAY;
-        } else if ("blackwhite".equals(colorType)) {
-            colorTypeResult = ImageType.BINARY;
-        }
-        // returns bytes for image
-        boolean singleImage = singleOrMultiple.equals("single");
-        byte[] result = null;
-        try {
-            result = PdfUtils.convertFromPdf(pdfBytes, imageFormat.toUpperCase(), colorTypeResult, singleImage, Integer.valueOf(dpi));
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        if (singleImage) {
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.parseMediaType(getMediaType(imageFormat)));
-            ResponseEntity<Resource> response = new ResponseEntity<>(new ByteArrayResource(result), headers, HttpStatus.OK);
-            return response;
-        } else {
-            ByteArrayResource resource = new ByteArrayResource(result);
-            // return the Resource in the response
-            return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename="+ file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_convertedToImages.zip").contentType(MediaType.APPLICATION_OCTET_STREAM)
-                    .contentLength(resource.contentLength()).body(resource);
-        }
-    }
-
-    private String getMediaType(String imageFormat) {
-        if (imageFormat.equalsIgnoreCase("PNG"))
-            return "image/png";
-        else if (imageFormat.equalsIgnoreCase("JPEG") || imageFormat.equalsIgnoreCase("JPG"))
-            return "image/jpeg";
-        else if (imageFormat.equalsIgnoreCase("GIF"))
-            return "image/gif";
-        else
-            return "application/octet-stream";
-    }
-
-}

src/main/java/stirling/software/SPDF/controller/converters/ConvertOfficeController.java

@@ -1,80 +0,0 @@
-package stirling.software.SPDF.controller.converters;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.ProcessExecutor;
-@Controller
-public class ConvertOfficeController {
-
-	
-	@GetMapping("/file-to-pdf")
-    public String convertToPdfForm(Model model) {
-        model.addAttribute("currentPage", "file-to-pdf");
-        return "convert/file-to-pdf";
-    }
-
-	@PostMapping("/file-to-pdf")
-	public ResponseEntity<byte[]> processPdfWithOCR(@RequestParam("fileInput") MultipartFile inputFile) throws IOException, InterruptedException {
-		
-		//unused but can start server instance if startup time is to long
-		//LibreOfficeListener.getInstance().start();
-		
-		byte[] pdfByteArray = convertToPdf(inputFile);
-		return PdfUtils.bytesToWebResponse(pdfByteArray, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_convertedToPDF.pdf");
-	}
-	
-	
-public byte[] convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
- // Check for valid file extension
-    String originalFilename = inputFile.getOriginalFilename();
-    if (originalFilename == null || !isValidFileExtension(FilenameUtils.getExtension(originalFilename))) {
-        throw new IllegalArgumentException("Invalid file extension");
-    }
-
-    // Save the uploaded file to a temporary location
-    Path tempInputFile = Files.createTempFile("input_", "." + FilenameUtils.getExtension(originalFilename));
-    Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
-
-    // Prepare the output file path
-    Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-
-    // Run the LibreOffice command
-    List<String> command = new ArrayList<>(Arrays.asList("unoconv", "-vvv",
-            "-f",
-            "pdf",
-            "-o",
-            tempOutputFile.toString(),
-            tempInputFile.toString()));
-    int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
-
-    // Read the converted PDF file
-    byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
-
-    // Clean up the temporary files
-    Files.delete(tempInputFile);
-    Files.delete(tempOutputFile);
-
-    return pdfBytes;
-}
-private boolean isValidFileExtension(String fileExtension) {
-    String extensionPattern = "^(?i)[a-z0-9]{2,4}$";
-    return fileExtension.matches(extensionPattern);
-}
-
-}

src/main/java/stirling/software/SPDF/controller/converters/ConvertPDFToOffice.java

@@ -1,97 +0,0 @@
-package stirling.software.SPDF.controller.converters;
-
-import java.io.IOException;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.ModelAndView;
-
-import stirling.software.SPDF.utils.PDFToFile;
-
-@Controller
-public class ConvertPDFToOffice {
-
-    
-    
-    @GetMapping("/pdf-to-word")
-    public ModelAndView pdfToWord() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-word");
-        modelAndView.addObject("currentPage", "pdf-to-word");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-presentation")
-    public ModelAndView pdfToPresentation() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-presentation");
-        modelAndView.addObject("currentPage", "pdf-to-presentation");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-text")
-    public ModelAndView pdfToText() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-text");
-        modelAndView.addObject("currentPage", "pdf-to-text");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-html")
-    public ModelAndView pdfToHTML() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-html");
-        modelAndView.addObject("currentPage", "pdf-to-html");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-xml")
-    public ModelAndView pdfToXML() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-xml");
-        modelAndView.addObject("currentPage", "pdf-to-xml");
-        return modelAndView;
-    }
-
-    
-    @PostMapping("/pdf-to-word")
-    public ResponseEntity<byte[]> processPdfToWord(@RequestParam("fileInput") MultipartFile inputFile,
-                                                   @RequestParam("outputFormat") String outputFormat) throws IOException, InterruptedException {
-        PDFToFile pdfToFile = new PDFToFile();
-        return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
-    }
-    
-    @PostMapping("/pdf-to-presentation")
-    public ResponseEntity<byte[]> processPdfToPresentation(@RequestParam("fileInput") MultipartFile inputFile,
-                                                           @RequestParam("outputFormat") String outputFormat) throws IOException, InterruptedException {
-        PDFToFile pdfToFile = new PDFToFile();
-        return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "impress_pdf_import");
-    }
-    
-    @PostMapping("/pdf-to-text")
-    public ResponseEntity<byte[]> processPdfToRTForTXT(@RequestParam("fileInput") MultipartFile inputFile,
-                                                       @RequestParam("outputFormat") String outputFormat) throws IOException, InterruptedException {
-        PDFToFile pdfToFile = new PDFToFile();
-        return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
-    }
-    
-    
-    @PostMapping("/pdf-to-html")
-    public ResponseEntity<byte[]> processPdfToHTML(@RequestParam("fileInput") MultipartFile inputFile) throws IOException, InterruptedException {
-        PDFToFile pdfToFile = new PDFToFile();
-        return pdfToFile.processPdfToOfficeFormat(inputFile, "html", "writer_pdf_import");
-    }
-
-    @PostMapping("/pdf-to-xml")
-    public ResponseEntity<byte[]> processPdfToXML(@RequestParam("fileInput") MultipartFile inputFile) throws IOException, InterruptedException {
-        PDFToFile pdfToFile = new PDFToFile();
-        return pdfToFile.processPdfToOfficeFormat(inputFile, "xml", "writer_pdf_import");
-    }
- 
-    
-    
-    
-    
-    
-    
-    
-}

src/main/java/stirling/software/SPDF/controller/security/PasswordController.java

@@ -1,81 +0,0 @@
-package stirling.software.SPDF.controller.security;
-
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
-import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-
-@Controller
-public class PasswordController {
-
-    private static final Logger logger = LoggerFactory.getLogger(PasswordController.class);
-
-    @GetMapping("/add-password")
-    public String addPasswordForm(Model model) {
-        model.addAttribute("currentPage", "add-password");
-        return "security/add-password";
-    }
-
-    @GetMapping("/remove-password")
-    public String removePasswordForm(Model model) {
-        model.addAttribute("currentPage", "remove-password");
-        return "security/remove-password";
-    }
-
-    @GetMapping("/change-permissions")
-    public String permissionsForm(Model model) {
-        model.addAttribute("currentPage", "change-permissions");
-        return "security/change-permissions";
-    }
-
-    @PostMapping("/remove-password")
-    public ResponseEntity<byte[]> compressPDF(@RequestParam("fileInput") MultipartFile fileInput, @RequestParam(name = "password") String password) throws IOException {
-        PDDocument document = PDDocument.load(fileInput.getBytes(), password);
-        document.setAllSecurityToBeRemoved(true);
-        return PdfUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "")+ "_password_removed.pdf");
-    }
-
-    @PostMapping("/add-password")
-    public ResponseEntity<byte[]> compressPDF(@RequestParam("fileInput") MultipartFile fileInput, @RequestParam(defaultValue = "", name = "password") String password,
-            @RequestParam(defaultValue = "128", name = "keyLength") int keyLength, @RequestParam(defaultValue = "false", name = "canAssembleDocument") boolean canAssembleDocument,
-            @RequestParam(defaultValue = "false", name = "canExtractContent") boolean canExtractContent,
-            @RequestParam(defaultValue = "false", name = "canExtractForAccessibility") boolean canExtractForAccessibility,
-            @RequestParam(defaultValue = "false", name = "canFillInForm") boolean canFillInForm, @RequestParam(defaultValue = "false", name = "canModify") boolean canModify,
-            @RequestParam(defaultValue = "false", name = "canModifyAnnotations") boolean canModifyAnnotations,
-            @RequestParam(defaultValue = "false", name = "canPrint") boolean canPrint, @RequestParam(defaultValue = "false", name = "canPrintFaithful") boolean canPrintFaithful)
-            throws IOException {
-
-        PDDocument document = PDDocument.load(fileInput.getBytes());
-        AccessPermission ap = new AccessPermission();
-
-        ap.setCanAssembleDocument(!canAssembleDocument);
-        ap.setCanExtractContent(!canExtractContent);
-        ap.setCanExtractForAccessibility(!canExtractForAccessibility);
-        ap.setCanFillInForm(!canFillInForm);
-        ap.setCanModify(!canModify);
-        ap.setCanModifyAnnotations(!canModifyAnnotations);
-        ap.setCanPrint(!canPrint);
-        ap.setCanPrintFaithful(!canPrintFaithful);
-        StandardProtectionPolicy spp = new StandardProtectionPolicy(password, password, ap);
-        spp.setEncryptionKeyLength(keyLength);
-
-        spp.setPermissions(ap);
-
-        document.protect(spp);
-
-        return PdfUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "")+ "_passworded.pdf");
-    }
-
-}

src/main/java/stirling/software/SPDF/controller/security/WatermarkController.java

@@ -1,157 +0,0 @@
-package stirling.software.SPDF.controller.security;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationMarkup;
-import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
-import org.apache.pdfbox.pdmodel.interactive.form.PDField;
-import org.apache.pdfbox.util.Matrix;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.WatermarkRemover;
-
-@Controller
-public class WatermarkController {
-
-    @GetMapping("/add-watermark")
-    public String addWatermarkForm(Model model) {
-        model.addAttribute("currentPage", "add-watermark");
-        return "security/add-watermark";
-    }
-
-    @GetMapping("/remove-watermark")
-    public String removeWatermarkForm(Model model) {
-        model.addAttribute("currentPage", "remove-watermark");
-        return "security/remove-watermark";
-    }
-    
-    @PostMapping("/add-watermark")
-    public ResponseEntity<byte[]> addWatermark(@RequestParam("fileInput") MultipartFile pdfFile, @RequestParam("watermarkText") String watermarkText,
-            @RequestParam(defaultValue = "30", name = "fontSize") float fontSize, @RequestParam(defaultValue = "0", name = "rotation") float rotation,
-            @RequestParam(defaultValue = "0.5", name = "opacity") float opacity,
-    	@RequestParam(defaultValue = "50", name = "widthSpacer") int widthSpacer, @RequestParam(defaultValue = "50", name = "heightSpacer") int heightSpacer)
-            throws IOException {
-
-        // Load the input PDF
-        PDDocument document = PDDocument.load(pdfFile.getInputStream());
-
-        // Create a page in the document
-        for (PDPage page : document.getPages()) {
-        	
-        	
-
-            
-            // Get the page's content stream
-            PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true);
-
-            // Set transparency
-            PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
-            graphicsState.setNonStrokingAlphaConstant(opacity);
-            contentStream.setGraphicsStateParameters(graphicsState);
-            
-            // Set font of watermark
-            PDFont font = PDType1Font.HELVETICA_BOLD;
-            contentStream.beginText();
-            contentStream.setFont(font, fontSize);
-            contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
-
-            // Set size and location of watermark
-            float pageWidth = page.getMediaBox().getWidth();
-            float pageHeight = page.getMediaBox().getHeight();
-            float watermarkWidth = widthSpacer + font.getStringWidth(watermarkText) * fontSize / 1000;
-            float watermarkHeight = heightSpacer + fontSize;
-            int watermarkRows = (int) (pageHeight / watermarkHeight + 1);
-            int watermarkCols = (int) (pageWidth / watermarkWidth + 1);
-
-            // Add the watermark text
-            for (int i = 0; i < watermarkRows; i++) {
-                for (int j = 0; j < watermarkCols; j++) {
-                    contentStream.setTextMatrix(Matrix.getRotateInstance((float) Math.toRadians(rotation), j * watermarkWidth, i * watermarkHeight));
-                    contentStream.showTextWithPositioning(new Object[] { watermarkText });
-                }
-            }
-
-            contentStream.endText();
-
-            // Close the content stream
-            contentStream.close();
-        }
-        return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "")  + "_watermarked.pdf");
-    }
-    
-    
-    
-    
-    @PostMapping("/remove-watermark")
-    public ResponseEntity<byte[]> removeWatermark(@RequestParam("fileInput") MultipartFile pdfFile, @RequestParam("watermarkText") String watermarkText) throws Exception {
-        
-        // Load the input PDF
-        PDDocument document = PDDocument.load(pdfFile.getInputStream());
-
-     // Create a new PDF document for the output
-        PDDocument outputDocument = new PDDocument();
-
-        // Loop through the pages
-        int numPages = document.getNumberOfPages();
-        for (int i = 0; i < numPages; i++) {
-            PDPage page = document.getPage(i);
-
-            // Process the content stream to remove the watermark text
-            WatermarkRemover editor = new WatermarkRemover(watermarkText) {};
-            editor.processPage(page);
-            editor.processPage(page);
-            // Add the page to the output document
-            outputDocument.addPage(page);
-        }
-
-        for (PDPage page : outputDocument.getPages()) {
-            List<PDAnnotation> annotations = page.getAnnotations();
-            List<PDAnnotation> annotationsToRemove = new ArrayList<>();
-
-            for (PDAnnotation annotation : annotations) {
-                if (annotation instanceof PDAnnotationMarkup) {
-                    PDAnnotationMarkup markup = (PDAnnotationMarkup) annotation;
-                    String contents = markup.getContents();
-                    if (contents != null && contents.contains(watermarkText)) {
-                        annotationsToRemove.add(markup);
-                    }
-                }
-            }
-
-            annotations.removeAll(annotationsToRemove);
-        }
-        PDDocumentCatalog catalog = outputDocument.getDocumentCatalog();
-        PDAcroForm acroForm = catalog.getAcroForm();
-        if (acroForm != null) {
-            List<PDField> fields = acroForm.getFields();
-            for (PDField field : fields) {
-                String fieldValue = field.getValueAsString();
-                if (fieldValue.contains(watermarkText)) {
-                    field.setValue(fieldValue.replace(watermarkText, ""));
-                }
-            }
-        }
-        
-        return PdfUtils.pdfDocToWebResponse(outputDocument, "removed.pdf");
-    }
-
-    
-}

src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java

@@ -0,0 +1,86 @@
+package stirling.software.SPDF.controller.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import io.swagger.v3.oas.annotations.Hidden;
+
+@Controller
+public class ConverterWebController {
+
+    @GetMapping("/img-to-pdf")
+    @Hidden
+    public String convertImgToPdfForm(Model model) {
+        model.addAttribute("currentPage", "img-to-pdf");
+        return "convert/img-to-pdf";
+    }
+
+
+    @GetMapping("/pdf-to-img")
+    @Hidden
+    public String pdfToimgForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-img");
+        return "convert/pdf-to-img";
+    }
+    
+    @GetMapping("/file-to-pdf")
+    @Hidden
+    public String convertToPdfForm(Model model) {
+        model.addAttribute("currentPage", "file-to-pdf");
+        return "convert/file-to-pdf";
+    }
+    
+
+    
+    //PDF TO......
+    
+    @GetMapping("/pdf-to-html")
+    @Hidden
+    public ModelAndView pdfToHTML() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-html");
+        modelAndView.addObject("currentPage", "pdf-to-html");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-presentation")
+    @Hidden
+    public ModelAndView pdfToPresentation() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-presentation");
+        modelAndView.addObject("currentPage", "pdf-to-presentation");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-text")
+    @Hidden
+    public ModelAndView pdfToText() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-text");
+        modelAndView.addObject("currentPage", "pdf-to-text");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-word")
+    @Hidden
+    public ModelAndView pdfToWord() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-word");
+        modelAndView.addObject("currentPage", "pdf-to-word");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-xml")
+    @Hidden
+    public ModelAndView pdfToXML() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-xml");
+        modelAndView.addObject("currentPage", "pdf-to-xml");
+        return modelAndView;
+    }
+
+
+    @GetMapping("/pdf-to-pdfa")
+    @Hidden
+    public String pdfToPdfAForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-pdfa");
+        return "convert/pdf-to-pdfa";
+    }
+}

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -0,0 +1,95 @@
+package stirling.software.SPDF.controller.web;
+
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import io.swagger.v3.oas.annotations.Hidden;
+
+@Controller
+public class GeneralWebController {
+    @GetMapping("/merge-pdfs")
+    @Hidden
+    public String mergePdfForm(Model model) {
+        model.addAttribute("currentPage", "merge-pdfs");
+        return "merge-pdfs";
+    }
+    @GetMapping("/about")
+    @Hidden
+    public String gameForm(Model model) {
+        model.addAttribute("currentPage", "about");
+        return "about";
+    }
+    
+    @GetMapping("/multi-tool")
+    @Hidden
+    public String multiToolForm(Model model) {
+        model.addAttribute("currentPage", "multi-tool");
+        return "multi-tool";
+    }
+    
+    @GetMapping("/")
+    public String home(Model model) {
+        model.addAttribute("currentPage", "home");
+        return "home";
+    }
+
+    @GetMapping("/home")
+    public String root(Model model) {
+        return "redirect:/";
+    }
+    
+    @GetMapping("/remove-pages")
+    @Hidden
+    public String pageDeleter(Model model) {
+        model.addAttribute("currentPage", "remove-pages");
+        return "remove-pages";
+    }
+    
+    @GetMapping("/pdf-organizer")
+    @Hidden
+    public String pageOrganizer(Model model) {
+        model.addAttribute("currentPage", "pdf-organizer");
+        return "pdf-organizer";
+    }
+    
+    @GetMapping("/rotate-pdf")
+    @Hidden
+    public String rotatePdfForm(Model model) {
+        model.addAttribute("currentPage", "rotate-pdf");
+        return "rotate-pdf";
+    }
+    
+    @GetMapping("/split-pdfs")
+    @Hidden
+    public String splitPdfForm(Model model) {
+        model.addAttribute("currentPage", "split-pdfs");
+        return "split-pdfs";
+    }
+    
+    @GetMapping("/sign")
+    @Hidden
+    public String signForm(Model model) {
+        model.addAttribute("currentPage", "sign");
+        return "sign";
+    }
+
+    @GetMapping(value = "/robots.txt", produces = MediaType.TEXT_PLAIN_VALUE)
+    @ResponseBody
+    @Hidden
+    public String getRobotsTxt() {
+        String allowGoogleVisibility = System.getProperty("ALLOW_GOOGLE_VISABILITY");
+        if (allowGoogleVisibility == null)
+            allowGoogleVisibility = System.getenv("ALLOW_GOOGLE_VISABILITY");
+        if (allowGoogleVisibility == null)
+            allowGoogleVisibility = "false";
+        if (Boolean.parseBoolean(allowGoogleVisibility)) {
+            return "User-agent: Googlebot\nAllow: /\n\nUser-agent: *\nAllow: /";
+        } else {
+            return "User-agent: Googlebot\nDisallow: /\n\nUser-agent: *\nDisallow: /";
+        }
+    }
+    
+}

src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java

@@ -0,0 +1,111 @@
+package stirling.software.SPDF.controller.web;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import io.swagger.v3.oas.annotations.Hidden;
+
+@Controller
+public class OtherWebController {
+    @GetMapping("/compress-pdf")
+    @Hidden
+    public String compressPdfForm(Model model) {
+        model.addAttribute("currentPage", "compress-pdf");
+        return "other/compress-pdf";
+    }
+    
+    @GetMapping("/extract-image-scans")
+    @Hidden
+    public ModelAndView extractImageScansForm() {
+        ModelAndView modelAndView = new ModelAndView("other/extract-image-scans");
+        modelAndView.addObject("currentPage", "extract-image-scans");
+        return modelAndView;
+    }
+
+    @GetMapping("/extract-images")
+    @Hidden
+    public String extractImagesForm(Model model) {
+        model.addAttribute("currentPage", "extract-images");
+        return "other/extract-images";
+    }
+    
+    @GetMapping("/flatten")
+    @Hidden
+    public String flattenForm(Model model) {
+        model.addAttribute("currentPage", "flatten");
+        return "other/flatten";
+    }
+    
+    
+
+    @GetMapping("/change-metadata")
+    @Hidden
+    public String addWatermarkForm(Model model) {
+        model.addAttribute("currentPage", "change-metadata");
+        return "other/change-metadata";
+    }
+    
+    @GetMapping("/compare")
+    @Hidden
+    public String compareForm(Model model) {
+        model.addAttribute("currentPage", "compare");
+        return "other/compare";
+    }
+    
+    public List<String> getAvailableTesseractLanguages() {
+        String tessdataDir = "/usr/share/tesseract-ocr/4.00/tessdata";
+        File[] files = new File(tessdataDir).listFiles();
+        if (files == null) {
+            return Collections.emptyList();
+        }
+        return Arrays.stream(files).filter(file -> file.getName().endsWith(".traineddata")).map(file -> file.getName().replace(".traineddata", ""))
+                .filter(lang -> !lang.equalsIgnoreCase("osd")).collect(Collectors.toList());
+    }
+
+    @GetMapping("/ocr-pdf")
+    @Hidden
+    public ModelAndView ocrPdfPage() {
+        ModelAndView modelAndView = new ModelAndView("other/ocr-pdf");
+        modelAndView.addObject("languages", getAvailableTesseractLanguages());
+        modelAndView.addObject("currentPage", "ocr-pdf");
+        return modelAndView;
+    }
+    
+
+    @GetMapping("/add-image")
+    @Hidden
+    public String overlayImage(Model model) {
+        model.addAttribute("currentPage", "add-image");
+        return "other/add-image";
+    }
+    
+    @GetMapping("/adjust-contrast")
+    @Hidden
+    public String contrast(Model model) {
+        model.addAttribute("currentPage", "adjust-contrast");
+        return "other/adjust-contrast";
+    }
+    
+    @GetMapping("/repair")
+    @Hidden
+    public String repairForm(Model model) {
+        model.addAttribute("currentPage", "repair");
+        return "other/repair";
+    }
+    
+    @GetMapping("/remove-blanks")
+    @Hidden
+    public String removeBlanksForm(Model model) {
+        model.addAttribute("currentPage", "remove-blanks");
+        return "other/remove-blanks";
+    }
+    
+}

src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java

@@ -0,0 +1,37 @@
+package stirling.software.SPDF.controller.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import io.swagger.v3.oas.annotations.Hidden;
+
+@Controller
+public class SecurityWebController {
+    @GetMapping("/add-password")
+    @Hidden
+    public String addPasswordForm(Model model) {
+        model.addAttribute("currentPage", "add-password");
+        return "security/add-password";
+    }
+    @GetMapping("/change-permissions")
+    @Hidden
+    public String permissionsForm(Model model) {
+        model.addAttribute("currentPage", "change-permissions");
+        return "security/change-permissions";
+    }
+
+    @GetMapping("/remove-password")
+    @Hidden
+    public String removePasswordForm(Model model) {
+        model.addAttribute("currentPage", "remove-password");
+        return "security/remove-password";
+    }
+
+    @GetMapping("/add-watermark")
+    @Hidden
+    public String addWatermarkForm(Model model) {
+        model.addAttribute("currentPage", "add-watermark");
+        return "security/add-watermark";
+    }
+}

src/main/java/stirling/software/SPDF/utils/ErrorUtils.java

@@ -28,5 +28,5 @@ public class ErrorUtils {
         modelAndView.addObject("stackTrace", stackTrace);
         return modelAndView;
     }
-    
+
 }

src/main/java/stirling/software/SPDF/utils/ImageFinder.java

@@ -0,0 +1,130 @@
+package stirling.software.SPDF.utils;
+
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.graphics.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImage;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+
+public class ImageFinder extends org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine {
+    private boolean hasImages = false;
+
+    public ImageFinder(PDPage page) {
+        super(page);
+    }
+
+    public boolean hasImages() {
+        return hasImages;
+    }
+
+    @Override
+    protected void processOperator(Operator operator, List<COSBase> operands) throws IOException {
+        String operation = operator.getName();
+        if (operation.equals(OperatorName.DRAW_OBJECT)) {
+            COSBase base = operands.get(0);
+            if (base instanceof COSName) {
+                COSName objectName = (COSName) base;
+                PDXObject xobject = getResources().getXObject(objectName);
+                if (xobject instanceof PDImageXObject) {
+                    hasImages = true;
+                } else if (xobject instanceof PDFormXObject) {
+                    PDFormXObject form = (PDFormXObject) xobject;
+                    ImageFinder innerFinder = new ImageFinder(getPage());
+                    innerFinder.processPage(getPage());
+                    if (innerFinder.hasImages()) {
+                        hasImages = true;
+                    }
+                }
+            }
+        }
+        super.processOperator(operator, operands);
+    }
+
+	@Override
+	public void appendRectangle(Point2D p0, Point2D p1, Point2D p2, Point2D p3) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void drawImage(PDImage pdImage) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void clip(int windingRule) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void moveTo(float x, float y) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void lineTo(float x, float y) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Point2D getCurrentPoint() throws IOException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void closePath() throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void endPath() throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void strokePath() throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void fillPath(int windingRule) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void fillAndStrokePath(int windingRule) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void shadingFill(COSName shadingName) throws IOException {
+		// TODO Auto-generated method stub
+		
+	}
+
+    // ... rest of the overridden methods
+}

src/main/java/stirling/software/SPDF/utils/PDFToFile.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.utils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -14,14 +15,13 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
+
 public class PDFToFile {
-    public ResponseEntity<byte[]> processPdfToOfficeFormat(MultipartFile inputFile, String outputFormat, String libreOfficeFilter)
-            throws IOException, InterruptedException {
+    public ResponseEntity<byte[]> processPdfToOfficeFormat(MultipartFile inputFile, String outputFormat, String libreOfficeFilter) throws IOException, InterruptedException {
 
         if (!"application/pdf".equals(inputFile.getContentType())) {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@@ -32,16 +32,15 @@ public class PDFToFile {
         String pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
 
         // Validate output format
-        List<String> allowedFormats = Arrays.asList("doc", "docx", "odt", "ppt", "pptx", "odp", "rtf", "html","xml","txt:Text");
+        List<String> allowedFormats = Arrays.asList("doc", "docx", "odt", "ppt", "pptx", "odp", "rtf", "html", "xml", "txt:Text");
         if (!allowedFormats.contains(outputFormat)) {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
-        
+
         Path tempInputFile = null;
         Path tempOutputDir = null;
         byte[] fileBytes;
-        // Prepare response
-        HttpHeaders headers = new HttpHeaders();
+        String fileName = "temp.file";
 
         try {
             // Save the uploaded file to a temporary location
@@ -52,9 +51,8 @@ public class PDFToFile {
             tempOutputDir = Files.createTempDirectory("output_");
 
             // Run the LibreOffice command
-            List<String> command = new ArrayList<>(Arrays.asList(
-                    "soffice", "--infilter=" + libreOfficeFilter, "--convert-to", outputFormat, "--outdir", tempOutputDir.toString(), tempInputFile.toString()
-            ));
+            List<String> command = new ArrayList<>(
+                    Arrays.asList("soffice", "--infilter=" + libreOfficeFilter, "--convert-to", outputFormat, "--outdir", tempOutputDir.toString(), tempInputFile.toString()));
             int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
 
             // Get output files
@@ -63,16 +61,14 @@ public class PDFToFile {
             if (outputFiles.size() == 1) {
                 // Return single output file
                 File outputFile = outputFiles.get(0);
-                headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-                if(outputFormat.equals("txt:Text")) {
-                    outputFormat="txt";
+                if (outputFormat.equals("txt:Text")) {
+                    outputFormat = "txt";
                 }
-                headers.setContentDispositionFormData("attachment", pdfBaseName + "." + outputFormat);
+                fileName = pdfBaseName + "." + outputFormat;
                 fileBytes = FileUtils.readFileToByteArray(outputFile);
             } else {
                 // Return output files in a ZIP archive
-                headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-                headers.setContentDispositionFormData("attachment", pdfBaseName + "To" + outputFormat + ".zip");
+                fileName = pdfBaseName + "To" + outputFormat + ".zip";
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
                 ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream);
 
@@ -96,6 +92,6 @@ public class PDFToFile {
             if (tempOutputDir != null)
                 FileUtils.deleteDirectory(tempOutputDir.toFile());
         }
-        return new ResponseEntity<>(fileBytes, headers, HttpStatus.OK);
+        return PdfUtils.bytesToWebResponse(fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
     }
 }

src/main/java/stirling/software/SPDF/utils/PdfUtils.java

@@ -2,13 +2,23 @@ package stirling.software.SPDF.utils;
 
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ColorConvertOp;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -16,10 +26,13 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
@@ -31,114 +44,34 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.InputStream;
-import java.security.KeyPair;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-
 public class PdfUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(PdfUtils.class);
 
-    public static byte[] imageToPdf(MultipartFile[] files, boolean stretchToFit, boolean autoRotate) throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            for (MultipartFile file : files) {
-                // Create a temporary file for the image
-                File imageFile = Files.createTempFile("image", ".jpg").toFile();
-
-                try (FileOutputStream fos = new FileOutputStream(imageFile); InputStream input = file.getInputStream()) {
-                    byte[] buffer = new byte[1024];
-                    int len;
-                    // Read from the input stream and write to the file
-                    while ((len = input.read(buffer)) != -1) {
-                        fos.write(buffer, 0, len);
-                    }
-                    logger.info("Image successfully written to file: {}", imageFile.getAbsolutePath());
-                } catch (IOException e) {
-                    logger.error("Error writing image to file: {}", imageFile.getAbsolutePath(), e);
-                    throw e;
-                }
-
-                // Create a new PDF page
-                PDPage page = new PDPage();
-                doc.addPage(page);
-
-                // Create an image object from the image file
-                PDImageXObject image = PDImageXObject.createFromFileByContent(imageFile, doc);
-
-                float pageWidth = page.getMediaBox().getWidth();
-                float pageHeight = page.getMediaBox().getHeight();
-
-                if (autoRotate && ((image.getWidth() > image.getHeight() && pageHeight > pageWidth) || (image.getWidth() < image.getHeight() && pageWidth > pageHeight))) {
-                    // Rotate the page 90 degrees if the image better fits the page in landscape orientation
-                    page.setRotation(90);
-                    pageWidth = page.getMediaBox().getHeight();
-                    pageHeight = page.getMediaBox().getWidth();
-                }
-
-                try (PDPageContentStream contentStream = new PDPageContentStream(doc, page)) {
-                    if (stretchToFit) {
-                        if (page.getRotation() == 0 || page.getRotation() == 180) {
-                            // Stretch the image to fit the whole page
-                            contentStream.drawImage(image, 0, 0, pageWidth, pageHeight);
-                        } else {
-                            // Adjust the width and height of the page when rotated
-                            contentStream.drawImage(image, 0, 0, pageHeight, pageWidth);
-                        }
-                        logger.info("Image successfully added to PDF, stretched to fit page");
-                    } else {
-                        // Ensure the image fits the page but maintain the image's aspect ratio
-                        float imageAspectRatio = (float) image.getWidth() / (float) image.getHeight();
-                        float pageAspectRatio = pageWidth / pageHeight;
-
-                        // Determine the scale factor to fit the image onto the page
-                        float scaleFactor = 1.0f;
-                        if (imageAspectRatio > pageAspectRatio) {
-                            // Image is wider than the page, scale to fit the width
-                            scaleFactor = pageWidth / image.getWidth();
-                        } else {
-                            // Image is taller than the page, scale to fit the height
-                            scaleFactor = pageHeight / image.getHeight();
-                        }
-
-                        // Calculate the position of the image on the page
-                        float xPos = (pageWidth - (image.getWidth() * scaleFactor)) / 2;
-                        float yPos = (pageHeight - (image.getHeight() * scaleFactor)) / 2;
-
-                        // Draw the image onto the page
-                        if (page.getRotation() == 0 || page.getRotation() == 180) {
-                            contentStream.drawImage(image, xPos, yPos, image.getWidth() * scaleFactor, image.getHeight() * scaleFactor);
-                        } else {
-                            // Adjust the width and height of the page when rotated
-                            contentStream.drawImage(image, yPos, xPos, image.getHeight() * scaleFactor, image.getWidth() * scaleFactor);
-                        }
-                        logger.info("Image successfully added to PDF, maintaining aspect ratio");
-                    }
-                } catch (IOException e) {
-                    logger.error("Error adding image to PDF", e);
-                    throw e;
-                }
-
-                // Delete the temporary file
-                imageFile.delete();
-            }
-
-            // Create a ByteArrayOutputStream to save the PDF to
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            doc.save(byteArrayOutputStream);
-            logger.info("PDF successfully saved to byte array");
-
-            return byteArrayOutputStream.toByteArray();
-        }
-
+    public static ResponseEntity<byte[]> boasToWebResponse(ByteArrayOutputStream baos, String docName) throws IOException {
+        return PdfUtils.bytesToWebResponse(baos.toByteArray(), docName);
     }
 
+    public static ResponseEntity<byte[]> boasToWebResponse(ByteArrayOutputStream baos, String docName, MediaType mediaType) throws IOException {
+        return PdfUtils.bytesToWebResponse(baos.toByteArray(), docName, mediaType);
+    }
 
-    public static byte[] convertFromPdf(byte[] inputStream, String imageType, ImageType colorType, boolean singleImage, int DPI)
-            throws IOException, Exception {
+    public static ResponseEntity<byte[]> bytesToWebResponse(byte[] bytes, String docName, MediaType mediaType) throws IOException {
+
+        // Return the PDF as a response
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(mediaType);
+        headers.setContentLength(bytes.length);
+        String encodedDocName = URLEncoder.encode(docName, StandardCharsets.UTF_8.toString()).replaceAll("\\+", "%20");
+        headers.setContentDispositionFormData("attachment", encodedDocName);
+        return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
+    }
+
+    public static ResponseEntity<byte[]> bytesToWebResponse(byte[] bytes, String docName) throws IOException {
+        return bytesToWebResponse(bytes, docName, MediaType.APPLICATION_PDF);
+    }
+
+    public static byte[] convertFromPdf(byte[] inputStream, String imageType, ImageType colorType, boolean singleImage, int DPI) throws IOException, Exception {
         try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputStream))) {
             PDFRenderer pdfRenderer = new PDFRenderer(document);
             int pageCount = document.getNumberOfPages();
@@ -148,7 +81,7 @@ public class PdfUtils {
             for (int i = 0; i < pageCount; i++) {
                 images.add(pdfRenderer.renderImageWithDPI(i, 300, colorType));
             }
-            
+
             if (singleImage) {
                 // Combine all images into a single big image
                 BufferedImage combined = new BufferedImage(images.get(0).getWidth(), images.get(0).getHeight() * pageCount, BufferedImage.TYPE_INT_RGB);
@@ -191,68 +124,116 @@ public class PdfUtils {
             throw e;
         }
     }
-
-    public static byte[] overlayImage(byte[] pdfBytes, byte[] imageBytes, float x, float y, boolean everyPage) throws IOException {
-
-            PDDocument document = PDDocument.load(new ByteArrayInputStream(pdfBytes));
-
-            // Get the first page of the PDF
-            int pages = document.getNumberOfPages();
-            for (int i = 0; i < pages; i++) {
-                PDPage page = document.getPage(i);
-                try (PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true)) {
-                    // Create an image object from the image bytes
-                    PDImageXObject image = PDImageXObject.createFromByteArray(document, imageBytes, "");
-                    // Draw the image onto the page at the specified x and y coordinates
-                    contentStream.drawImage(image, x, y);
-                    logger.info("Image successfully overlayed onto PDF");
-                    if (everyPage == false && i == 0) {
-                        break;
+    public static byte[] imageToPdf(MultipartFile[] files, boolean stretchToFit, boolean autoRotate, String colorType) throws IOException {
+        try (PDDocument doc = new PDDocument()) {
+            for (MultipartFile file : files) {
+                String originalFilename = file.getOriginalFilename();
+                if (originalFilename != null && (originalFilename.toLowerCase().endsWith(".tiff") || originalFilename.toLowerCase().endsWith(".tif")) ) {
+                    ImageReader reader = ImageIO.getImageReadersByFormatName("tiff").next();
+                    reader.setInput(ImageIO.createImageInputStream(file.getInputStream()));
+                    int numPages = reader.getNumImages(true);
+                    for (int i = 0; i < numPages; i++) {
+                        BufferedImage pageImage = reader.read(i);
+                        BufferedImage convertedImage = convertColorType(pageImage, colorType);
+                        PDImageXObject pdImage = LosslessFactory.createFromImage(doc, convertedImage);
+                        addImageToDocument(doc, pdImage, stretchToFit, autoRotate);
                     }
-                } catch (IOException e) {
-                    // Log an error message if there is an issue overlaying the image onto the PDF
-                    logger.error("Error overlaying image onto PDF", e);
-                    throw e;
+                } else {
+                    File imageFile = Files.createTempFile("image", ".png").toFile();
+                    try (FileOutputStream fos = new FileOutputStream(imageFile); InputStream input = file.getInputStream()) {
+                        byte[] buffer = new byte[1024];
+                        int len;
+                        while ((len = input.read(buffer)) != -1) {
+                            fos.write(buffer, 0, len);
+                        }
+                        BufferedImage image = ImageIO.read(imageFile);
+                        BufferedImage convertedImage = convertColorType(image, colorType);
+                        PDImageXObject pdImage = LosslessFactory.createFromImage(doc, convertedImage);
+                        addImageToDocument(doc, pdImage, stretchToFit, autoRotate);
+                    } catch (IOException e) {
+                        logger.error("Error writing image to file: {}", imageFile.getAbsolutePath(), e);
+                        throw e;
+                    } finally {
+                        imageFile.delete();
+                    }
+                }
+            }
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            doc.save(byteArrayOutputStream);
+            logger.info("PDF successfully saved to byte array");
+            return byteArrayOutputStream.toByteArray();
+        }
+    }
+
+    private static BufferedImage convertColorType(BufferedImage sourceImage, String colorType) {
+        BufferedImage convertedImage;
+        switch (colorType) {
+            case "greyscale":
+                convertedImage = new BufferedImage(sourceImage.getWidth(), sourceImage.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
+                convertedImage.getGraphics().drawImage(sourceImage, 0, 0, null);
+                break;
+            case "blackwhite":
+                convertedImage = new BufferedImage(sourceImage.getWidth(), sourceImage.getHeight(), BufferedImage.TYPE_BYTE_BINARY);
+                convertedImage.getGraphics().drawImage(sourceImage, 0, 0, null);
+                break;
+            default:  // full color
+                convertedImage = sourceImage;
+                break;
+        }
+        return convertedImage;
+    }
+    
+    private static void addImageToDocument(PDDocument doc, PDImageXObject image, boolean stretchToFit, boolean autoRotate) throws IOException {
+        boolean imageIsLandscape = image.getWidth() > image.getHeight();
+        PDRectangle pageSize = PDRectangle.A4;
+        if (autoRotate && imageIsLandscape) {
+            pageSize = new PDRectangle(pageSize.getHeight(), pageSize.getWidth());
+        }
+        PDPage page = new PDPage(pageSize);
+        doc.addPage(page);
+
+        float pageWidth = page.getMediaBox().getWidth();
+        float pageHeight = page.getMediaBox().getHeight();
+
+        try (PDPageContentStream contentStream = new PDPageContentStream(doc, page)) {
+            if (stretchToFit) {
+                contentStream.drawImage(image, 0, 0, pageWidth, pageHeight);
+            } else {
+                float imageAspectRatio = (float) image.getWidth() / (float) image.getHeight();
+                float pageAspectRatio = pageWidth / pageHeight;
+
+                float scaleFactor = 1.0f;
+                if (imageAspectRatio > pageAspectRatio) {
+                    scaleFactor = pageWidth / image.getWidth();
+                } else {
+                    scaleFactor = pageHeight / image.getHeight();
                 }
 
+                float xPos = (pageWidth - (image.getWidth() * scaleFactor)) / 2;
+                float yPos = (pageHeight - (image.getHeight() * scaleFactor)) / 2;
+                contentStream.drawImage(image, xPos, yPos, image.getWidth() * scaleFactor, image.getHeight() * scaleFactor);
             }
-        // Create a ByteArrayOutputStream to save the PDF to
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        document.save(baos);
-        logger.info("PDF successfully saved to byte array");
-        return baos.toByteArray();
+        } catch (IOException e) {
+            logger.error("Error adding image to PDF", e);
+            throw e;
+        }
+    }
+
+    public static X509Certificate[] loadCertificateChainFromKeystore(InputStream keystoreInputStream, String keystorePassword) throws Exception {
+        KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
+        keystore.load(keystoreInputStream, keystorePassword.toCharArray());
+
+        String alias = keystore.aliases().nextElement();
+        Certificate[] certChain = keystore.getCertificateChain(alias);
+        X509Certificate[] x509CertChain = new X509Certificate[certChain.length];
+
+        for (int i = 0; i < certChain.length; i++) {
+            x509CertChain[i] = (X509Certificate) certChain[i];
         }
 
-
-  
-
-    public static ResponseEntity<byte[]> pdfDocToWebResponse(PDDocument document, String docName) throws IOException {
-
-        // Open Byte Array and save document to it
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        document.save(baos);
-        // Close the document
-        document.close();
-
-        return PdfUtils.boasToWebResponse(baos, docName);
+        return x509CertChain;
     }
 
-    public static ResponseEntity<byte[]> boasToWebResponse(ByteArrayOutputStream baos, String docName) throws IOException {
-        return PdfUtils.bytesToWebResponse(baos.toByteArray(), docName);
-
-    }
-
-    public static ResponseEntity<byte[]> bytesToWebResponse(byte[] bytes, String docName) throws IOException {
-
-        // Return the PDF as a response
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_PDF);
-        headers.setContentLength(bytes.length);
-        headers.setContentDispositionFormData("attachment", docName);
-        return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
-    }
-    
-    
     public static KeyPair loadKeyPairFromKeystore(InputStream keystoreInputStream, String keystorePassword) throws Exception {
         KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
         keystore.load(keystoreInputStream, keystorePassword.toCharArray());
@@ -265,18 +246,45 @@ public class PdfUtils {
         return new KeyPair(publicKey, privateKey);
     }
 
-    public static X509Certificate[] loadCertificateChainFromKeystore(InputStream keystoreInputStream, String keystorePassword) throws Exception {
-        KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
-        keystore.load(keystoreInputStream, keystorePassword.toCharArray());
+    public static byte[] overlayImage(byte[] pdfBytes, byte[] imageBytes, float x, float y, boolean everyPage) throws IOException {
+
+        PDDocument document = PDDocument.load(new ByteArrayInputStream(pdfBytes));
+
+        // Get the first page of the PDF
+        int pages = document.getNumberOfPages();
+        for (int i = 0; i < pages; i++) {
+            PDPage page = document.getPage(i);
+            try (PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true)) {
+                // Create an image object from the image bytes
+                PDImageXObject image = PDImageXObject.createFromByteArray(document, imageBytes, "");
+                // Draw the image onto the page at the specified x and y coordinates
+                contentStream.drawImage(image, x, y);
+                logger.info("Image successfully overlayed onto PDF");
+                if (!everyPage && i == 0) {
+                    break;
+                }
+            } catch (IOException e) {
+                // Log an error message if there is an issue overlaying the image onto the PDF
+                logger.error("Error overlaying image onto PDF", e);
+                throw e;
+            }
 
-        String alias = keystore.aliases().nextElement();
-        Certificate[] certChain = keystore.getCertificateChain(alias);
-        X509Certificate[] x509CertChain = new X509Certificate[certChain.length];
-        
-        for (int i = 0; i < certChain.length; i++) {
-            x509CertChain[i] = (X509Certificate) certChain[i];
         }
+        // Create a ByteArrayOutputStream to save the PDF to
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        document.save(baos);
+        logger.info("PDF successfully saved to byte array");
+        return baos.toByteArray();
+    }
 
-        return x509CertChain;
+    public static ResponseEntity<byte[]> pdfDocToWebResponse(PDDocument document, String docName) throws IOException {
+
+        // Open Byte Array and save document to it
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        document.save(baos);
+        // Close the document
+        document.close();
+
+        return PdfUtils.boasToWebResponse(baos, docName);
     }
 }

src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java

@@ -9,15 +9,26 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
+
 public class ProcessExecutor {
-	
-	public enum Processes {
-        LIBRE_OFFICE,
-        OCR_MY_PDF
+
+    public enum Processes {
+        LIBRE_OFFICE, OCR_MY_PDF, PYTHON_OPENCV, GHOSTSCRIPT
     }
 
-	private static final Map<Processes, ProcessExecutor> instances = new ConcurrentHashMap<>();
+    private static final Map<Processes, ProcessExecutor> instances = new ConcurrentHashMap<>();
 
+    public static ProcessExecutor getInstance(Processes processType) {
+        return instances.computeIfAbsent(processType, key -> {
+            int semaphoreLimit = switch (key) {
+            case LIBRE_OFFICE -> 1;
+            case OCR_MY_PDF -> 2;
+            case PYTHON_OPENCV -> 8;
+            case GHOSTSCRIPT -> 16;
+            };
+            return new ProcessExecutor(semaphoreLimit);
+        });
+    }
 
     private final Semaphore semaphore;
 
@@ -25,78 +36,67 @@ public class ProcessExecutor {
         this.semaphore = new Semaphore(semaphoreLimit);
     }
 
-    public static ProcessExecutor getInstance(Processes processType) {
-        return instances.computeIfAbsent(processType, key -> {
-            int semaphoreLimit = switch (key) {
-                case LIBRE_OFFICE -> 1; 
-                case OCR_MY_PDF -> 2; 
-            };
-            return new ProcessExecutor(semaphoreLimit);
-        });
+    public int runCommandWithOutputHandling(List<String> command) throws IOException, InterruptedException {
+        int exitCode = 1;
+        semaphore.acquire();
+        try {
+
+            System.out.print("Running command: " + String.join(" ", command));
+            ProcessBuilder processBuilder = new ProcessBuilder(command);
+            Process process = processBuilder.start();
+
+            // Read the error stream and standard output stream concurrently
+            List<String> errorLines = new ArrayList<>();
+            List<String> outputLines = new ArrayList<>();
+
+            Thread errorReaderThread = new Thread(() -> {
+                try (BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream(), StandardCharsets.UTF_8))) {
+                    String line;
+                    while ((line = errorReader.readLine()) != null) {
+                        errorLines.add(line);
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            });
+
+            Thread outputReaderThread = new Thread(() -> {
+                try (BufferedReader outputReader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))) {
+                    String line;
+                    while ((line = outputReader.readLine()) != null) {
+                        outputLines.add(line);
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            });
+
+            errorReaderThread.start();
+            outputReaderThread.start();
+
+            // Wait for the conversion process to complete
+            exitCode = process.waitFor();
+
+            // Wait for the reader threads to finish
+            errorReaderThread.join();
+            outputReaderThread.join();
+
+            if (outputLines.size() > 0) {
+                String outputMessage = String.join("\n", outputLines);
+                System.out.println("Command output:\n" + outputMessage);
+            }
+
+            if (errorLines.size() > 0) {
+                String errorMessage = String.join("\n", errorLines);
+                System.out.println("Command error output:\n" + errorMessage);
+                if (exitCode != 0) {
+                    throw new IOException("Command process failed with exit code " + exitCode + ". Error message: " + errorMessage);
+                }
+            }
+        } finally {
+            semaphore.release();
+        }
+        return exitCode;
     }
-    
-	public int runCommandWithOutputHandling(List<String> command) throws IOException, InterruptedException {
-		int exitCode = 1;
-		semaphore.acquire();
-		try {
-			
-		    System.out.print("Running command: " + String.join(" ", command));
-		    ProcessBuilder processBuilder = new ProcessBuilder(command);
-		    Process process = processBuilder.start();
-	
-		    // Read the error stream and standard output stream concurrently
-		    List<String> errorLines = new ArrayList<>();
-		    List<String> outputLines = new ArrayList<>();
-	
-		    Thread errorReaderThread = new Thread(() -> {
-		        try (BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream(), StandardCharsets.UTF_8))) {
-		            String line;
-		            while ((line = errorReader.readLine()) != null) {
-		                errorLines.add(line);
-		            }
-		        } catch (IOException e) {
-		            e.printStackTrace();
-		        }
-		    });
-	
-		    Thread outputReaderThread = new Thread(() -> {
-		        try (BufferedReader outputReader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))) {
-		            String line;
-		            while ((line = outputReader.readLine()) != null) {
-		                outputLines.add(line);
-		            }
-		        } catch (IOException e) {
-		            e.printStackTrace();
-		        }
-		    });
-	
-		    errorReaderThread.start();
-		    outputReaderThread.start();
-	
-		    // Wait for the conversion process to complete
-		    exitCode = process.waitFor();
-	
-		    // Wait for the reader threads to finish
-		    errorReaderThread.join();
-		    outputReaderThread.join();
-	
-		    if (outputLines.size() > 0) {
-		        String outputMessage = String.join("\n", outputLines);
-		        System.out.println("Command output:\n" + outputMessage);
-		    }
-	
-		    if (errorLines.size() > 0) {
-		        String errorMessage = String.join("\n", errorLines);
-		        System.out.println("Command error output:\n" + errorMessage);
-		        if (exitCode != 0) {
-		            throw new IOException("Command process failed with exit code " + exitCode + ". Error message: " + errorMessage);
-		        }
-		    }
-		} finally {
-			semaphore.release();
-		}
-	    return exitCode;
-	}
-   		
-	    		
+
 }

src/main/java/stirling/software/SPDF/utils/WatermarkRemover.java

@@ -1,69 +0,0 @@
-package stirling.software.SPDF.utils;
-import java.io.IOException;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.pdfbox.contentstream.PDFStreamEngine;
-import org.apache.pdfbox.contentstream.operator.Operator;
-import org.apache.pdfbox.cos.COSArray;
-import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSString;
-
-public class WatermarkRemover extends PDFStreamEngine {
-
-    private final String watermarkText;
-    private final Pattern pattern;
-
-    public WatermarkRemover(String watermarkText) {
-        this.watermarkText = watermarkText;
-        this.pattern = Pattern.compile(Pattern.quote(watermarkText));
-    }
-
-    @Override
-    protected void processOperator(Operator operator, List<COSBase> operands) throws IOException {
-        String operation = operator.getName();
-
-        boolean processText = false;
-        if ("Tj".equals(operation) || "TJ".equals(operation) || "'".equals(operation) || "\"".equals(operation)) {
-            processText = true;
-        }
-
-        if (processText) {
-            for(int j = 0 ; j < operands.size(); ++j) {
-                COSBase operand = operands.get(j);
-                if (operand instanceof COSString) {
-                    COSString cosString = (COSString) operand;
-                    String string = cosString.getString();
-                    Matcher matcher = pattern.matcher(string);
-                    if (matcher.find()) {
-                        string = matcher.replaceAll("");
-                        cosString.setValue(string.getBytes());
-                    }
-                } else if (operand instanceof COSArray) {
-                    COSArray array = (COSArray) operand;
-                    for (int i = 0; i < array.size(); i++) {
-                        COSBase item = array.get(i);
-                        if (item instanceof COSString) {
-                            COSString cosString = (COSString) item;
-                            String string = cosString.getString();
-                            Matcher matcher = pattern.matcher(string);
-                            if (matcher.find()) {
-                                System.out.println("operation =" + operation);
-                                System.out.println("1 =" + string);
-                                string = matcher.replaceAll("");
-                                cosString.setValue(string.getBytes());
-                                array.set(i, cosString);
-                                operands.set(j, array);
-                            }
-                            
-                        }
-                    }
-                }
-                
-
-            }
-        }
-        super.processOperator(operator, operands);
-    }
-}

src/main/resources/application.properties

@@ -17,8 +17,9 @@ server.error.include-exception=true
 server.error.include-message=always
 
 server.servlet.session.tracking-modes=cookie
+server.servlet.context-path=${APP_ROOT_PATH:/}
 
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
 
-spring.thymeleaf.encoding=UTF-8
+spring.thymeleaf.encoding=UTF-8

src/main/resources/messages_ar_AR.properties

@@ -21,6 +21,9 @@ false=\u062E\u0637\u0623
 unknown=\u063A\u064A\u0631 \u0645\u0639\u0631\u0648\u0641
 save=\u062D\u0641\u0638
 close=\u0625\u063A\u0644\u0627\u0642
+filesSelected = الملفات المحددة
+noFavourites = لم تتم إضافة أي مفضلات
+bored = الانتظار بالملل؟
 
 #############
 # HOME-PAGE #
@@ -31,10 +34,10 @@ navbar.convert=تحويل
 navbar.security=الأمان
 navbar.other=أخرى
 navbar.darkmode=الوضع الداكن
-navbar.pageOps = عمليات الصفحة
+navbar.pageOps=عمليات الصفحة
 
-home.multiTool.title = أداة متعددة PDF
-home.multiTool.desc = دمج الصفحات وتدويرها وإعادة ترتيبها وإزالتها
+home.multiTool.title=أداة متعددة PDF
+home.multiTool.desc=دمج الصفحات وتدويرها وإعادة ترتيبها وإزالتها
 
 home.merge.title=دمج ملفات
 home.merge.desc=دمج ملفات PDF متعددة في ملف واحد بسهولة.
@@ -91,24 +94,90 @@ home.ocr.desc=\u064A\u0642\u0648\u0645 \u0628\u0631\u0646\u0627\u0645\u062C \u06
 home.extractImages.title=\u0627\u0633\u062A\u062E\u0631\u0627\u062C \u0627\u0644\u0635\u0648\u0631
 home.extractImages.desc=\u064A\u0633\u062A\u062E\u0631\u062C \u062C\u0645\u064A\u0639 \u0627\u0644\u0635\u0648\u0631 \u0645\u0646 \u0645\u0644\u0641 PDF \u0648\u064A\u062D\u0641\u0638\u0647\u0627 \u0641\u064A \u0627\u0644\u0631\u0645\u0632 \u0627\u0644\u0628\u0631\u064A\u062F\u064A
 
-home.pdfToPDFA.title = \u062A\u062D\u0648\u064A\u0644 \u0645\u0644\u0641\u0627\u062A PDF \u0625\u0644\u0649 PDF / A
-home.pdfToPDFA.desc = \u062A\u062D\u0648\u064A\u0644 PDF \u0625\u0644\u0649 PDF / A \u0644\u0644\u062A\u062E\u0632\u064A\u0646 \u0637\u0648\u064A\u0644 \u0627\u0644\u0645\u062F\u0649
+home.pdfToPDFA.title=\u062A\u062D\u0648\u064A\u0644 \u0645\u0644\u0641\u0627\u062A PDF \u0625\u0644\u0649 PDF / A
+home.pdfToPDFA.desc=\u062A\u062D\u0648\u064A\u0644 PDF \u0625\u0644\u0649 PDF / A \u0644\u0644\u062A\u062E\u0632\u064A\u0646 \u0637\u0648\u064A\u0644 \u0627\u0644\u0645\u062F\u0649
 
 
-home.PDFToWord.title = تحويل PDF إلى Word
-home.PDFToWord.desc = تحويل PDF إلى تنسيقات Word (DOC و DOCX و ODT)
+home.PDFToWord.title=تحويل PDF إلى Word
+home.PDFToWord.desc=تحويل PDF إلى تنسيقات Word (DOC و DOCX و ODT)
 
-home.PDFToPresentation.title = PDF للعرض التقديمي
-home.PDFToPresentation.desc = تحويل PDF إلى تنسيقات عرض تقديمي (PPT و PPTX و ODP)
+home.PDFToPresentation.title=PDF للعرض التقديمي
+home.PDFToPresentation.desc=تحويل PDF إلى تنسيقات عرض تقديمي (PPT و PPTX و ODP)
 
-home.PDFToText.title = تحويل PDF إلى نص / RTF
-home.PDFToText.desc = تحويل PDF إلى تنسيق نص أو RTF
+home.PDFToText.title=تحويل PDF إلى نص / RTF
+home.PDFToText.desc=تحويل PDF إلى تنسيق نص أو RTF
 
-home.PDFToHTML.title = تحويل PDF إلى HTML
-home.PDFToHTML.desc = تحويل PDF إلى تنسيق HTML
+home.PDFToHTML.title=تحويل PDF إلى HTML
+home.PDFToHTML.desc=تحويل PDF إلى تنسيق HTML
+
+home.PDFToXML.title=تحويل PDF إلى XML
+home.PDFToXML.desc=تحويل PDF إلى تنسيق XML
+
+
+home.ScannerImageSplit.title=كشف / انقسام الصور الممسوحة ضوئيًا
+home.ScannerImageSplit.desc=تقسيم عدة صور من داخل صورة / ملف PDF
+
+home.sign.title = تسجيل الدخول
+home.sign.desc = إضافة التوقيع إلى PDF عن طريق الرسم أو النص أو الصورة
+
+home.flatten.title = تسطيح
+home.flatten.desc = قم بإزالة كافة العناصر والنماذج التفاعلية من ملف PDF
+
+home.repair.title = إصلاح
+home.repair.desc = يحاول إصلاح ملف PDF تالف / معطل
+
+home.removeBlanks.title = إزالة الصفحات الفارغة
+home.removeBlanks.desc = يكتشف ويزيل الصفحات الفارغة من المستند
+
+home.compare.title = قارن
+home.compare.desc = يقارن ويظهر الاختلافات بين 2 من مستندات PDF
+
+downloadPdf = تنزيل PDF
+text=نص
+font=الخط
+
+removeBlanks.title = إزالة الفراغات
+removeBlanks.header = إزالة الصفحات الفارغة
+removeBlanks.threshold = العتبة:
+removeBlanks.thresholdDesc = الحد الفاصل لتحديد مدى بياض البكسل الأبيض
+removeBlanks.whitePercent = نسبة الأبيض (٪):
+removeBlanks.whitePercentDesc = النسبة المئوية للصفحة التي يجب أن تكون بيضاء لتتم إزالتها
+removeBlanks.submit = إزالة الفراغات
+
+compare.title=يقارن
+compare.header=قارن ملفات PDF
+compare.document.1=المستند 1
+compare.document.2=المستند 2
+compare.submit=يقارن
+
+sign.title = تسجيل الدخول
+sign.header = توقيع ملفات PDF
+sign.upload = تحميل الصورة
+sign.draw = رسم التوقيع
+Sign.text = إدخال النص
+
+sign.clear=واضح
+sign.add = إضافة
+
+repair.title = إصلاح
+repair.header = إصلاح ملفات PDF
+repair.submit = الإصلاح
+
+flatten.title = تسطيح
+flatten.header = تسوية ملفات PDF
+flatten.submit = تسطيح
+
+ScannerImageSplit.selectText.1=عتبة الزاوية:
+ScannerImageSplit.selectText.2=تعيين الحد الأدنى للزاوية المطلقة المطلوبة لتدوير الصورة (افتراضي: 10).
+ScannerImageSplit.selectText.3=التسامح:
+ScannerImageSplit.selectText.4=يحدد نطاق تباين اللون حول لون الخلفية المقدر (الافتراضي: 30).
+ScannerImageSplit.selectText.5=أدنى مساحة:
+ScannerImageSplit.selectText.6=تعيين الحد الأدنى لمنطقة الصورة (الافتراضي: 10000).
+ScannerImageSplit.selectText.7=الحد الأدنى لمنطقة المحيط:
+ScannerImageSplit.selectText.8=تعيين الحد الأدنى لمنطقة المحيط للصورة
+ScannerImageSplit.selectText.9=حجم الحدود:
+ScannerImageSplit.selectText.10=يضبط حجم الحدود المضافة والمزالة لمنع الحدود البيضاء في الإخراج (الافتراضي: 1).
 
-home.PDFToXML.title = تحويل PDF إلى XML
-home.PDFToXML.desc = تحويل PDF إلى تنسيق XML
 
 navbar.settings=\u0625\u0639\u062F\u0627\u062F\u0627\u062A
 settings.title=\u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A
@@ -133,6 +202,8 @@ ocr.selectText.7=\u0641\u0631\u0636 \u0627\u0644\u062A\u0639\u0631\u0641 \u0627\
 ocr.selectText.8=\u0639\u0627\u062F\u064A (\u062E\u0637\u0623 \u0625\u0630\u0627 \u0643\u0627\u0646 PDF \u064A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0646\u0635)
 ocr.selectText.9=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0625\u0636\u0627\u0641\u064A\u0629
 ocr.selectText.10=\u0648\u0636\u0639 \u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u062D\u0631\u0648\u0641
+ocr.selectText.11 = إزالة الصور بعد التعرف الضوئي على الحروف (يزيل كل الصور ، يكون مفيدًا فقط إذا كان جزءًا من خطوة التحويل)
+ocr.selectText.12 = نوع العرض (متقدم)
 ocr.help=\u064A\u0631\u062C\u0649 \u0642\u0631\u0627\u0621\u0629 \u0647\u0630\u0647 \u0627\u0644\u0648\u062B\u0627\u0626\u0642 \u062D\u0648\u0644 \u0643\u064A\u0641\u064A\u0629 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0647\u0630\u0627 \u0644\u0644\u063A\u0627\u062A \u0623\u062E\u0631\u0649 \u0648 / \u0623\u0648 \u0627\u0644\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0644\u064A\u0633 \u0641\u064A \u0639\u0627\u0645\u0644 \u0627\u0644\u0625\u0631\u0633\u0627\u0621
 ocr.credit=\u062A\u0633\u062A\u062E\u062F\u0645 \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 OCRmyPDF \u0648 Tesseract \u0644 OCR.
 ocr.submit=\u0645\u0639\u0627\u0644\u062C\u0629 PDF \u0628\u0627\u0633\u062A\u062E\u062F\u0627\u0645 OCR
@@ -153,7 +224,7 @@ fileToPDF.submit=\u062A\u062D\u0648\u064A\u0644 \u0625\u0644\u0649 PDF
 
 #Add image
 addImage.title=إضافة صورة
-addImage.header=إضافة صورة إلى PDF (العمل قيد التقدم)
+addImage.header=إضافة صورة إلى PDF
 addImage.everyPage=كل صفحة؟
 addImage.submit=إضافة صورة
 
@@ -182,8 +253,8 @@ pdfOrganiser.header=منظم صفحات PDF
 pdfOrganiser.submit=إعادة ترتيب الصفحات
 
 #multiTool
-multiTool.title = أداة متعددة PDF
-multiTool.header = أداة متعددة PDF
+multiTool.title=أداة متعددة PDF
+multiTool.header=أداة متعددة PDF
 
 #pageRemover
 pageRemover.title=مزيل الصفحة
@@ -329,32 +400,32 @@ pdfToPDFA.credit=\u062A\u0633\u062A\u062E\u062F\u0645 \u0647\u0630\u0647 \u0627\
 pdfToPDFA.submit=\u062A\u062D\u0648\u064A\u0644
 
 
-PDFToWord.title = تحويل PDF إلى Word
-PDFToWord.header = تحويل PDF إلى Word
-PDFToWord.selectText.1 = تنسيق ملف الإخراج
-PDFToWord.credit = تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
-PDFToWord.submit = تحويل
+PDFToWord.title=تحويل PDF إلى Word
+PDFToWord.header=تحويل PDF إلى Word
+PDFToWord.selectText.1=تنسيق ملف الإخراج
+PDFToWord.credit=تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
+PDFToWord.submit=تحويل
 
-PDFToPresentation.title = PDF للعرض التقديمي
-PDFToPresentation.header = PDF للعرض التقديمي
-PDFToPresentation.selectText.1 = تنسيق ملف الإخراج
-PDFToPresentation.credit = تستخدم هذه الخدمة LibreOffice لتحويل الملف.
-PDFToPresentation.submit = تحويل
+PDFToPresentation.title=PDF للعرض التقديمي
+PDFToPresentation.header=PDF للعرض التقديمي
+PDFToPresentation.selectText.1=تنسيق ملف الإخراج
+PDFToPresentation.credit=تستخدم هذه الخدمة LibreOffice لتحويل الملف.
+PDFToPresentation.submit=تحويل
 
 
-PDFToText.title = تحويل PDF إلى نص / RTF
-PDFToText.header = تحويل PDF إلى نص / RTF
-PDFToText.selectText.1 = تنسيق ملف الإخراج
-PDFToText.credit = تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
-PDFToText.submit = تحويل
+PDFToText.title=تحويل PDF إلى نص / RTF
+PDFToText.header=تحويل PDF إلى نص / RTF
+PDFToText.selectText.1=تنسيق ملف الإخراج
+PDFToText.credit=تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
+PDFToText.submit=تحويل
 
 
-PDFToHTML.title = PDF إلى HTML
-PDFToHTML.header = PDF إلى HTML
-PDFToHTML.credit = تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
-PDFToHTML.submit = تحويل
+PDFToHTML.title=PDF إلى HTML
+PDFToHTML.header=PDF إلى HTML
+PDFToHTML.credit=تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
+PDFToHTML.submit=تحويل
 
-PDFToXML.title = تحويل PDF إلى XML
-PDFToXML.header = تحويل PDF إلى XML
-PDFToXML.credit = تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
-PDFToXML.submit = تحويل
+PDFToXML.title=تحويل PDF إلى XML
+PDFToXML.header=تحويل PDF إلى XML
+PDFToXML.credit=تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
+PDFToXML.submit=تحويل

src/main/resources/messages_ca_CA.properties

@@ -0,0 +1,444 @@
+###########
+# Generic #
+###########
+# the direction that the language is written (ltr = left to right, rtl = right to left)
+language.direction=ltr
+
+pdfPrompt=Selecciona PDF(s)
+multiPdfPrompt=Selecciona PDFs (2+)
+multiPdfDropPrompt=Selecciona (o arrossega) els documents PDF
+imgPrompt=Selecciona Imatge(s)
+genericSubmit=Envia
+processTimeWarning=Alerta: Aquest procés pot tardar 1 minut depenent de la mida de l'arxiu
+pageOrderPrompt=Ordre de Pàgines (Llista separada per comes) :
+goToPage=Anar
+true=Verdader
+false=Fals
+unknown=Desconegut
+save=Desa
+close=Tanca
+filesSelected=fitxers seleccionats
+noFavourites=No s'ha afegit cap favorit
+bored=Avorrit esperant?
+#############
+# HOME-PAGE #
+#############
+home.desc=L'eina allotjada localment per a necessitats PDF.
+
+
+navbar.convert=Converteix
+navbar.security=Seguretat
+navbar.other=Altres
+navbar.darkmode=Mode Fost
+navbar.pageOps=Operacions de Pàgina
+
+home.multiTool.title=PDF Multi Tool
+home.multiTool.desc=Fusiona, Rota, Reorganitza, i Esborra pàgines
+
+home.merge.title=Fusiona
+home.merge.desc=Fusiona fàcilment pàgines en una.
+
+home.split.title=Divideix
+home.split.desc=Divideix PDFs en múltiples documents
+
+home.rotate.title=Rota
+home.rotate.desc=Rota els PDFs.
+
+home.imageToPdf.title=Imatge a PDF
+home.imageToPdf.desc=Converteix imatge (PNG, JPEG, GIF) a PDF.
+
+home.pdfToImage.title=PDF a Imatge
+home.pdfToImage.desc=Converteix PDF a imatge. (PNG, JPEG, GIF)
+
+home.pdfOrganiser.title=Organitza
+home.pdfOrganiser.desc=Elimina/Reorganitza pàgines en qualsevol ordre
+
+home.addImage.title=Afegir imatge a PDF
+home.addImage.desc=Afegeix imatge en un PDF (En progrés)
+
+home.watermark.title=Afegir Marca d'aigua
+home.watermark.desc=Afegir Marca d'aigua personalitzada en un PDF
+
+home.remove-watermark.title=Treure Marca d'Aigua
+home.remove-watermark.desc=Treu Marca d'Aigua d'un PDF
+
+home.permissions.title=Canvia permissos
+home.permissions.desc=Canvia permisos del document PDF
+
+home.removePages.title=Elimina
+home.removePages.desc=Elimina pàgines del document PDF.
+
+home.addPassword.title=Afegir Password
+home.addPassword.desc=Xifra document PDF amb password.
+
+home.removePassword.title=Elimina Password
+home.removePassword.desc=Elimia Password de document PDF.
+
+home.compressPdfs.title=Comprimeix
+home.compressPdfs.desc=Comprimeix PDFs per reduir la mida.
+
+home.changeMetadata.title=Canvia Metadades
+home.changeMetadata.desc=Canvia/Treu/Afegeix matadades al document PDF.
+
+home.fileToPDF.title=Converteix arxiu a PDF
+home.fileToPDF.desc=Converteix qualsevol arxiu a PDF (DOCX, PNG, XLS, PPT, TXT i més)
+
+home.ocr.title=Executa exploracions OCR i/o neteja escanejos
+home.ocr.desc=Neteja escanejats i detecta text d'imatges dins d'un PDF i el torna a afegir com a text.
+
+home.extractImages.title=Extreu Imatges
+home.extractImages.desc=Extreu les Imatges del PDF i les desa a zip
+
+home.pdfToPDFA.title=PDF a PDF/A
+home.pdfToPDFA.desc=Converteix PDF a PDF/A per desar a llarg termini.
+
+home.PDFToWord.title=PDF a Word
+home.PDFToWord.desc=Converteix PDF a formats de Word (DOC, DOCX and ODT)
+
+home.PDFToPresentation.title=PDF a Presentació
+home.PDFToPresentation.desc=Convert PDF to Presentation formats (PPT, PPTX and ODP)
+
+home.PDFToText.title=PDF a Text/RTF
+home.PDFToText.desc=Converteix PDF a Text o format RTF
+
+home.PDFToHTML.title=PDF a HTML
+home.PDFToHTML.desc=Converteix PDF a format HTML
+
+home.PDFToXML.title=PDF a XML
+home.PDFToXML.desc=Converteix PDF a format XML
+
+home.ScannerImageSplit.title=Detecta/Divideix fotos escanejades
+home.ScannerImageSplit.desc=Divideix múltiples fotos dins del PDF/foto
+
+home.sign.title=Sign
+home.sign.desc=Afegeix signatura al PDF mitjançant dibuix, text o imatge
+
+home.flatten.title=Aplanar
+home.flatten.desc=Elimineu tots els elements i formularis interactius d'un PDF
+
+home.repair.title=Reparar
+home.repair.desc=Intenta reparar un PDF danyat o trencat
+
+home.removeBlanks.title=Elimina les pàgines en blanc
+home.removeBlanks.desc=Detecta i elimina les pàgines en blanc d'un document
+
+home.compare.title=Compara
+home.compare.desc=Compara i mostra les diferències entre 2 documents PDF
+
+downloadPdf=Descarregueu PDF
+text=Text
+font=Tipus de lletra
+
+removeBlanks.title=Elimina els espais en blanc
+removeBlanks.header=Elimina les pàgines en blanc
+removeBlanks.threshold=Llindar:
+removeBlanks.thresholdDesc=Llindar per determinar el blanc que ha de ser un píxel blanc
+removeBlanks.whitePercent=Percentatge blanc (%):
+removeBlanks.whitePercentDesc=Percentatge de pàgina que ha de ser blanca per eliminar-la
+removeBlanks.submit=Elimina els espais en blanc
+
+compare.title=Comparar
+compare.header=Compara PDF
+compare.document.1=Document 1
+compare.document.2=Document 2
+compare.submit=Comparar
+
+sign.title=Sign
+sign.header=Firma els PDF
+sign.upload=Penja la imatge
+sign.draw=Dibuixa la signatura
+sign.text=Entrada de text
+sign.clear=Esborrar
+sign.add=Afegeix
+
+repair.title=Reparar
+repair.header=Repara els PDF
+repair.submit=Reparar
+
+flatten.title=Aplanar
+flatten.header=Aplana els PDF
+flatten.submit=Aplanar
+
+ScannerImageSplit.selectText.1=Llindar d'angle:
+ScannerImageSplit.selectText.2=Estableix l'angle absolut mínim necessari perquè la imatge es giri (per defecte: 10).
+ScannerImageSplit.selectText.3=Tolerància:
+ScannerImageSplit.selectText.4=Determina l'interval de variació de color al voltant del color de fons estimat (per defecte: 30).
+ScannerImageSplit.selectText.5=Àrea Mínima:
+ScannerImageSplit.selectText.6=Estableix el llindar d'àrea mínima per a una foto (per defecte: 10000).
+ScannerImageSplit.selectText.7=Àrea de contorn mínima:
+ScannerImageSplit.selectText.8=Estableix el llindar mínim de l'àrea de contorn per a una foto
+ScannerImageSplit.selectText.9=Mida Vora:
+ScannerImageSplit.selectText.10=Estableix la mida de la vora afegida i eliminada per evitar vores blanques a la sortida (per defecte: 1).
+
+navbar.settings=Opcions
+settings.title=Opcions
+settings.update=Actualització Disponible
+settings.appVersion=Versió App:
+settings.downloadOption.title=Trieu l'opció de descàrrega (per a descàrregues d'un sol fitxer no zip):
+settings.downloadOption.1=Obre mateixa finestra
+settings.downloadOption.2=Obre mateixa finestra
+settings.downloadOption.3=Descarrega Arxiu
+settings.zipThreshold=Comprimiu els fitxers quan el nombre de fitxers baixats superi
+
+
+
+                            
+                            
+#OCR
+ocr.title=OCR / Neteja escaneig
+ocr.header=Neteja Escanejos / OCR (Reconeixement òptic de caràcters)
+ocr.selectText.1=Selecciona els idiomes que s'han de detectar dins del PDF (els que s'indiquen són els detectats):
+ocr.selectText.2=Produeix un fitxer de text que contingui text OCR juntament amb el PDF editat per OCR
+ocr.selectText.3=Corregeix pàgines escanejades amb un angle esbiaixat girant-les de nou al seu lloc
+ocr.selectText.4=Neteja la pàgina, de manera que és menys probable que l'OCR trobi soroll de text de fons. (Sense canvis de sortida)
+ocr.selectText.5=Neteja la pàgina, de manera que és menys probable que l'OCR trobi text al soroll de fons, mantenint la neteja a la sortida.
+ocr.selectText.6=Ignora les pàgines que tenen text interactiu, només les pàgines OCR que són imatges
+ocr.selectText.7=Força OCR, l'OCR de cada pàgina elimina tots els elements de text originals
+ocr.selectText.8=Normal (error si el PDF conté text)
+ocr.selectText.9=Opcions Addicionals
+ocr.selectText.10=Mode OCR
+ocr.selectText.11=Elimia Imatges després de l'OCR (Alimina TOTES les imatges, útil si és part d'un procés de conversió)
+ocr.selectText.12=Tipus de Renderització (Avançat)
+ocr.help=Llegiu aquesta documentació sobre com utilitzar-la per a altres idiomes i/o no utilitzar-la a Docker
+ocr.credit=Aquest servei empra OCRmyPDF i Tesseract per OCR.
+ocr.submit=Processa PDF amb OCR
+
+
+
+extractImages.title=Extreu Imatges
+extractImages.header=Extreu Imatges
+extractImages.selectText=Selecciona el format d'imatge al qual convertir les imatges extretes
+extractImages.submit=Extreu
+
+
+#File to PDF
+fileToPDF.title=Arxiu a PDF
+fileToPDF.header=Converteix arxiu a PDF
+fileToPDF.credit=Utilitza LibreOffice i Unoconv per a la conversió.
+fileToPDF.supportedFileTypes=Els tipus de fitxers admesos haurien d'incloure el següent, però per obtenir una llista completa actualitzada dels formats compatibles, consulteu la documentació de LibreOffice
+fileToPDF.submit=Converteix a PDF
+
+
+#compress
+compress.title=Comprimeix
+compress.header=Comprimeix PDF
+compress.credit=Utilitza OCRmyPDF per Compressió/Optimització de PDF.
+compress.selectText.1=Nivell Optimització:
+compress.selectText.2=0 (Sense Optimització)
+compress.selectText.3=1 (Defecte, sense pèrdua Optimització)
+compress.selectText.4=2 (Pèrdua Optimització)
+compress.selectText.5=3 (Pèrdua Optimització, més agressiu)
+compress.selectText.6=Activa la visualització web ràpida (linealitza PDF)
+compress.selectText.7=Activa pèrdua codificació JBIG2
+compress.submit=Comprimeix
+
+
+#Add image
+addImage.title=Afegir Imatge
+addImage.header=Afegir Imatge a PDF (en construcció)
+addImage.everyPage=Totes les pàgines?
+addImage.submit=Afegir Imatge
+
+
+#merge
+merge.title=Fusiona
+merge.header=Fusiona múltiples PDFs (2+)
+merge.submit=Fusiona
+
+#pdfOrganiser
+pdfOrganiser.title=Organitzador de pàgines
+pdfOrganiser.header=Organitzador de pàgines PDF
+pdfOrganiser.submit=Reorganitza Pàgines
+
+#multiTool
+multiTool.title=PDF Multi Tool
+multiTool.header=PDF Multi Tool
+
+
+#pageRemover
+pageRemover.title=Eliminació Pàgines
+pageRemover.header=Eliminació Pàgines PDF
+pageRemover.pagesToDelete=Pàgines a esborrar (Números de pàgina) :
+pageRemover.submit=Esborra Pàgines
+
+#rotate
+rotate.title=Rota PDF
+rotate.header=Rota PDF
+rotate.selectAngle=Selecciona l'angle de gir (en múltiples de 90 graus):
+rotate.submit=Rota
+
+
+
+
+#merge
+split.title=Divideix PDF
+split.header=Divideix PDF
+split.desc.1=Els números seleccionats són el número de pàgina en què voleu fer la divisió
+split.desc.2=Per tant, seleccionant 1,3,7-8 dividiria un document de 10 pàgines en 6 PDFS separats amb:
+split.desc.3=Document #1: Pàgina 1
+split.desc.4=Document #2: Pàgina 2 i 3
+split.desc.5=Document #3: Pàgina 4, 5 i 6
+split.desc.6=Document #4: Pàgina 7
+split.desc.7=Document #5: Pàgina 8
+split.desc.8=Document #6: Pàgina 9 i 10
+split.splitPages=Introdueix pàgines per dividir-les:
+split.submit=Divideix
+
+
+#merge
+imageToPDF.title=Imatge a PDF
+imageToPDF.header=Imatge a PDF
+imageToPDF.submit=Converteix
+imageToPDF.selectText.1=Estirar per adaptar
+imageToPDF.selectText.2=Auto rota PDF
+imageToPDF.selectText.3=Lògica de diversos fitxers (només està activada si es treballa amb diverses imatges)
+imageToPDF.selectText.4=Combina en un únic PDF
+imageToPDF.selectText.5=Converteix per separar PDFs
+                                   
+#pdfToImage
+pdfToImage.title=PDF a Imatge
+pdfToImage.header=PDF a Imatge
+pdfToImage.selectText=Format Imatge
+pdfToImage.singleOrMultiple=Tipus Imatge Resultant
+pdfToImage.single=Única Imatge Gran
+pdfToImage.multi=Múltiples Imatges
+pdfToImage.colorType=Tipus Color
+pdfToImage.color=Color
+pdfToImage.grey=Escala de Grisos
+pdfToImage.blackwhite=Blanc i Negre (Pot perdre dades!)
+pdfToImage.submit=Converteix
+
+#addPassword
+addPassword.title=Afegir Password
+addPassword.header=Afegir password (Encriptat)
+addPassword.selectText.1=PDF a encriptar
+addPassword.selectText.2=Password
+addPassword.selectText.3=Longitud clau de xifratge
+addPassword.selectText.4=Valors més alts són més forts, però els valors més baixos tenen una millor compatibilitat.
+addPassword.selectText.5=Permissos a Establir
+addPassword.selectText.6=Evita muntatge del document
+addPassword.selectText.7=Evita extracció de contingut
+addPassword.selectText.8=Evita extracció per accessibilitat
+addPassword.selectText.9=Evita emplenar formularis
+addPassword.selectText.10=Evita modificacions
+addPassword.selectText.11=Evita modificacions d'annotacions
+addPassword.selectText.12=Evita impressió
+addPassword.selectText.13=Evita impressió de diferents formats
+addPassword.submit=Encripta
+
+#watermark
+watermark.title=Afegir Marca d'Aigua
+watermark.header=Afegir Marca d'Aigua
+watermark.selectText.1=Seleciona PDF per afegir Marca d'Aigua:
+watermark.selectText.2=Text de la Marca d'Aigua
+watermark.selectText.3=Mida de la Font:
+watermark.selectText.4=Rotació (0-360):
+watermark.selectText.5=separació d'amplada (Espai horitzontal entre cada Marca d'Aigua):
+watermark.selectText.6=separació d'alçada (Espai vertical entre cada Marca d'Aigua):
+watermark.selectText.7=Opacitat (0% - 100%):
+watermark.submit=Afegir Marca d'Aigua
+
+#remove-watermark
+remove-watermark.title=Elimina Marca d'Aigua
+remove-watermark.header=Elimina Marca d'Aigua
+remove-watermark.selectText.1=Seleciona PDF per eliminar Marca d'Aigua:
+remove-watermark.selectText.2=Text de la Marca d'Aigua:
+remove-watermark.submit=Elimina Marca d'Aigua
+
+#Change permissions
+permissions.title=Canviar Permissos
+permissions.header=Canviar Permissos
+permissions.warning=Advertència perquè aquests permisos siguin inalterables, es recomana establir-los amb una contrasenya a través de la pàgina d'afegir contrasenya
+permissions.selectText.1=Selecciona PDF per Canviar Permissos
+permissions.selectText.2=Permissos a canviar
+permissions.selectText.3=Evita muntatge del document
+permissions.selectText.4=Evita extracció de contingut
+permissions.selectText.5=evita extracció de contingut per accessibilitat
+permissions.selectText.6=Evita emplenar formularis
+permissions.selectText.7=Evita modificacions
+permissions.selectText.8=Evita modificacions d'annotacions
+permissions.selectText.9=Evita impressió
+permissions.selectText.10=Evita impressió de diferents formats
+permissions.submit=Canviar Permissos
+
+#remove password
+removePassword.title=Treure Password
+removePassword.header=Treure Password (Decriptar)
+removePassword.selectText.1=Selecciona PDF a Decriptar
+removePassword.selectText.2=Password
+removePassword.submit=Treu Password
+
+changeMetadata.title=Canvia Metadades
+changeMetadata.header=Canvia Metadades
+changeMetadata.selectText.1=Edit les variables a canviar
+changeMetadata.selectText.2=Neteja totes les matadades
+changeMetadata.selectText.3=Mostra Metadades Personalitzades:
+changeMetadata.author=Autor:
+changeMetadata.creationDate=Data Creació (yyyy/MM/dd HH:mm:ss):
+changeMetadata.creator=Creador:
+changeMetadata.keywords=Keywords:
+changeMetadata.modDate=Data Modificació (yyyy/MM/dd HH:mm:ss):
+changeMetadata.producer=Productor:
+changeMetadata.subject=Assumpte:
+changeMetadata.title=Títol:
+changeMetadata.trapped=Atrapat:
+changeMetadata.selectText.4=Altres Metadades:
+changeMetadata.selectText.5=Afegir entrada personalizada
+changeMetadata.submit=Canvia
+
+xlsToPdf.title=Excel a PDF
+xlsToPdf.header=Excel a PDF
+xlsToPdf.selectText.1=Selecciona arxiu XLS o XLSX a convertir
+xlsToPdf.convert=Converteix
+
+
+
+
+pdfToPDFA.title=PDF a PDF/A
+pdfToPDFA.header=PDF a PDF/A
+pdfToPDFA.credit=Utilitza OCRmyPDF per la conversió a PDF/A
+pdfToPDFA.submit=Converteix
+
+
+
+PDFToWord.title=PDF a Word
+PDFToWord.header=PDF a Word
+PDFToWord.selectText.1=Format d'Arxiu de Sortida
+PDFToWord.credit=Utilitza LibreOffice per a la conversió d'Arxius.
+PDFToWord.submit=Converteix
+
+PDFToPresentation.title=PDF a Presentació
+PDFToPresentation.header=PDF a Presentació
+PDFToPresentation.selectText.1=Format d'Arxiu de Sortida
+PDFToPresentation.credit=Utilitza LibreOffice per a la conversió d'Arxius.
+PDFToPresentation.submit=Converteix
+
+
+PDFToText.title=PDF a Text/RTF
+PDFToText.header=PDF a Text/RTF
+PDFToText.selectText.1=Format d'Arxiu de Sortida
+PDFToText.credit=Utilitza LibreOffice per a la conversió d'Arxius.
+PDFToText.submit=Converteix
+
+
+PDFToHTML.title=PDF a HTML
+PDFToHTML.header=PDF a HTML
+PDFToHTML.credit=Utilitza LibreOffice per a la conversió d'Arxius.
+PDFToHTML.submit=Converteix
+
+PDFToXML.title=PDF a XML
+PDFToXML.header=PDF a XML
+PDFToXML.credit=Utilitza LibreOffice per a la conversió d'Arxius.
+PDFToXML.submit=Converteix
+
+
+
+
+
+
+
+
+
+
+
+

src/main/resources/messages_de_DE.properties

@@ -17,7 +17,9 @@ false=Falsch
 unknown=Unbekannt
 save=Speichern
 close=Schließen
-
+filesSelected=Dateien ausgewählt
+noFavourites=Keine Favoriten hinzugefügt
+bored=Gelangweiltes Warten?
 #############
 # HOME-PAGE #
 #############
@@ -104,6 +106,69 @@ home.PDFToHTML.desc=PDF in HTML-Format konvertieren
 home.PDFToXML.title=PDF in XML
 home.PDFToXML.desc=PDF in XML-Format konvertieren
 
+home.ScannerImageSplit.title=Gescannte Fotos erkennen/aufteilen
+home.ScannerImageSplit.desc=Teilt mehrere Fotos innerhalb eines Fotos/PDF
+
+home.sign.title=Signieren
+home.sign.desc=Fügt PDF-Signaturen durch Zeichnung, Text oder Bild hinzu
+
+home.flatten.title=Abflachen
+home.flatten.desc=Alle interaktiven Elemente und Formulare aus einem PDF entfernen
+
+home.repair.title=Reparatur
+home.repair.desc=Versucht, ein beschädigtes/kaputtes PDF zu reparieren
+
+home.removeBlanks.title=Leere Seiten entfernen
+home.removeBlanks.desc=Erkennt und entfernt leere Seiten aus einem Dokument
+
+home.compare.title=Vergleichen
+home.compare.desc=Vergleicht und zeigt die Unterschiede zwischen zwei PDF-Dokumenten an
+
+downloadPdf=PDF herunterladen
+text=Text
+font=Schriftart
+
+removeBlanks.title=Leerzeichen entfernen
+removeBlanks.header=Leere Seiten entfernen
+removeBlanks.threshold=Schwellenwert:
+removeBlanks.thresholdDesc=Schwellenwert zur Bestimmung, wie weiß ein weißer Pixel sein muss
+removeBlanks.whitePercent=Weißprozentsatz (%):
+removeBlanks.whitePercentDesc=Prozentsatz der Seite, die weiß sein muss, um entfernt zu werden
+removeBlanks.submit=Leerzeichen entfernen
+
+compare.title=Vergleichen
+compare.header=PDFs vergleichen
+compare.document.1=Dokument 1
+compare.document.2=Dokument 2
+compare.submit=Vergleichen
+
+sign.title=Signieren
+sign.header=PDFs signieren
+sign.upload=Bild hochladen
+sign.draw=Signatur zeichnen
+sign.text=Texteingabe
+sign.clear=Klar
+sign.add=Hinzufügen
+
+repair.title=Reparieren
+Repair.header=PDFs reparieren
+repair.submit=Reparieren
+
+flatten.title=Abflachen
+flatten.header=PDFs reduzieren
+flatten.submit=Abflachen
+
+ScannerImageSplit.selectText.1=Winkelschwelle:
+ScannerImageSplit.selectText.2=Legt den minimalen absoluten Winkel fest, der erforderlich ist, damit das Bild gedreht werden kann (Standard: 10).
+ScannerImageSplit.selectText.3=Toleranz:
+ScannerImageSplit.selectText.4=Bestimmt den Bereich der Farbvariation um die geschätzte Hintergrundfarbe herum (Standard: 30).
+ScannerImageSplit.selectText.5=Mindestbereich:
+ScannerImageSplit.selectText.6=Legt den minimalen Bereichsschwellenwert für ein Foto fest (Standard: 10000).
+ScannerImageSplit.selectText.7=Minimaler Konturbereich:
+ScannerImageSplit.selectText.8=Legt den minimalen Konturbereichsschwellenwert für ein Foto fest
+ScannerImageSplit.selectText.9=Randgröße:
+ScannerImageSplit.selectText.10=Legt die Größe des hinzugefügten und entfernten Randes fest, um weiße Ränder in der Ausgabe zu verhindern (Standard: 1).
+
 
 navbar.settings=Einstellungen
 settings.title=Einstellungen
@@ -128,6 +193,8 @@ ocr.selectText.7=OCR erzwingen, OCR wird jede Seite entfernen und alle ursprüng
 ocr.selectText.8=Normal (Fehler, wenn PDF Text enthält)
 ocr.selectText.9=Zusätzliche Einstellungen
 ocr.selectText.10=OCR-Modus
+ocr.selectText.11=Bilder nach OCR entfernen (Entfernt ALLE Bilder, nur sinnvoll, wenn Teil des Konvertierungsschritts)
+ocr.selectText.12=Rendertyp (Erweitert)
 ocr.help=Bitte lesen Sie diese Dokumentation, um zu erfahren, wie Sie dies für andere Sprachen verwenden und/oder nicht in Docker verwenden können
 ocr.credit=Dieser Dienst verwendet OCRmyPDF und Tesseract für OCR.
 ocr.submit=PDF mit OCR verarbeiten
@@ -152,7 +219,7 @@ fileToPDF.submit=In PDF konvertieren
 
 #Add image
 addImage.title=Bild hinzufügen
-addImage.header=Ein Bild einfügen (Work in progress)
+addImage.header=Ein Bild einfügen
 addImage.everyPage=Jede Seite?
 addImage.submit=Bild hinzufügen
 

src/main/resources/messages_en_GB.properties

@@ -17,7 +17,9 @@ false=False
 unknown=Unknown
 save=Save
 close=Close
-
+filesSelected=files selected
+noFavourites=No favourites added
+bored=Bored Waiting?
 #############
 # HOME-PAGE #
 #############
@@ -51,7 +53,7 @@ home.pdfToImage.desc=Convert a PDF to a image. (PNG, JPEG, GIF)
 home.pdfOrganiser.title=Organise
 home.pdfOrganiser.desc=Remove/Rearrange pages in any order
 
-home.addImage.title=Add image onto PDF
+home.addImage.title=Add image
 home.addImage.desc=Adds a image onto a set location on the PDF (Work in progress)
 
 home.watermark.title=Add Watermark
@@ -81,7 +83,7 @@ home.changeMetadata.desc=Change/Remove/Add metadata from a PDF document
 home.fileToPDF.title=Convert file to PDF
 home.fileToPDF.desc=Convert nearly any file to PDF (DOCX, PNG, XLS, PPT, TXT and more)
 
-home.ocr.title=Run OCR and/or Cleanup scans
+home.ocr.title=OCR / Cleanup scans
 home.ocr.desc=Cleanup scans and detects text from images within a PDF and re-adds it as text.
 
 home.extractImages.title=Extract Images
@@ -105,7 +107,68 @@ home.PDFToHTML.desc=Convert PDF to HTML format
 home.PDFToXML.title=PDF to XML
 home.PDFToXML.desc=Convert PDF to XML format
 
+home.ScannerImageSplit.title=Detect/Split Scanned photos
+home.ScannerImageSplit.desc=Splits multiple photos from within a photo/PDF
 
+home.sign.title=Sign
+home.sign.desc=Adds signature to PDF by drawing, text or image
+
+home.flatten.title=Flatten
+home.flatten.desc=Remove all interactive elements and forms from a PDF
+
+home.repair.title=Repair
+home.repair.desc=Tries to repair a corrupt/broken PDF
+
+home.removeBlanks.title=Remove Blank pages
+home.removeBlanks.desc=Detects and removes blank pages from a document
+
+home.compare.title=Compare
+home.compare.desc=Compares and shows the differences between 2 PDF Documents
+
+downloadPdf=Download PDF
+text=Text
+font=Font
+
+removeBlanks.title=Remove Blanks
+removeBlanks.header=Remove Blank Pages
+removeBlanks.threshold=Threshold:
+removeBlanks.thresholdDesc=Threshold for determining how white a white pixel must be
+removeBlanks.whitePercent=White Percent (%):
+removeBlanks.whitePercentDesc=Percent of page that must be white to be removed
+removeBlanks.submit=Remove Blanks
+
+compare.title=Compare
+compare.header=Compare PDFs
+compare.document.1=Document 1
+compare.document.2=Document 2
+compare.submit=Compare
+
+sign.title=Sign
+sign.header=Sign PDFs
+sign.upload=Upload Image
+sign.draw=Draw Signature
+sign.text=Text Input
+sign.clear=Clear
+sign.add=Add
+
+repair.title=Repair
+repair.header=Repair PDFs
+repair.submit=Repair
+
+flatten.title=Flatten
+flatten.header=Flatten PDFs
+flatten.submit=Flatten
+
+ScannerImageSplit.selectText.1=Angle Threshold:
+ScannerImageSplit.selectText.2=Sets the minimum absolute angle required for the image to be rotated (default: 10).
+ScannerImageSplit.selectText.3=Tolerance:
+ScannerImageSplit.selectText.4=Determines the range of color variation around the estimated background color (default: 30).
+ScannerImageSplit.selectText.5=Minimum Area:
+ScannerImageSplit.selectText.6=Sets the minimum area threshold for a photo (default: 10000).
+ScannerImageSplit.selectText.7=Minimum Contour Area:
+ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a photo
+ScannerImageSplit.selectText.9=Border Size:
+ScannerImageSplit.selectText.10=Sets the size of the border added and removed to prevent white borders in the output (default: 1).
 
 navbar.settings=Settings
 settings.title=Settings
@@ -118,6 +181,7 @@ settings.downloadOption.3=Download file
 settings.zipThreshold=Zip files when the number of downloaded files exceeds
 
 
+
                             
                             
 #OCR
@@ -128,11 +192,13 @@ ocr.selectText.2=Produce text file containing OCR text alongside the OCR'ed PDF
 ocr.selectText.3=Correct pages were scanned at a skewed angle by rotating them back into place
 ocr.selectText.4=Clean page so its less likely that OCR will find text in background noise. (No output change)
 ocr.selectText.5=Clean page so its less likely that OCR will find text in background noise, maintains cleanup in output.
-ocr.selectText.6=Ignores pages that have interacive text on them, only OCRs pages that are images
+ocr.selectText.6=Ignores pages that have interactive text on them, only OCRs pages that are images
 ocr.selectText.7=Force OCR, will OCR Every page removing all original text elements
 ocr.selectText.8=Normal (Will error if PDF contains text)
 ocr.selectText.9=Additional Settings
 ocr.selectText.10=OCR Mode
+ocr.selectText.11=Remove images after OCR (Removes ALL images, only useful if part of conversion step)
+ocr.selectText.12=Render Type (Advanced)
 ocr.help=Please read this documentation on how to use this for other languages and/or use not in docker
 ocr.credit=This service uses OCRmyPDF and Tesseract for OCR.
 ocr.submit=Process PDF with OCR
@@ -169,7 +235,7 @@ compress.submit=Compress
 
 #Add image
 addImage.title=Add Image
-addImage.header=Add image to PDF (Work in progress)
+addImage.header=Add image to PDF
 addImage.everyPage=Every Page?
 addImage.submit=Add image
 

src/main/resources/messages_es_ES.properties

@@ -17,7 +17,9 @@ false=Falso
 unknown=Desconocido
 save=Guardar
 close=Cerrar
-
+filesSelected=archivos seleccionados
+noFavourites=No se agregaron favoritos
+bored=¿Aburrido de esperar?
 #############
 # HOME-PAGE #
 #############
@@ -104,6 +106,68 @@ home.PDFToHTML.desc=Convertir PDF a formato HTML
 home.PDFToXML.title=PDF a XML
 home.PDFToXML.desc=Convertir PDF a formato XML
 
+home.ScannerImageSplit.title=Detectar/Dividir fotos escaneadas
+home.ScannerImageSplit.desc=Dividir varias fotos dentro de una foto/PDF
+
+home.sign.title=Firmar
+home.sign.desc=Añade firma a PDF mediante dibujo, texto o imagen
+
+home.flatten.title=Aplanar
+home.flatten.desc=Eliminar todos los elementos y formularios interactivos de un PDF
+
+home.repair.title=Reparar
+home.repair.desc=Intenta reparar un PDF corrupto/roto
+
+home.removeBlanks.title=Eliminar páginas en blanco
+home.removeBlanks.desc=Detecta y elimina páginas en blanco de un documento
+
+home.compare.title=Comparar
+home.compare.desc=Compara y muestra las diferencias entre 2 documentos PDF
+
+downloadPdf=Descargar PDF
+text=Texto
+font=Fuente
+
+removeBlanks.title=Eliminar espacios en blanco
+removeBlanks.header=Eliminar páginas en blanco
+removeBlanks.threshold=Umbral:
+removeBlanks.thresholdDesc=Umbral para determinar qué tan blanco debe ser un píxel blanco
+removeBlanks.whitePercent=Porcentaje de blanco (%):
+removeBlanks.whitePercentDesc=Porcentaje de página que debe ser blanca para ser eliminada
+removeBlanks.submit=Eliminar espacios en blanco
+
+compare.title=Comparar
+compare.header=Comparar archivos PDF
+compare.document.1=Documento 1
+compare.document.2=Documento 2
+compare.submit=Comparar
+
+sign.title=Firmar
+sign.header=Firmar archivos PDF
+sign.upload=Subir imagen
+sign.draw=Dibujar firma
+sign.text=Entrada de texto
+sign.clear=Borrar
+sign.add=Agregar
+
+repair.title=Reparar
+repair.header=Reparar archivos PDF
+repair.submit=Reparar
+
+flatten.title=Aplanar
+flatten.header=Acoplar archivos PDF
+flatten.submit=Aplanar
+
+ScannerImageSplit.selectText.1=Umbral de ángulo:
+ScannerImageSplit.selectText.2=Establece el ángulo absoluto mínimo requerido para rotar la imagen (predeterminado: 10).
+ScannerImageSplit.selectText.3=Tolerancia:
+ScannerImageSplit.selectText.4=Determina el rango de variación de color alrededor del color de fondo estimado (predeterminado: 30).
+ScannerImageSplit.selectText.5=Área mínima:
+ScannerImageSplit.selectText.6=Establece el umbral mínimo de área para una foto (predeterminado: 10000).
+ScannerImageSplit.selectText.7=Área de contorno mínima:
+ScannerImageSplit.selectText.8=Establece el umbral mínimo del área de contorno para una foto
+ScannerImageSplit.selectText.9=Tamaño del borde:
+ScannerImageSplit.selectText.10=Establece el tamaño del borde agregado y eliminado para evitar bordes blancos en la salida (predeterminado: 1).
 
 navbar.settings=Ajustes
 settings.title=Ajustes
@@ -131,6 +195,8 @@ ocr.selectText.7=Fuerza OCR, OCR eliminará en cada página todo el texto origin
 ocr.selectText.8=Normal (Se producirá un error si el PDF contiene texto)
 ocr.selectText.9=Ajustes Adicionales
 ocr.selectText.10=Modo OCR
+ocr.selectText.11=Eliminar imágenes después de OCR (Elimina TODAS las imágenes, solo es útil si es parte del paso de conversión)
+ocr.selectText.12=Tipo de procesamiento (avanzado)
 ocr.help=Lea esta documentación sobre cómo usar esto para otros idiomas y/o no usarlo en docker
 ocr.credit=Este servicio utiliza OCRmyPDF y Tesseract para OCR.
 ocr.submit=Procesa PDF con OCR
@@ -167,7 +233,7 @@ compress.submit=Comprimir
 
 #Add image
 addImage.title=Añade Imagen
-addImage.header=Añade image de PDF (Trabajo en progreso)
+addImage.header=Añade image de PDF
 addImage.everyPage=¿Todas las páginas?
 addImage.submit=Añade imagen
 

src/main/resources/messages_fr_FR.properties

@@ -21,7 +21,9 @@ false=Faux
 unknown=Inconnu
 save=Enregistrer
 close=Fermer
-
+filesSelected=fichiers sélectionnés
+noFavourites=Aucun favori ajouté
+bored=Ennuyé d'attendre ?
 #############
 # HOME-PAGE #
 #############
@@ -110,6 +112,69 @@ home.PDFToHTML.desc=Convertir le PDF au format HTML
 home.PDFToXML.title=PDF vers XML
 home.PDFToXML.desc=Convertir le PDF au format XML
 
+home.ScannerImageSplit.title=Détecter/diviser les photos numérisées
+home.ScannerImageSplit.desc=Divise plusieurs photos à partir d'une photo/PDF
+
+home.sign.title=Signe
+home.sign.desc=Ajoute une signature au PDF par dessin, texte ou image
+
+home.flatten.title=Aplatir
+home.flatten.desc=Supprimer tous les éléments et formulaires interactifs d'un PDF
+
+home.repair.title=Réparer
+home.repair.desc=Essaye de réparer un PDF corrompu/cassé
+
+home.removeBlanks.title=Supprimer les pages vierges
+home.removeBlanks.desc=Détecte et supprime les pages vierges d'un document
+
+home.compare.title=Comparer
+home.compare.desc=Compare et affiche les différences entre 2 documents PDF
+
+downloadPdf=Télécharger le PDF
+text=Texte
+font=Police
+
+removeBlanks.title=Supprimer les blancs
+removeBlanks.header=Supprimer les pages vierges
+removeBlanks.threshold=Seuil :
+removeBlanks.thresholdDesc=Seuil pour déterminer à quel point un pixel blanc doit être blanc
+removeBlanks.whitePercent=Pourcentage blanc (%) :
+removeBlanks.whitePercentDesc=Pourcentage de page qui doit être blanche pour être supprimée
+removeBlanks.submit=Supprimer les blancs
+
+compare.title=Comparer
+compare.header=Comparer des PDF
+compare.document.1=Document 1
+compare.document.2=Document 2
+compare.submit=Comparer
+
+sign.title=Signe
+sign.header=Signer des PDF
+sign.upload=Télécharger l'image
+sign.draw=Dessiner une signature
+sign.text=Saisie de texte
+sign.clear=Effacer
+sign.add=Ajouter
+
+repair.title=Réparer
+repair.header=Réparer les PDF
+repair.submit=Réparer
+
+flatten.title=Aplatir
+flatten.header=Aplatir les PDF
+flatten.submit=Aplatir
+
+ScannerImageSplit.selectText.1=Seuil d'angle :
+ScannerImageSplit.selectText.2=Définit l'angle absolu minimum requis pour la rotation de l'image (par défaut : 10).
+ScannerImageSplit.selectText.3=Tolérance :
+ScannerImageSplit.selectText.4=Détermine la plage de variation de couleur autour de la couleur d'arrière-plan estimée (par défaut : 30).
+ScannerImageSplit.selectText.5=Zone minimale :
+ScannerImageSplit.selectText.6=Définit le seuil de zone minimum pour une photo (par défaut : 10000).
+ScannerImageSplit.selectText.7=Zone de contour minimale :
+ScannerImageSplit.selectText.8=Définit le seuil de zone de contour minimum pour une photo
+ScannerImageSplit.selectText.9=Taille de la bordure :
+ScannerImageSplit.selectText.10=Définit la taille de la bordure ajoutée et supprimée pour éviter les bordures blanches dans la sortie (par défaut : 1).
+
 navbar.settings=Paramètres
 settings.title=Paramètres
 settings.update=Mise à jour disponible
@@ -134,6 +199,8 @@ ocr.selectText.7=Forcer l'OCR, OCR chaque page supprimera tous les éléments de
 ocr.selectText.8=Normal (Erreur si le PDF contient du texte)
 ocr.selectText.9=Paramètres supplémentaires
 ocr.selectText.10=Mode ROC
+ocr.selectText.11=Supprimer les images après l'OCR (Supprime TOUTES les images, utile uniquement si elles font partie de l'étape de conversion)
+ocr.selectText.12=Type de rendu (avancé)
 ocr.help=Veuillez lire cette documentation pour savoir comment l'utiliser pour d'autres langues et/ou une utilisation non dans docker
 ocr.credit=Ce service utilise OCRmyPDF et Tesseract pour l'OCR.
 ocr.submit=Traiter PDF avec OCR
@@ -155,7 +222,7 @@ fileToPDF.submit=Convertir en PDF
 
 #Add image
 addImage.title=Ajouter une image
-addImage.header=Ajouter une image au PDF (Travail en cours)
+addImage.header=Ajouter une image au PDF
 addImage.everyPage=Chaque page?
 addImage.submit=Ajouter une image
 

src/main/resources/messages_zh_CN.properties

@@ -0,0 +1,431 @@
+###########
+# Generic #
+###########
+# the direction that the language is written (ltr = left to right, rtl = right to left)
+language.direction=ltr
+
+pdfPrompt=选择PDF
+multiPdfPrompt=选择多个PDF（2个或更多）
+multiPdfDropPrompt=选择（或拖拽）所需的PDF
+imgPrompt=选择图像
+genericSubmit=提交
+processTimeWarning=警告：此过程可能需要多达一分钟，具体时间取决于文件大小
+pageOrderPrompt=页面顺序（输入逗号分隔的页码列表）：
+goToPage=到
+true=True
+false=False
+unknown=未知
+save=保存
+close=关闭
+filesSelected=\u9009\u62E9\u7684\u6587\u4EF6
+noFavourites=\u6CA1\u6709\u6DFB\u52A0\u6536\u85CF\u5939
+bored=\u65E0\u804A\u7B49\u5F85\uFF1F
+#############
+# HOME-PAGE #
+#############
+home.desc=您的本地托管一站式服务，满足您的所有PDF需求。
+
+
+navbar.convert=转换
+navbar.security=安全
+navbar.other=其他
+navbar.darkmode=暗模式
+navbar.pageOps=页面操作
+
+home.multiTool.title=PDF多功能工具
+home.multiTool.desc=合并、旋转、重新排列和删除PDF页面
+
+home.merge.title=合并
+home.merge.desc=轻松合并多个PDF为一个。
+
+home.split.title=拆分
+home.split.desc=将 PDF 拆分为多个文档。
+
+home.rotate.title=旋转
+home.rotate.desc=旋转PDF。
+
+home.imageToPdf.title=转换图像到PDF
+home.imageToPdf.desc=转换图像（PNG, JPEG, GIF）到 PDF。
+
+home.pdfToImage.title=转换PDF到图像
+home.pdfToImage.desc=转换PDF到图像（PNG, JPEG, GIF）
+
+home.pdfOrganiser.title=整理
+home.pdfOrganiser.desc=按任何顺序删除/重新排列页面。
+
+home.addImage.title=在PDF中添加图片
+home.addImage.desc=将图像添加到PDF的设定位置上
+
+home.watermark.title=添加水印
+home.watermark.desc=在PDF中添加一个自定义的水印。
+
+home.remove-watermark.title=去除水印
+home.remove-watermark.desc=从你的PDF文档中去除水印。
+
+home.permissions.title=更改权限
+home.permissions.desc=改变你的PDF文档的权限。
+
+home.removePages.title=删除
+home.removePages.desc=从你的PDF文档中删除不需要的页面。
+
+home.addPassword.title=添加密码
+home.addPassword.desc=用密码来加密你的PDF文档。
+
+home.removePassword.title=删除密码
+home.removePassword.desc=从你的PDF文档中移除密码保护。
+
+home.compressPdfs.title=压缩
+home.compressPdfs.desc=压缩PDF文件以减少其文件大小。
+
+home.changeMetadata.title=更改元数据
+home.changeMetadata.desc=更改/删除/添加PDF文档的元数据。
+
+home.fileToPDF.title=将文件转换为PDF文件
+home.fileToPDF.desc=将几乎所有文件转换为PDF（DOCX、PNG、XLS、PPT、TXT等）
+
+home.ocr.title=运行OCR/清理扫描
+home.ocr.desc=清理和检测PDF中的文本图像，并将其重新添加为文本。
+
+home.extractImages.title=提取图像
+home.extractImages.desc=从PDF中提取所有的图像并将其保存到压缩包中。
+
+home.pdfToPDFA.title=PDF To PDF/A
+home.pdfToPDFA.desc=将PDF转换为PDF/A以便长期保存
+
+home.PDFToWord.title=PDF to Word
+home.PDFToWord.desc=将PDF转换为Word格式（DOC、DOCX和ODT）。
+
+home.PDFToPresentation.title=PDF To Presentation
+home.PDFToPresentation.desc=将PDF转换成演示文稿格式（PPT、PPTX和ODP）。
+
+home.PDFToText.title=PDF To Text/RTF
+home.PDFToText.desc=将PDF转换为文本或RTF格式
+
+home.PDFToHTML.title=PDF To HTML
+home.PDFToHTML.desc=将PDF转换为HTML格式
+
+home.PDFToXML.title=PDF To XML
+home.PDFToXML.desc=将PDF转换为XML格式
+
+home.ScannerImageSplit.title=检测/分割扫描的照片
+home.ScannerImageSplit.desc=从一张照片/PDF中分割出多张照片
+
+home.sign.title=\u6807\u5FD7
+home.sign.desc=\u901A\u8FC7\u7ED8\u56FE\u3001\u6587\u672C\u6216\u56FE\u50CF\u5411 PDF \u6DFB\u52A0\u7B7E\u540D
+
+home.flatten.title=\u5C55\u5E73
+home.flatten.desc=\u4ECE PDF \u4E2D\u5220\u9664\u6240\u6709\u4EA4\u4E92\u5143\u7D20\u548C\u8868\u5355
+
+home.repair.title=\u4FEE\u590D
+home.repair.desc=\u5C1D\u8BD5\u4FEE\u590D\u635F\u574F/\u635F\u574F\u7684 PDF
+
+home.removeBlanks.title=\u5220\u9664\u7A7A\u767D\u9875
+home.removeBlanks.desc=\u68C0\u6D4B\u5E76\u5220\u9664\u6587\u6863\u4E2D\u7684\u7A7A\u767D\u9875
+
+home.compare.title=\u6BD4\u8F83
+home.compare.desc=\u6BD4\u8F83\u5E76\u663E\u793A 2 \u4E2A PDF \u6587\u6863\u4E4B\u95F4\u7684\u5DEE\u5F02
+
+downloadPdf=\u4E0B\u8F7DPDF
+text=\u6587\u672C
+font=\u5B57\u4F53
+
+removeBlanks.title=\u5220\u9664\u7A7A\u767D
+removeBlanks.header=\u5220\u9664\u7A7A\u767D\u9875
+removeBlanks.threshold=\u9608\u503C\uFF1A
+removeBlanks.thresholdDesc=\u786E\u5B9A\u767D\u8272\u50CF\u7D20\u5FC5\u987B\u6709\u591A\u767D\u7684\u9608\u503C
+removeBlanks.whitePercent=\u767D\u8272\u767E\u5206\u6BD4\uFF08%\uFF09\uFF1A
+removeBlanks.whitePercentDesc=\u5FC5\u987B\u4E3A\u767D\u8272\u624D\u80FD\u5220\u9664\u7684\u9875\u9762\u767E\u5206\u6BD4
+removeBlanks.submit=\u5220\u9664\u7A7A\u767D
+
+compare.title=\u6BD4\u8F83
+compare.header=\u6BD4\u8F83 PDF
+compare.document.1=\u6587\u6863 1
+compare.document.2=\u6587\u6863 2
+compare.submit=\u6BD4\u8F83
+
+sign.title=\u7B7E\u540D
+sign.header=\u7B7E\u7F72 PDF
+sign.upload=\u4E0A\u4F20\u56FE\u7247
+sign.draw=\u7ED8\u5236\u7B7E\u540D
+sign.text=\u6587\u672C\u8F93\u5165
+sign.clear=\u6E05\u9664
+sign.add=\u6DFB\u52A0
+
+repair.title=\u4FEE\u590D
+repair.header=\u4FEE\u590D PDF
+repair.submit=\u4FEE\u590D
+
+flatten.title=\u5C55\u5E73
+flatten.header=\u5C55\u5E73 PDF
+flatten.submit=\u5C55\u5E73
+
+ScannerImageSplit.selectText.1=角度阈值：
+ScannerImageSplit.selectText.2=设置图像被旋转所需的最小绝对角度（默认：10）。
+ScannerImageSplit.selectText.3=公差：
+ScannerImageSplit.selectText.4=确定估计背景颜色周围的颜色变化范围（默认值：30）。
+ScannerImageSplit.selectText.5=最小面积：
+ScannerImageSplit.selectText.6=设置照片的最小面积阈值（默认：10000）。
+ScannerImageSplit.selectText.7=最小轮廓面积：
+ScannerImageSplit.selectText.8=设置照片的最小轮廓面积阈值。
+ScannerImageSplit.selectText.9=边框尺寸：
+ScannerImageSplit.selectText.10=设置添加和删除的边框大小，以防止输出中出现白边（默认值：1）。
+
+navbar.settings=设置
+settings.title=设置
+settings.update=可更新
+settings.appVersion=应用程序版本：
+settings.downloadOption.title=选择下载选项（单个文件非压缩文件）：
+settings.downloadOption.1=在同一窗口打开
+settings.downloadOption.2=在新窗口中打开
+settings.downloadOption.3=下载文件
+settings.zipThreshold=当下载的文件数量超过限制时，将文件压缩。
+
+
+                            
+                            
+#OCR
+ocr.title=OCR/扫描清理
+ocr.header=清理扫描件/OCR（光学字符识别）。
+ocr.selectText.1=选择要在PDF中检测的语言（列出的语言是目前检测到的）：
+ocr.selectText.2=生成包含OCR文本的文本文件，与OCR编辑的PDF一起。
+ocr.selectText.3=通过将页面旋转回原位来纠正偏斜的扫描角度
+ocr.selectText.4=清理页面，降低OCR在噪点中识别到文本的可能。(没有输出变化)
+ocr.selectText.5=清洁页面，降低OCR在噪点中识别到文本的可能，保持输出的清洁。
+ocr.selectText.6=忽略有交互式文本的页面，只对有图像的页面进行OCR。
+ocr.selectText.7=强制OCR，将OCR每个页面，删除所有的原始文本元素。
+ocr.selectText.8=Normal (如果PDF包含文本，将出现错误)
+ocr.selectText.9=额外设置
+ocr.selectText.10=OCR模式
+ocr.selectText.11=OCR后移除图像（移除所有图像，只有在转换步骤中才有用）。
+ocr.selectText.12=渲染类型（高级）
+ocr.help=请阅读此文档，了解如何将其用于其他语言和/或不在docker中使用。
+ocr.credit=此服务使用OCRmyPDF和Tesseract进行OCR。
+ocr.submit=用OCR处理PDF
+
+
+
+extractImages.title=提取图像
+extractImages.header=提取图像
+extractImages.selectText=选择图像格式，将提取的图像转换为
+extractImages.submit=提取
+
+
+#File to PDF
+fileToPDF.title=文件转换为PDF
+fileToPDF.header=将任何文件转换为PDF。
+fileToPDF.credit=本服务使用LibreOffice和Unoconv进行文件转换。
+fileToPDF.supportedFileTypes=支持的文件类型应该包括以下几种，但是，对于支持的格式的完整更新列表，请参考LibreOffice文档。
+fileToPDF.submit=转换为 PDF
+
+
+#compress
+compress.title=压缩
+compress.header=压缩PDF
+compress.credit=此服务使用OCRmyPDF进行PDF压缩/优化。
+compress.selectText.1=优化水平：
+compress.selectText.2=0 (无优化)
+compress.selectText.3=1 (默认，无损优化)
+compress.selectText.4=2 (有损优化)
+compress.selectText.5=3 (有损优化，更激进)
+compress.selectText.6=启用快速网络视图（线性化PDF）。
+compress.selectText.7=启用有损的JBIG2编码
+compress.submit=压缩
+
+
+#Add image
+addImage.title=添加图像
+addImage.header=添加图片到PDF (Work in progress)
+addImage.everyPage=每一页？
+addImage.submit=添加图片
+
+
+#merge
+merge.title=合并
+merge.header=合并多个PDF（2个以上）。
+merge.submit=合并
+
+#pdfOrganiser
+pdfOrganiser.title=页面排序
+pdfOrganiser.header=PDF页面排序
+pdfOrganiser.submit=重新排列页面
+
+#multiTool
+multiTool.title=PDF多功能工具
+multiTool.header=PDF多功能工具
+
+
+#pageRemover
+pageRemover.title=删除页面
+pageRemover.header=PDF页面移除器
+pageRemover.pagesToDelete=要删除的页面（输入一个用逗号分隔的页码列表）：
+pageRemover.submit=删除页面
+
+#rotate
+rotate.title=旋转PDF
+rotate.header=旋转PDF
+rotate.selectAngle=选择旋转角度（以90度的倍数）：
+rotate.submit=旋转
+
+
+
+
+#merge
+split.title=拆分PDF
+split.header=拆分PDF
+split.desc.1=选择希望进行分割的页数
+split.desc.2=如选择1,3,7-8将把一个10页的文件分割成6个独立的PDF：
+split.desc.3=Document #1: Page 1
+split.desc.4=Document #2: Page 2 and 3
+split.desc.5=Document #3: Page 4, 5 and 6
+split.desc.6=Document #4: Page 7
+split.desc.7=Document #5: Page 8
+split.desc.8=Document #6: Page 9 and 10
+split.splitPages=输入要分割的页面：
+split.submit=拆分
+
+
+#merge
+imageToPDF.title=图片转PDF
+imageToPDF.header=图像转为PDF
+imageToPDF.submit=转换
+imageToPDF.selectText.1=拉伸至适合的尺寸
+imageToPDF.selectText.2=自动旋转PDF
+imageToPDF.selectText.3=多文件逻辑（仅在处理多个图像时启用）
+imageToPDF.selectText.4=合并成一个PDF文件
+imageToPDF.selectText.5=转换为独立的PDF文件
+                                   
+#pdfToImage
+pdfToImage.title=PDF to Image
+pdfToImage.header=PDF转图片
+pdfToImage.selectText=图像格式
+pdfToImage.singleOrMultiple=图像结果类型
+pdfToImage.single=单张图片
+pdfToImage.multi=多张图片
+pdfToImage.colorType=颜色类型
+pdfToImage.color=颜色
+pdfToImage.grey=灰度
+pdfToImage.blackwhite=黑白（可能会丢失数据！）。
+pdfToImage.submit=转换
+
+#addPassword
+addPassword.title=添加密码
+addPassword.header=添加密码（加密）。
+addPassword.selectText.1=选择要加密的PDF。
+addPassword.selectText.2=密码
+addPassword.selectText.3=加密密钥长度
+addPassword.selectText.4=值越高越强，但值越低兼容性越好。
+addPassword.selectText.5=要设置的权限
+addPassword.selectText.6=防止文件的拼接。
+addPassword.selectText.7=防止内容提取
+addPassword.selectText.8=防止为可访问性提取内容
+addPassword.selectText.9=防止填写表格
+addPassword.selectText.10=防止修改
+addPassword.selectText.11=防止修改注释
+addPassword.selectText.12=防止打印
+addPassword.selectText.13=防止打印不同的格式
+addPassword.submit=加密
+
+#watermark
+watermark.title=添加水印
+watermark.header=添加水印
+watermark.selectText.1=选择要添加水印的PDF：
+watermark.selectText.2=水印文本：
+watermark.selectText.3=字体大小：
+watermark.selectText.4=旋转（0-360）：
+watermark.selectText.5=widthSpacer（水平方向上每个水印之间的空间）：
+watermark.selectText.6=heightSpacer（每个水印之间的垂直空间）：
+watermark.selectText.7=透明度（0% - 100%）：
+watermark.submit=添加水印
+
+#remove-watermark
+remove-watermark.title=去除水印
+remove-watermark.header=去除水印
+remove-watermark.selectText.1=选择要去除水印的PDF：
+remove-watermark.selectText.2=水印文本：
+remove-watermark.submit=移除水印
+
+#Change permissions
+permissions.title=更改权限
+permissions.header=改变权限
+permissions.warning=警告，为了使这些权限不能被改变，建议通过添加密码页面设置密码。
+permissions.selectText.1=选择PDF来改变权限
+permissions.selectText.2=要设置的权限
+permissions.selectText.3=防止文件的拼接
+permissions.selectText.4=防止内容提取
+permissions.selectText.5=防止提取内容的可访问性
+permissions.selectText.6=防止填写表格
+permissions.selectText.7=防止修改
+permissions.selectText.8=防止修改注释
+permissions.selectText.9=防止打印
+permissions.selectText.10=防止打印不同的格式
+permissions.submit=改变
+
+#remove password
+removePassword.title=删除密码
+removePassword.header=移除密码（解密）。
+removePassword.selectText.1=选择要解密的PDF
+removePassword.selectText.2=密码
+removePassword.submit=删除
+
+changeMetadata.title=更改元数据
+changeMetadata.header=更改元数据
+changeMetadata.selectText.1=请编辑你想要改变的变量。
+changeMetadata.selectText.2=删除所有元数据
+changeMetadata.selectText.3=显示自定义元数据：
+changeMetadata.author=作者：
+changeMetadata.creationDate=创建日期（yyyy/MM/dd HH:mm:ss）：
+changeMetadata.creator=创建者：
+changeMetadata.keywords=关键词：
+changeMetadata.modDate=修改日期（yyyy/MM/dd HH:mm:ss）：
+changeMetadata.producer=生产者：
+changeMetadata.subject=主题：
+changeMetadata.title=标题：
+changeMetadata.trapped=被困：
+changeMetadata.selectText.4=其他元数据：
+changeMetadata.selectText.5=添加自定义元数据条目
+changeMetadata.submit=更改
+
+xlsToPdf.title=Excel转PDF
+xlsToPdf.header=Excel转PDF
+xlsToPdf.selectText.1=选择要转换的XLS或XLSX Excel表格
+xlsToPdf.convert=转换
+
+
+
+
+pdfToPDFA.title=PDF To PDF/A
+pdfToPDFA.header=PDF to PDF/A
+pdfToPDFA.credit=此服务使用OCRmyPDF进行PDF/A转换
+pdfToPDFA.submit=转换
+
+
+
+PDFToWord.title=PDF to Word
+PDFToWord.header=将PDF转换成Word
+PDFToWord.selectText.1=输出文件格式
+PDFToWord.credit=此服务使用LibreOffice进行文件转换。
+PDFToWord.submit=转换
+
+PDFToPresentation.title=PDF To Presentation
+PDFToPresentation.header=将PDF转为演示文稿
+PDFToPresentation.selectText.1=输出文件格式
+PDFToPresentation.credit=该服务使用LibreOffice进行文件转换。
+PDFToPresentation.submit=转换
+
+
+PDFToText.title=PDF To Text/RTF
+PDFToText.header=将PDF转换成文本/RTF
+PDFToText.selectText.1=输出文件格式
+PDFToText.credit=该服务使用LibreOffice进行文件转换。
+PDFToText.submit=转换
+
+
+PDFToHTML.title=PDF To HTML
+PDFToHTML.header=将PDF转换成HTML
+PDFToHTML.credit=此服务使用LibreOffice进行文件转换。
+PDFToHTML.submit=转换
+
+PDFToXML.title=PDF To XML
+PDFToXML.header=将PDF转换为XML
+PDFToXML.credit=此服务使用LibreOffice进行文件转换。
+PDFToXML.submit=转换

src/main/resources/static/css/dark-mode.css

@@ -1,29 +1,39 @@
 /* Dark Mode Styles */
 body {
-    background-color: #333  !important;
-    color: #fff  !important;
+    --body-background-color: 51, 51, 51;
+    --base-font-color: 255, 255, 255;
+    background-color: rgb(var(--body-background-color)) !important;
+    color: rgb(var(--base-font-color))  !important;
 }
 
 .dark-card {
-  background-color: #333 !important;
-  color: white !important;
+  background-color: rgb(var(--body-background-color)) !important;
+  color: rgb(var(--base-font-color)) !important;
 }
 .jumbotron {
   background-color: #222; /* or any other dark color */
-  color: #fff !important; /* or any other light color */
+  color: rgb(var(--base-font-color)) !important; /* or any other light color */
 }
 
 .list-group {
   background-color: #222 !important;
-  color: fff !important;
+  color: rgb(var(--base-font-color)) !important;
 }
 .list-group-item {
   background-color: #222 !important;
-  color: fff !important;
+  color: rgb(var(--base-font-color)) !important;
 }
 #support-section {
    background-color: #444 !important;
 }
 
+#pages-container-wrapper {
+  --background-color: rgba(255, 255, 255, 0.046) !important;
+  --scroll-bar-color: #4c4c4c !important;
+  --scroll-bar-thumb: #d3d3d3 !important;
+  --scroll-bar-thumb-hover: rgb(var(--base-font-color)) !important;
+}
 
-
+.favorite-icon img {
+    filter: brightness(0) invert(1) !important;
+}

src/main/resources/static/css/dragdrop.css

@@ -0,0 +1,78 @@
+#drag-container {
+    position: fixed;
+    display:flex;
+    inset: 0;
+    pointer-events: none;
+    z-index: 10000;
+    visibility: hidden;
+}
+
+#drag-container:not(:empty) {
+    visibility: visible;
+}
+
+#drag-container .dragged-img {
+    position: fixed;
+    max-width: 200px;
+    max-height: 200px;
+    box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.58);
+    transform-origin: top left;
+}
+
+.drag-manager_dragging {
+    width: 0px;
+    visibility: hidden;
+}
+
+.drag-manager_draghover {
+    width: 375px !important;
+}
+
+.drag-manager_draghover .insert-file-button-container {
+    display: none !important;
+}
+
+.drag-manager_draghover .button-container {
+    visibility: hidden !important;
+}
+
+html[lang-direction=ltr] .drag-manager_draghover img {
+    left: calc(50% + 62.5px) !important;
+}
+
+html[lang-direction=rtl] .drag-manager_draghover img {
+    left: 125px
+}
+
+.drag-manager_dragging-container .hide-on-drag {
+    display: none !important;
+}
+
+.drag-manager_endpoint {
+    width: 80px;
+    height: 100%;
+    background-color: #FFFFFF10;
+    transition: width 0.1s;
+    animation: end-drop-expand .3s ease;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.drag-manager_endpoint svg {
+    width: 50px;
+    height: 50px;
+}
+
+.drag-manager_endpoint.drag-manager_draghover {
+    width: 150px !important;
+}
+
+@keyframes end-drop-expand {
+    from {
+        width: 0;
+    }
+    to {
+        width: 80px;
+    }
+}

src/main/resources/static/css/general.css

@@ -16,11 +16,14 @@
 html[lang-direction=ltr] * {
     direction: ltr;
 }
-
 html[lang-direction=rtl] * {
     direction: rtl;
     text-align: right;
 }
+.ignore-rtl {
+    direction: ltr !important;
+    text-align: left !important;
+}
 
 .align-top {
     position: absolute;
@@ -31,7 +34,27 @@ html[lang-direction=rtl] * {
     right: 0;
     top: 50%;
 }
+
+.align-center-left {
+    position: absolute;
+    left: 0;
+    top: 50%;
+}
+
 .align-bottom {
     position: absolute;
     bottom: 0;
 }
+
+.btn-group > label:first-of-type {
+    border-top-left-radius: 0.25rem !important;
+    border-bottom-left-radius: 0.25rem !important;
+}
+
+.margin-auto-parent {
+    width: 100%;
+    display: flex;
+}
+.margin-center {
+    margin: 0 auto;
+}

src/main/resources/static/css/imageHighlighter.css

@@ -0,0 +1,40 @@
+
+#image-highlighter {
+    position: fixed;
+    display:flex;
+    inset: 0;
+    z-index: 10000;
+    background-color: rgba(0, 0, 0, 0);
+    visibility: hidden;
+    align-items: center;
+    justify-content: center;
+    transition: visbility 0.1s linear, background-color 0.1s linear;
+}
+
+#image-highlighter > * {
+    max-width: 80vw;
+    max-height: 80vh;
+    animation: image-highlight .1s linear;
+    transition: transform .1s linear, opacity .1s linear;
+}
+
+#image-highlighter > *.remove {
+    transform: scale(0.8) !important;
+    opacity: 0 !important;
+}
+
+#image-highlighter:not(:empty) {
+    background-color: rgba(0, 0, 0, 0.37);
+    visibility: visible;
+}
+
+@keyframes image-highlight {
+    from {
+        transform: scale(0.8);
+        opacity: 0;
+    }
+    to {
+        transform: scale(1);
+        opacity: 1;
+    }
+}

src/main/resources/static/css/light-mode.css

@@ -0,0 +1,5 @@
+/* Dark Mode Styles */
+body {
+    --body-background-color: 255, 255, 255;
+    --base-font-color: 33, 37, 41;
+}

src/main/resources/static/css/pdfActions.css

@@ -0,0 +1,87 @@
+
+.pdf-actions_button-container {
+    z-index: 2;
+    display:flex;
+    opacity: 0;
+    transition: opacity 0.1s linear;
+}
+
+.pdf-actions_container:hover .pdf-actions_button-container {
+    opacity: 1;
+}
+
+.pdf-actions_button-container > * {
+    padding: 0.25rem 0.5rem;
+    margin: 3px;
+    display: block;
+}
+
+.pdf-actions_container svg {
+    width: 16px;
+    height: 16px;
+}
+.pdf-actions_container:nth-child(1) .pdf-actions_move-left-button {
+    display: none;
+}
+.pdf-actions_container:last-child .pdf-actions_move-right-button {
+    display: none;
+}
+
+/* "insert pdf" buttons that appear on the right when hover */
+.pdf-actions_insert-file-button-container {
+    translate: 0 -50%;
+    width: 80px;
+    height: 100%;
+    
+    z-index: 1;
+    opacity: 0;
+    transition: opacity 0.2s;
+}
+
+.pdf-actions_insert-file-button-container.left {
+    left: -20px;
+}
+
+.pdf-actions_insert-file-button-container.right {
+    right: -20px;
+}
+
+html[lang-direction=ltr] .pdf-actions_insert-file-button-container.right {
+    display:none;
+}
+
+html[lang-direction=rtl] .pdf-actions_insert-file-button-container.left {
+    display:none;
+}
+
+.pdf-actions_insert-file-button-container.left .pdf-actions_insert-file-button {
+    left: 0;
+    translate: 0 -50%;
+}
+
+.pdf-actions_insert-file-button-container.right .pdf-actions_insert-file-button {
+    right: 0;
+    translate: 0 -50%;
+}
+
+html[lang-direction=ltr] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.right {
+    display: block;
+}
+
+
+html[lang-direction=rtl] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.left {
+    display: block;
+}
+
+.pdf-actions_insert-file-button-container:hover {
+    opacity: 1;
+    transition: opacity 0.05s;
+}
+.pdf-actions_insert-file-button {
+    position: absolute;
+    top: 50%;
+    right: 50%;
+    translate: 50% -50%;
+    aspect-ratio: 1;
+    border-radius: 100px;
+}

src/main/resources/static/css/rainbow-mode.css

@@ -0,0 +1,37 @@
+/* Rainbow Mode Styles */
+body {
+    background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%);
+    color: #fff !important;
+    --body-background-color: 255, 255, 255;
+    --base-font-color: 33, 37, 41;
+}
+
+.dark-card {
+    background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important;
+    color: white !important;
+}
+.jumbotron {
+    background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%);
+    color: #fff !important;
+}
+
+.list-group {
+    background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important;
+    color: fff !important;
+}
+.list-group-item {
+    background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important;
+    color: fff !important;
+}
+#support-section {
+   background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important;
+}
+
+
+#pages-container-wrapper {
+  --background-color: rgba(255, 255, 255, 0.046) !important;
+  --scroll-bar-color: #4c4c4c !important;
+  --scroll-bar-thumb: #d3d3d3 !important;
+  --scroll-bar-thumb-hover: #ffffff !important;
+}
+    

src/main/resources/static/css/tab-container.css

@@ -0,0 +1,26 @@
+
+.tab-group {
+
+}
+
+.tab-container {
+    display: none;
+}
+.tab-container.active {
+    display: block;
+    border: 1px solid rgba(var(--base-font-color), 0.25);
+    padding: 15px;
+}
+.tab-buttons > button {
+    margin-bottom: -1px;
+    background: 0 0;
+    border: 1px solid transparent;
+    color: rgb(var(--base-font-color));
+    
+    border-top-left-radius: 0.25rem;
+    border-top-right-radius: 0.25rem;
+}
+.tab-buttons > button.active {
+    background-color: rgb(var(--body-background-color));
+    border-color: rgba(var(--base-font-color), 0.25) rgba(var(--base-font-color), 0.25) rgb(var(--body-background-color));
+}

src/main/resources/static/images/blank-file.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file" viewBox="0 0 16 16">
+  <path d="M4 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H4zm0 1h8a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1z"/>
+</svg>

src/main/resources/static/images/flags/cn.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-cn" viewBox="0 0 640 480">
+  <defs>
+    <path id="a" fill="#ff0" d="M-.6.8 0-1 .6.8-1-.3h2z"/>
+  </defs>
+  <path fill="#ee1c25" d="M0 0h640v480H0z"/>
+  <use xlink:href="#a" width="30" height="20" transform="matrix(71.9991 0 0 72 120 120)"/>
+  <use xlink:href="#a" width="30" height="20" transform="matrix(-12.33562 -20.5871 20.58684 -12.33577 240.3 48)"/>
+  <use xlink:href="#a" width="30" height="20" transform="matrix(-3.38573 -23.75998 23.75968 -3.38578 288 95.8)"/>
+  <use xlink:href="#a" width="30" height="20" transform="matrix(6.5991 -23.0749 23.0746 6.59919 288 168)"/>
+  <use xlink:href="#a" width="30" height="20" transform="matrix(14.9991 -18.73557 18.73533 14.99929 240 216)"/>
+</svg>

src/main/resources/static/images/flags/es-ct.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es-ct" viewBox="0 0 640 480">
+  <path fill="#fcdd09" d="M0 0h640v480H0z"/>
+  <path stroke="#da121a" stroke-width="60" d="M0 90h810m0 120H0m0 120h810m0 120H0" transform="scale(.79012 .88889)"/>
+</svg>

src/main/resources/static/images/flatten.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   fill="currentColor"
+   class="bi bi-ui-checks"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg826"
+   sodipodi:docname="no-checklist-black.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs830" />
+  <sodipodi:namedview
+     id="namedview828"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="55.8125"
+     inkscape:cx="12.452408"
+     inkscape:cy="11.950728"
+     inkscape:current-layer="svg826" />
+  <path
+     d="M 7,2.5 C 7,2.2238576 7.2238576,2 7.5,2 h 7 C 14.776142,2 15,2.2238576 15,2.5 v 1 C 15,3.7761424 14.776142,4 14.5,4 h -7 C 7.2238576,4 7,3.7761424 7,3.5 Z M 2,1 C 0.8954305,1 0,1.8954305 0,3 V 5 C 0,6.1045695 0.8954305,7 2,7 H 4 C 5.1045695,7 6,6.1045695 6,5 V 3 C 6,1.8954305 5.1045695,1 4,1 Z M 2,9 C 0.8954305,9 0,9.8954305 0,11 v 2 c 0,1.104569 0.8954305,2 2,2 h 2 c 1.1045695,0 2,-0.895431 2,-2 V 11 C 6,9.8954305 5.1045695,9 4,9 Z M 2.854,5.354 c -0.1953639,0.1958584 -0.5126361,0.1958584 -0.708,0 l -1,-1 C 0.6740002,3.8820002 1.3820002,3.1740002 1.854,3.646 L 2.5,4.293 4.146,2.646 C 4.6179998,2.1740002 5.3259998,2.8820002 4.854,3.354 Z m 0,8 c -0.1953639,0.195858 -0.5126361,0.195858 -0.708,0 l -1,-1 C 0.67400022,11.882 1.3820002,11.174 1.854,11.646 L 2.5,12.293 4.146,10.646 c 0.4719998,-0.472 1.1799998,0.236 0.708,0.708 z M 7,10.5 C 7,10.223858 7.2238576,10 7.5,10 h 7 c 0.276142,0 0.5,0.223858 0.5,0.5 v 1 c 0,0.276142 -0.223858,0.5 -0.5,0.5 h -7 C 7.2238576,12 7,11.776142 7,11.5 Z m 0,-5 C 7,5.2238576 7.2238576,5 7.5,5 h 5 c 0.666666,0 0.666666,1 0,1 h -5 C 7.2238576,6 7,5.7761424 7,5.5 Z m 0,8 C 7,13.223858 7.2238576,13 7.5,13 h 5 c 0.666666,0 0.666666,1 0,1 h -5 C 7.2238576,14 7,13.776142 7,13.5 Z"
+     id="path824"
+     sodipodi:nodetypes="sssssssssssssssssssssssssssccscccscccscccscsssssssssssssssssssss"
+     style="fill:#000000" />
+  <path
+     d="m 0.14896862,0.16984545 c 0.1879493,-0.2023109 0.51141627,-0.22131574 0.7066285,-0.026004 L 15.795251,15.091111 c 0.471284,0.471524 -0.209339,1.204159 -0.680625,0.732632 L 0.17497212,0.87647378 C -0.02024026,0.68116189 -0.03898081,0.37215613 0.14896862,0.16984545 Z"
+     id="path937"
+     sodipodi:nodetypes="ssssss"
+     style="fill:#000000" />
+</svg>

src/main/resources/static/images/scales.svg

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:cc="http://web.resource.org/cc/"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    id="Layer_1"
+    style="enable-background:new 0 0 333.33 287.889"
+    xml:space="preserve"
+    viewBox="0 0 333.33 287.889"
+    version="1.1"
+    y="0px"
+    x="0px"
+  >
+<g
+    >
+	<polygon
+        style="fill:none"
+        points="19.374 136.98 98.932 136.98 59.083 18.273"
+    />
+	<polygon
+        style="fill:none"
+        points="235.57 191.34 315.13 191.34 275.28 72.635"
+    />
+	<path
+        d="m318.63 191.34l-42.85-127.63 6.892 1.386c-0.563 2.401 0.902 4.816 3.304 5.41 2.419 0.599 4.869-0.877 5.47-3.298 0.602-2.42-0.878-4.868-3.301-5.469-2.095-0.518-4.205 0.523-5.125 2.384l-58.16-17.14-54.361-16.029-0.509-9.298c5.801-0.21 10.444-4.966 10.444-10.818 0.01-5.985-4.85-10.838-10.84-10.838-5.985 0-10.837 4.853-10.837 10.838 0 5.288 3.79 9.686 8.8 10.64l-0.477 8.708-53.87-10.838-60.542-12.179c0.08-2.094-1.315-4.028-3.429-4.552-2.419-0.599-4.867 0.879-5.466 3.299-0.599 2.421 0.877 4.869 3.297 5.468 2.418 0.598 4.865-0.876 5.468-3.292l5.889 1.736-42.537 127.15h-15.88s9.255 20.324 58.069 20.324 54.804-20.324 54.804-20.324h-10.446l-42.535-126.72 51.784 15.269 54.78 16.151-11.76 214.82s0.461 9.693-14.772 12.002c-15.234 2.308-34.621 3.229-43.853 8.309-9.233 5.078-10.617 11.078-10.617 11.078h166.64s-1.386-6-10.615-11.078c-9.234-5.079-28.621-6.001-43.854-8.309-15.233-2.309-14.772-12.002-14.772-12.002l-11.72-213.83 52.188 10.499 51.506 10.362-42.755 127.82h-11.623s9.255 20.324 58.068 20.324 54.804-20.324 54.804-20.324h-14.7zm-219.7-54.36h-79.558l39.709-118.71 39.849 118.71zm136.64 54.36l39.708-118.71 39.85 118.71h-79.56z"
+    />
+</g
+  >
+<metadata
+    ><rdf:RDF
+      ><cc:Work
+        ><dc:format
+          >image/svg+xml</dc:format
+        ><dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        /><cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        /><dc:publisher
+          ><cc:Agent
+              rdf:about="http://openclipart.org/"
+            ><dc:title
+              >Openclipart</dc:title
+            ></cc:Agent
+          ></dc:publisher
+        ><dc:title
+          >scales of justice</dc:title
+        ><dc:date
+          >2009-06-26T04:35:18</dc:date
+        ><dc:description
+        /><dc:source
+          >https://openclipart.org/detail/26849/scales-of-justice-by-johnny_automatic</dc:source
+        ><dc:creator
+          ><cc:Agent
+            ><dc:title
+              >johnny_automatic</dc:title
+            ></cc:Agent
+          ></dc:creator
+        ><dc:subject
+          ><rdf:Bag
+            ><rdf:li
+              >justice</rdf:li
+            ><rdf:li
+              >law</rdf:li
+            ><rdf:li
+              >measurement</rdf:li
+            ><rdf:li
+              >scales</rdf:li
+            ><rdf:li
+              >silhouette</rdf:li
+            ><rdf:li
+              >weight</rdf:li
+            ></rdf:Bag
+          ></dc:subject
+        ></cc:Work
+      ><cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        ><cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        /><cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        /><cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        /></cc:License
+      ></rdf:RDF
+    ></metadata
+  ></svg
+>

src/main/resources/static/images/scanner.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 32 32" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+<path class="st0" d="M30,20H3v6c0,1.1,0.9,2,2,2h23c1.1,0,2-0.9,2-2V20z"/>
+<line class="st0" x1="30" y1="20" x2="3" y2="4"/>
+<line class="st0" x1="7" y1="24" x2="10" y2="24"/>
+</svg>

src/main/resources/static/images/sign.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-vector-pen" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M10.646.646a.5.5 0 0 1 .708 0l4 4a.5.5 0 0 1 0 .708l-1.902 1.902-.829 3.313a1.5 1.5 0 0 1-1.024 1.073L1.254 14.746 4.358 4.4A1.5 1.5 0 0 1 5.43 3.377l3.313-.828L10.646.646zm-1.8 2.908-3.173.793a.5.5 0 0 0-.358.342l-2.57 8.565 8.567-2.57a.5.5 0 0 0 .34-.357l.794-3.174-3.6-3.6z"/>
+  <path fill-rule="evenodd" d="M2.832 13.228 8 9a1 1 0 1 0-1-1l-4.228 5.168-.026.086.086-.026z"/>
+</svg>

src/main/resources/static/images/star-fill.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-star-fill" viewBox="0 0 16 16">
+  <path d="M3.612 15.443c-.386.198-.824-.149-.746-.592l.83-4.73L.173 6.765c-.329-.314-.158-.888.283-.95l4.898-.696L7.538.792c.197-.39.73-.39.927 0l2.184 4.327 4.898.696c.441.062.612.636.282.95l-3.522 3.356.83 4.73c.078.443-.36.79-.746.592L8 13.187l-4.389 2.256z"/>
+</svg>

src/main/resources/static/images/star.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-star" viewBox="0 0 16 16">
+  <path d="M2.866 14.85c-.078.444.36.791.746.593l4.39-2.256 4.389 2.256c.386.198.824-.149.746-.592l-.83-4.73 3.522-3.356c.33-.314.16-.888-.282-.95l-4.898-.696L8.465.792a.513.513 0 0 0-.927 0L5.354 5.12l-4.898.696c-.441.062-.612.636-.283.95l3.523 3.356-.83 4.73zm4.905-2.767-3.686 1.894.694-3.957a.565.565 0 0 0-.163-.505L1.71 6.745l4.052-.576a.525.525 0 0 0 .393-.288L8 2.223l1.847 3.658a.525.525 0 0 0 .393.288l4.052.575-2.906 2.77a.565.565 0 0 0-.163.506l.694 3.957-3.686-1.894a.503.503 0 0 0-.461 0z"/>
+</svg>

src/main/resources/static/images/wrench.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-wrench" viewBox="0 0 16 16">
+  <path d="M.102 2.223A3.004 3.004 0 0 0 3.78 5.897l6.341 6.252A3.003 3.003 0 0 0 13 16a3 3 0 1 0-.851-5.878L5.897 3.781A3.004 3.004 0 0 0 2.223.1l2.141 2.142L4 4l-1.757.364L.102 2.223zm13.37 9.019.528.026.287.445.445.287.026.529L15 13l-.242.471-.026.529-.445.287-.287.445-.529.026L13 15l-.471-.242-.529-.026-.287-.445-.445-.287-.026-.529L11 13l.242-.471.026-.529.445-.287.287-.445.529-.026L13 11l.471.242z"/>
+</svg>

src/main/resources/static/js/draggable-utils.js

@@ -0,0 +1,265 @@
+const DraggableUtils = {
+
+    boxDragContainer: document.getElementById('box-drag-container'),
+    pdfCanvas: document.getElementById('pdf-canvas'),
+    nextId: 0,
+    pdfDoc: null,
+    pageIndex: 0,
+    documentsMap: new Map(),
+
+    init() {
+        interact('.draggable-canvas')
+        .draggable({
+            listeners: {
+                move: (event) => {
+                    const target = event.target;
+                    const x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx;
+                    const y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
+
+                    target.style.transform = `translate(${x}px, ${y}px)`;
+                    target.setAttribute('data-x', x);
+                    target.setAttribute('data-y', y);
+
+                    this.onInteraction(target);
+                },
+            },
+        })
+        .resizable({
+            edges: { left: true, right: true, bottom: true, top: true },
+            listeners: {
+                move: (event) => {
+                    var target = event.target
+                    var x = (parseFloat(target.getAttribute('data-x')) || 0)
+                    var y = (parseFloat(target.getAttribute('data-y')) || 0)
+
+                    // update the element's style
+                    target.style.width = event.rect.width + 'px'
+                    target.style.height = event.rect.height + 'px'
+
+                    // translate when resizing from top or left edges
+                    x += event.deltaRect.left
+                    y += event.deltaRect.top
+
+                    target.style.transform = 'translate(' + x + 'px,' + y + 'px)'
+
+                    target.setAttribute('data-x', x)
+                    target.setAttribute('data-y', y)
+                    target.textContent = Math.round(event.rect.width) + '\u00D7' + Math.round(event.rect.height)
+
+                    this.onInteraction(target);
+                },
+            },
+            modifiers: [
+                interact.modifiers.restrictSize({
+                    min: { width: 50, height: 50 },
+                }),
+            ],
+            inertia: true,
+        });
+    },
+    onInteraction(target) {
+        this.boxDragContainer.appendChild(target);
+    },
+
+    createDraggableCanvas() {
+        const createdCanvas = document.createElement('canvas');
+        createdCanvas.id = `draggable-canvas-${this.nextId++}`;
+        createdCanvas.classList.add("draggable-canvas");
+
+        const x = 0;
+        const y = 20;
+        createdCanvas.style.transform = `translate(${x}px, ${y}px)`;
+        createdCanvas.setAttribute('data-x', x);
+        createdCanvas.setAttribute('data-y', y);
+
+        createdCanvas.onclick = e => this.onInteraction(e.target);
+
+        this.boxDragContainer.appendChild(createdCanvas);
+        return createdCanvas;
+    },
+    createDraggableCanvasFromUrl(dataUrl) {
+        return new Promise((resolve) => {
+            var myImage = new Image();
+            myImage.src = dataUrl;
+            myImage.onload = () => {
+                var createdCanvas = this.createDraggableCanvas();
+
+                createdCanvas.width = myImage.width;
+                createdCanvas.height = myImage.height;
+
+                const imgAspect = myImage.width / myImage.height;
+                const pdfAspect = this.boxDragContainer.offsetWidth / this.boxDragContainer.offsetHeight;
+
+                var scaleMultiplier;
+                if (imgAspect > pdfAspect) {
+                    scaleMultiplier = this.boxDragContainer.offsetWidth / myImage.width;
+                } else {
+                    scaleMultiplier = this.boxDragContainer.offsetHeight / myImage.height;
+                }
+
+                var newWidth = createdCanvas.width;
+                var newHeight = createdCanvas.height;
+                if (scaleMultiplier < 1) {
+                    newWidth = newWidth * scaleMultiplier;
+                    newHeight = newHeight * scaleMultiplier;
+                }
+                
+                createdCanvas.style.width = newWidth+"px";
+                createdCanvas.style.height = newHeight+"px";
+
+                var myContext = createdCanvas.getContext("2d");
+                myContext.drawImage(myImage,0,0);
+                resolve(createdCanvas);
+            }
+        })
+    },
+    deleteAllDraggableCanvases() {
+        this.boxDragContainer.querySelectorAll(".draggable-canvas").forEach(el => el.remove());
+    },
+    deleteDraggableCanvas(element) {
+        if (element) {
+            element.remove();
+        }
+    },
+    getLastInteracted() {
+        return this.boxDragContainer.querySelector(".draggable-canvas:last-of-type");
+    },
+
+    storePageContents() {
+        var pagesMap = this.documentsMap.get(this.pdfDoc);
+        if (!pagesMap) {
+            pagesMap = {};
+        }
+        
+        const elements = [...this.boxDragContainer.querySelectorAll(".draggable-canvas")];
+        const draggablesData = elements.map(el => {return{element:el, offsetWidth:el.offsetWidth, offsetHeight:el.offsetHeight}});
+        elements.forEach(el => this.boxDragContainer.removeChild(el));
+
+        pagesMap[this.pageIndex] = draggablesData;
+        pagesMap[this.pageIndex+"-offsetWidth"] = this.pdfCanvas.offsetWidth;
+        pagesMap[this.pageIndex+"-offsetHeight"] = this.pdfCanvas.offsetHeight;
+
+        this.documentsMap.set(this.pdfDoc, pagesMap);
+    },
+    loadPageContents() {
+        var pagesMap = this.documentsMap.get(this.pdfDoc);
+        this.deleteAllDraggableCanvases();
+        if (!pagesMap) {
+            return;
+        }
+        
+        const draggablesData = pagesMap[this.pageIndex];
+        if (draggablesData) {
+            draggablesData.forEach(draggableData => this.boxDragContainer.appendChild(draggableData.element));
+        }
+
+        this.documentsMap.set(this.pdfDoc, pagesMap);
+    },
+
+    async renderPage(pdfDocument, pageIdx) {
+        this.pdfDoc = pdfDocument ? pdfDocument : this.pdfDoc;
+        this.pageIndex = pageIdx;
+
+        // persist 
+        const page = await this.pdfDoc.getPage(this.pageIndex+1);
+
+        // set the canvas size to the size of the page
+        if (page.rotate == 90 || page.rotate == 270) {
+            this.pdfCanvas.width = page.view[3];
+            this.pdfCanvas.height = page.view[2];
+        } else {
+            this.pdfCanvas.width = page.view[2];
+            this.pdfCanvas.height = page.view[3];
+        }
+
+        // render the page onto the canvas
+        var renderContext = {
+            canvasContext: this.pdfCanvas.getContext("2d"),
+            viewport: page.getViewport({ scale: 1 })
+        };
+        await page.render(renderContext).promise;
+
+        //return pdfCanvas.toDataURL();
+    },
+    async incrementPage() {
+        if (this.pageIndex < this.pdfDoc.numPages-1) {
+            this.storePageContents();
+            await this.renderPage(this.pdfDoc, this.pageIndex+1);
+            this.loadPageContents();
+        }
+    },
+    async decrementPage() {
+        if (this.pageIndex > 0) {
+            this.storePageContents();
+            await this.renderPage(this.pdfDoc, this.pageIndex-1);
+            this.loadPageContents();
+        }
+    },
+
+    parseTransform(element) {
+        
+    },
+    async getOverlayedPdfDocument() {
+        const pdfBytes = await this.pdfDoc.getData();
+        const pdfDocModified = await PDFLib.PDFDocument.load(pdfBytes);
+        this.storePageContents();
+
+        const pagesMap = this.documentsMap.get(this.pdfDoc);
+        for (let pageIdx in pagesMap) {
+            if (pageIdx.includes("offset")) {
+                continue;
+            }
+            console.log(typeof pageIdx);
+            
+            const page = pdfDocModified.getPage(parseInt(pageIdx));
+            const draggablesData = pagesMap[pageIdx];
+            const offsetWidth = pagesMap[pageIdx+"-offsetWidth"];
+            const offsetHeight = pagesMap[pageIdx+"-offsetHeight"];
+
+            for (const draggableData of draggablesData) {
+                // embed the draggable canvas
+                const draggableElement = draggableData.element;
+                const response = await fetch(draggableElement.toDataURL());
+                const draggableImgBytes = await response.arrayBuffer();
+                const pdfImageObject = await pdfDocModified.embedPng(draggableImgBytes);
+    
+                // calculate the position in the pdf document
+                const tansform = draggableElement.style.transform.replace(/[^.,-\d]/g, '');
+                const transformComponents = tansform.split(",");
+                const draggablePositionPixels = {
+                    x: parseFloat(transformComponents[0]),
+                    y: parseFloat(transformComponents[1]),
+                    width: draggableData.offsetWidth,
+                    height: draggableData.offsetHeight,
+                };
+                const draggablePositionRelative = {
+                    x: draggablePositionPixels.x / offsetWidth,
+                    y: draggablePositionPixels.y / offsetHeight,
+                    width: draggablePositionPixels.width / offsetWidth,
+                    height: draggablePositionPixels.height / offsetHeight,
+                }
+                const draggablePositionPdf = {
+                    x: draggablePositionRelative.x * page.getWidth(),
+                    y: draggablePositionRelative.y * page.getHeight(),
+                    width: draggablePositionRelative.width * page.getWidth(),
+                    height: draggablePositionRelative.height * page.getHeight(),
+                }
+    
+                // draw the image
+                page.drawImage(pdfImageObject, {
+                    x: draggablePositionPdf.x,
+                    y: page.getHeight() - draggablePositionPdf.y - draggablePositionPdf.height,
+                    width: draggablePositionPdf.width,
+                    height: draggablePositionPdf.height,
+                });
+            }
+        }
+
+        this.loadPageContents();
+        return pdfDocModified;
+    },
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+    DraggableUtils.init();
+});

src/main/resources/static/js/game.js

@@ -0,0 +1,283 @@
+function initializeGame() {
+    const gameContainer = document.getElementById('game-container');
+    const player = document.getElementById('player');
+    
+    let playerSize = gameContainer.clientWidth * 0.0625; // 5% of container width
+    player.style.width = playerSize + 'px';
+    player.style.height = playerSize + 'px';
+    
+    let playerX = gameContainer.clientWidth / 2 - playerSize / 2;
+    let playerY = gameContainer.clientHeight * 0.1;
+    const scoreElement = document.getElementById('score');
+    const levelElement = document.getElementById('level');
+    const livesElement = document.getElementById('lives');
+    const highScoreElement = document.getElementById('high-score');
+
+    let pdfSize = gameContainer.clientWidth * 0.0625; // 5% of container width
+    let projectileWidth = gameContainer.clientWidth * 0.00625; // 0.5% of container width
+    let projectileHeight = gameContainer.clientHeight * 0.01667; // 1% of container height
+
+    let paused = false;
+    const fireRate = 200; // Time between shots in milliseconds
+    let lastProjectileTime = 0;
+    let lives = 3;
+    let highScore = localStorage.getItem('highScore') ? parseInt(localStorage.getItem('highScore')) : 0;
+    updateHighScore();
+
+
+
+    const keysPressed = {};
+    const pdfs = [];
+    const projectiles = [];
+    let score = 0;
+    let level = 1;
+    let pdfSpeed = 1;
+    let gameOver = false;
+
+    function handleKeys() {
+	    if (keysPressed['ArrowLeft']) {
+	        playerX -= 10;
+	    }
+	    if (keysPressed['ArrowRight']) {
+	        playerX += 10;
+	    }
+	    if (keysPressed[' '] && !gameOver) {
+	        const currentTime = new Date().getTime();
+	        if (currentTime - lastProjectileTime >= fireRate) {
+	            shootProjectile();
+	            lastProjectileTime = currentTime;
+	        }
+	    }
+	    updatePlayerPosition();
+	}
+
+
+
+
+    document.addEventListener('keydown', (event) => {
+        if (event.key === ' ') {
+            event.preventDefault();
+        }
+        keysPressed[event.key] = true;
+        handleKeys();
+    });
+
+    document.addEventListener('keyup', (event) => {
+        keysPressed[event.key] = false;
+    });
+
+
+    function updatePlayerPosition() {
+        player.style.left = playerX + 'px';
+        player.style.bottom = playerY + 'px';
+    }
+
+    function updateLives() {
+        livesElement.textContent = 'Lives: ' + lives;
+    }
+
+    function updateHighScore() {
+        highScoreElement.textContent = 'High Score: ' + highScore;
+    }
+
+
+    function shootProjectile() {
+        const projectile = document.createElement('div');
+        projectile.classList.add('projectile');
+        projectile.style.backgroundColor = 'black';
+        projectile.style.width = projectileWidth + 'px';
+        projectile.style.height = projectileHeight + 'px';
+        projectile.style.left = (playerX + playerSize / 2 - projectileWidth / 2) + 'px';
+        projectile.style.top = (gameContainer.clientHeight - playerY - playerSize) + 'px';
+        gameContainer.appendChild(projectile);
+        projectiles.push(projectile);
+    }
+
+
+
+    function spawnPdf() {
+        const pdf = document.createElement('img');
+        pdf.src = 'images/file-earmark-pdf.svg';
+        pdf.classList.add('pdf');
+        pdf.style.width = pdfSize + 'px';
+        pdf.style.height = pdfSize + 'px';
+        pdf.style.left = Math.floor(Math.random() * (gameContainer.clientWidth - pdfSize)) + 'px';
+        pdf.style.top = '0px';
+        gameContainer.appendChild(pdf);
+        pdfs.push(pdf);
+    }
+
+
+    function resetEnemies() {
+        pdfs.forEach((pdf) => gameContainer.removeChild(pdf));
+        pdfs.length = 0;
+    }
+
+
+    function updateGame() {
+        if (gameOver || paused) return;
+
+        for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) {
+            const pdf = pdfs[pdfIndex];
+            const pdfY = parseInt(pdf.style.top) + pdfSpeed;
+            if (pdfY + 50 > gameContainer.clientHeight) {
+                gameContainer.removeChild(pdf);
+                pdfs.splice(pdfIndex, 1);
+
+                // Deduct 2 points when a PDF gets past the player
+                score -= 0;
+                updateScore();
+
+                // Decrease lives and check if game over
+                lives--;
+                updateLives();
+                if (lives <= 0) {
+                    endGame();
+                    return;
+                }
+
+            } else {
+                pdf.style.top = pdfY + 'px';
+
+                // Check for collision with player
+                if (collisionDetected(player, pdf)) {
+                    lives--;
+                    updateLives();
+                    resetEnemies();
+                    if (lives <= 0) {
+                        endGame();
+                        return;
+                    }
+                }
+            }
+        };
+
+        projectiles.forEach((projectile, projectileIndex) => {
+            const projectileY = parseInt(projectile.style.top) - 10;
+            if (projectileY < 0) {
+                gameContainer.removeChild(projectile);
+                projectiles.splice(projectileIndex, 1);
+            } else {
+                projectile.style.top = projectileY + 'px';
+            }
+
+            for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) {
+                const pdf = pdfs[pdfIndex];
+                if (collisionDetected(projectile, pdf)) {
+                    gameContainer.removeChild(pdf);
+                    gameContainer.removeChild(projectile);
+                    pdfs.splice(pdfIndex, 1);
+                    projectiles.splice(projectileIndex, 1);
+                    score = score + 10;
+                    updateScore();
+                    break;
+                }
+            }
+        });
+
+        setTimeout(updateGame, 1000 / 60);
+    }
+
+    function resetGame() {
+        playerX = gameContainer.clientWidth / 2;
+        playerY = 50;
+        updatePlayerPosition();
+
+        pdfs.forEach((pdf) => gameContainer.removeChild(pdf));
+        projectiles.forEach((projectile) => gameContainer.removeChild(projectile));
+
+        pdfs.length = 0;
+        projectiles.length = 0;
+
+        score = 0;
+        level = 1;
+        lives = 3;
+        
+        gameOver = false;
+
+        updateScore();
+        updateLives();
+        levelElement.textContent = 'Level: ' + level;
+        pdfSpeed = 1;
+        clearTimeout(spawnPdfTimeout); // Clear the existing spawnPdfTimeout
+        setTimeout(updateGame, 1000 / 60);
+        spawnPdfInterval();
+    }
+
+
+
+    function updateScore() {
+	    scoreElement.textContent = 'Score: ' + score;
+	    checkLevelUp();
+	}
+
+
+
+    function checkLevelUp() {
+        const newLevel = Math.floor(score / 100) + 1;
+        if (newLevel > level) {
+            level = newLevel;
+            levelElement.textContent = 'Level: ' + level;
+            pdfSpeed += 1;
+        }
+    }
+
+    function collisionDetected(a, b) {
+        const rectA = a.getBoundingClientRect();
+        const rectB = b.getBoundingClientRect();
+        return (
+            rectA.left < rectB.right &&
+            rectA.right > rectB.left &&
+            rectA.top < rectB.bottom &&
+            rectA.bottom > rectB.top
+        );
+    }
+
+    function endGame() {
+        gameOver = true;
+        if (score > highScore) {
+            highScore = score;
+            localStorage.setItem('highScore', highScore);
+            updateHighScore();
+        }
+        alert('Game Over! Your final score is: ' + score);
+        document.getElementById('game-container-wrapper').close();
+    }
+
+
+
+
+    let spawnPdfTimeout;
+
+    function spawnPdfInterval() {
+         console.log("spawnPdfInterval");
+        if (gameOver || paused) {
+            console.log("spawnPdfInterval 2");
+            clearTimeout(spawnPdfTimeout);
+            return;
+        }
+        console.log("spawnPdfInterval 3");
+        spawnPdf();
+        spawnPdfTimeout = setTimeout(spawnPdfInterval, 1000 - level * 50);
+    }
+
+    updatePlayerPosition();
+    updateGame();
+    spawnPdfInterval();
+
+
+    document.addEventListener('visibilitychange', function() {
+        if (document.hidden) {
+            paused = true;
+        } else {
+            paused = false;
+            updateGame();
+            spawnPdfInterval();
+        }
+
+    });
+
+    window.resetGame = resetGame;
+}
+
+window.initializeGame = initializeGame;

src/main/resources/static/js/local-pdf-input-download.js

@@ -0,0 +1,47 @@
+async function downloadFilesWithCallback(processFileCallback) {
+    const fileInput = document.querySelector('input[type="file"]');
+    const files = fileInput.files;
+
+    const zipThreshold = 4;
+    const zipFiles = files.length > zipThreshold;
+
+    let jszip = null;
+    if (zipFiles) {
+        jszip = new JSZip();
+    }
+
+    const promises = Array.from(files).map(async file => {
+        const { processedData, fileName } = await processFileCallback(file);
+
+        if (zipFiles) {
+            jszip.file(fileName, processedData);
+        } else {
+            const url = URL.createObjectURL(processedData);
+            const downloadOption = localStorage.getItem('downloadOption');
+
+            if (downloadOption === 'sameWindow') {
+                window.location.href = url;
+            } else if (downloadOption === 'newWindow') {
+                window.open(url, '_blank');
+            } else {
+                const downloadLink = document.createElement('a');
+                downloadLink.href = url;
+                downloadLink.download = fileName;
+                downloadLink.click();
+            }
+        }
+    });
+
+    await Promise.all(promises);
+
+    if (zipFiles) {
+        const content = await jszip.generateAsync({ type: "blob" });
+        const url = URL.createObjectURL(content);
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = "files.zip";
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+    }
+}

src/main/resources/static/js/multitool/DragDropManager.js

@@ -0,0 +1,127 @@
+
+
+class DragDropManager {
+    dragContainer;
+    wrapper;
+    pageDirection;
+    movePageTo;
+    pageDragging;
+    draggelEl;
+    draggedImageEl;
+    hoveredEl;
+    endInsertionElement;
+
+    constructor(id, wrapperId) {
+        this.dragContainer = document.getElementById(id);
+        this.pageDirection = document.documentElement.getAttribute("lang-direction");
+        this.wrapper = document.getElementById(wrapperId);
+        this.pageDragging = false;
+        this.hoveredEl = undefined;
+        this.draggelEl = undefined
+        this.draggedImageEl = undefined;
+
+        var styleElement = document.createElement('link');
+        styleElement.rel = 'stylesheet';
+        styleElement.href = 'css/dragdrop.css'
+
+        document.head.appendChild(styleElement);
+
+        const div = document.createElement('div');
+        div.classList.add('drag-manager_endpoint');
+        div.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-arrow-down" viewBox="0 0 16 16">
+            <path d="M8.5 6.5a.5.5 0 0 0-1 0v3.793L6.354 9.146a.5.5 0 1 0-.708.708l2 2a.5.5 0 0 0 .708 0l2-2a.5.5 0 0 0-.708-.708L8.5 10.293V6.5z"/>
+            <path d="M14 14V4.5L9.5 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2zM9.5 3A1.5 1.5 0 0 0 11 4.5h2V14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h5.5v2z"/>
+        </svg>`
+        this.endInsertionElement = div;
+
+        this.startDraggingPage = this.startDraggingPage.bind(this);
+        this.onDragEl = this.onDragEl.bind(this);
+        this.stopDraggingPage = this.stopDraggingPage.bind(this);
+
+        this.adapt(div);
+    }
+
+    startDraggingPage(div,) {
+        this.pageDragging = true;
+        this.draggedEl = div;
+        const img = div.querySelector('img');
+        div.classList.add('drag-manager_dragging');
+        const imageSrc = img.src;
+    
+        const imgEl = document.createElement('img');
+        imgEl.classList.add('dragged-img');
+        imgEl.src = imageSrc;
+        this.draggedImageEl = imgEl;
+        imgEl.style.left = screenX;
+        imgEl.style.right = screenY;
+        imgEl.style.transform = `rotate(${img.style.rotate === '' ? '0deg' : img.style.rotate}) translate(-50%, -50%)`;
+        this.dragContainer.appendChild(imgEl);
+    
+        window.addEventListener('mouseup', this.stopDraggingPage)
+        window.addEventListener('mousemove', this.onDragEl)
+        this.wrapper.classList.add('drag-manager_dragging-container');
+        this.wrapper.appendChild(this.endInsertionElement);
+    }
+
+    onDragEl(mouseEvent) {
+        const { clientX, clientY } = mouseEvent;
+        if(this.draggedImageEl) {
+            this.draggedImageEl.style.left = `${clientX}px`;
+            this.draggedImageEl.style.top = `${clientY}px`;           
+        }
+    }
+
+    
+    stopDraggingPage() {
+        window.removeEventListener('mousemove', this.onDragEl);
+        this.wrapper.classList.remove('drag-manager_dragging-container');
+        this.wrapper.removeChild(this.endInsertionElement); 
+        window.removeEventListener('mouseup', this.stopDraggingPage)
+        this.draggedImageEl = undefined;
+        this.pageDragging = false;
+        this.draggedEl.classList.remove('drag-manager_dragging');
+        this.hoveredEl?.classList.remove('drag-manager_draghover');
+        this.dragContainer.childNodes.forEach((dragChild) => {
+            this.dragContainer.removeChild(dragChild);
+        })
+        if(!this.hoveredEl) {
+            return;
+        }
+        if(this.hoveredEl === this.endInsertionElement) {
+            this.movePageTo(this.draggedEl);
+            return;
+        }
+        this.movePageTo(this.draggedEl, this.hoveredEl);
+    }
+
+    setActions({ movePageTo }) {
+        this.movePageTo = movePageTo;
+    }
+
+
+    adapt(div) {
+        const onDragStart = () => {
+            this.startDraggingPage(div);
+        }
+        
+        const onMouseEnter = () => {
+            if (this.pageDragging) {
+                this.hoveredEl = div;
+                div.classList.add('drag-manager_draghover');
+            }
+        }
+
+        const onMouseLeave = () => {
+            this.hoveredEl = undefined
+            div.classList.remove('drag-manager_draghover');
+        }
+
+        div.addEventListener('dragstart', onDragStart);
+        div.addEventListener('mouseenter', onMouseEnter);
+        div.addEventListener('mouseleave', onMouseLeave);
+
+        return div;
+    }
+}
+
+export default DragDropManager;

src/main/resources/static/js/multitool/ImageHighlighter.js

@@ -0,0 +1,46 @@
+class ImageHiglighter {
+    imageHighlighter;
+    constructor(id) {
+        this.imageHighlighter = document.getElementById(id);
+        this.imageHighlightCallback = this.imageHighlightCallback.bind(this);
+
+        var styleElement = document.createElement('link');
+        styleElement.rel = 'stylesheet';
+        styleElement.href = 'css/imageHighlighter.css'
+
+        document.head.appendChild(styleElement);
+
+        this.imageHighlighter.onclick = () => {
+            this.imageHighlighter.childNodes.forEach((child) => {
+                child.classList.add('remove');
+                setTimeout(() => {
+                    this.imageHighlighter.removeChild(child);
+                }, 100)
+            })
+        }
+    }
+
+    imageHighlightCallback(highlightEvent) {
+        var bigImg = document.createElement('img');
+        bigImg.onclick = (imageClickEvent) => {
+            // This prevents the highlighter's onClick from closing the image when clicking
+            // on the image instead of next to it.
+            imageClickEvent.preventDefault();
+            imageClickEvent.stopPropagation();
+        };
+        bigImg.src = highlightEvent.target.src;
+        this.imageHighlighter.appendChild(bigImg);
+    };
+
+    setActions() {
+        // not needed in this case
+    }
+
+    adapt(div) {
+        const img = div.querySelector('.page-image');
+        img.addEventListener('click', this.imageHighlightCallback)
+        return div;
+    }
+}
+
+export default ImageHiglighter;

src/main/resources/static/js/multitool/PdfActionsManager.js

@@ -0,0 +1,167 @@
+class PdfActionsManager {
+    pageDirection; 
+    pagesContainer;
+
+    constructor(id) {
+        this.pagesContainer = document.getElementById(id);
+        this.pageDirection = document.documentElement.getAttribute("lang-direction");
+
+        var styleElement = document.createElement('link');
+        styleElement.rel = 'stylesheet';
+        styleElement.href = 'css/pdfActions.css'
+
+        document.head.appendChild(styleElement);
+    }
+
+    getPageContainer(element) {
+        var container = element
+        while (!container.classList.contains('page-container')) {
+            container = container.parentNode;
+        }
+        return container;
+    }
+
+    moveUpButtonCallback(e) {
+        var imgContainer = this.getPageContainer(e.target);
+        
+        const sibling = imgContainer.previousSibling;
+        if (sibling) {
+            this.movePageTo(imgContainer, sibling, true);
+        }
+    }
+
+    moveDownButtonCallback(e) {
+        var imgContainer = this.getPageContainer(e.target);
+        const sibling = imgContainer.nextSibling;
+        if (sibling) {
+            this.movePageTo(imgContainer, sibling.nextSibling, true);
+        }
+    };
+
+    rotateCCWButtonCallback(e) {
+        var imgContainer = this.getPageContainer(e.target);
+        const img = imgContainer.querySelector("img");
+        
+        this.rotateElement(img, -90)
+    };
+
+    rotateCWButtonCallback(e) {
+        var imgContainer = this.getPageContainer(e.target);
+        const img = imgContainer.querySelector("img");
+        
+        this.rotateElement(img, 90)
+    };
+
+    deletePageButtonCallback(e) {
+        var imgContainer = this.getPageContainer(e.target);
+        this.pagesContainer.removeChild(imgContainer);
+    };
+
+    insertFileButtonCallback(e) {
+        var imgContainer = this.getPageContainer(e.target);
+        this.addPdfs(imgContainer)
+    };
+
+    setActions({ movePageTo, addPdfs, rotateElement }) {
+        this.movePageTo = movePageTo;
+        this.addPdfs = addPdfs;
+        this.rotateElement = rotateElement;
+
+        this.moveUpButtonCallback = this.moveUpButtonCallback.bind(this);
+        this.moveDownButtonCallback = this.moveDownButtonCallback.bind(this);
+        this.rotateCCWButtonCallback = this.rotateCCWButtonCallback.bind(this);
+        this.rotateCWButtonCallback = this.rotateCWButtonCallback.bind(this);
+        this.deletePageButtonCallback = this.deletePageButtonCallback.bind(this);
+        this.insertFileButtonCallback = this.insertFileButtonCallback.bind(this);
+    }
+
+    adapt(div) {
+        div.classList.add('pdf-actions_container');
+        const leftDirection = this.pageDirection === 'rtl' ? 'right' : 'left'
+        const rightDirection = this.pageDirection === 'rtl' ? 'left' : 'right'
+        const buttonContainer = document.createElement('div');
+
+        buttonContainer.classList.add("pdf-actions_button-container", "hide-on-drag");
+                    
+        const moveUp = document.createElement('button');
+        moveUp.classList.add("pdf-actions_move-left-button","btn", "btn-secondary");
+        moveUp.innerHTML = `<i class="bi bi-arrow-${leftDirection}-short"></i>`;
+        moveUp.onclick = this.moveUpButtonCallback;
+        buttonContainer.appendChild(moveUp);
+
+        const moveDown = document.createElement('button');
+        moveDown.classList.add("pdf-actions_move-right-button","btn", "btn-secondary");
+        moveDown.innerHTML = `<i class="bi bi-arrow-${rightDirection}-short"></i>`;
+        moveDown.onclick = this.moveDownButtonCallback;
+        buttonContainer.appendChild(moveDown);
+        
+        const rotateCCW = document.createElement('button');
+        rotateCCW.classList.add("btn", "btn-secondary");
+        rotateCCW.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-counterclockwise" viewBox="0 0 16 16">
+                            <path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.417A6 6 0 1 0 8 2v1z" />
+                            <path d="M8 4.466V.534a.25.25 0 0 0-.41-.192L5.23 2.308a.25.25 0 0 0 0 .384l2.36 1.966A.25.25 0 0 0 8 4.466z" />
+                        </svg>`;
+        rotateCCW.onclick = this.rotateCCWButtonCallback;
+        buttonContainer.appendChild(rotateCCW);
+
+        const rotateCW = document.createElement('button');
+        rotateCW.classList.add("btn", "btn-secondary");
+        rotateCW.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
+                            <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z" />
+                            <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z" />
+                        </svg>`;
+        rotateCW.onclick = this.rotateCWButtonCallback;
+        buttonContainer.appendChild(rotateCW);
+
+        const deletePage = document.createElement('button');
+        deletePage.classList.add("btn", "btn-danger");
+        deletePage.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+                            <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>
+                            <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>
+                        </svg>`;
+        deletePage.onclick = this.deletePageButtonCallback;
+        buttonContainer.appendChild(deletePage);
+
+        div.appendChild(buttonContainer);
+
+        const insertFileButtonContainer = document.createElement('div');
+                
+        insertFileButtonContainer.classList.add(
+            "pdf-actions_insert-file-button-container",
+            leftDirection,
+            `align-center-${leftDirection}`);
+        
+        const insertFileButton = document.createElement('button');
+        insertFileButton.classList.add("btn", "btn-primary", "pdf-actions_insert-file-button");
+        insertFileButton.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-plus" viewBox="0 0 16 16">
+                                <path d="M8 6.5a.5.5 0 0 1 .5.5v1.5H10a.5.5 0 0 1 0 1H8.5V11a.5.5 0 0 1-1 0V9.5H6a.5.5 0 0 1 0-1h1.5V7a.5.5 0 0 1 .5-.5z"/>
+                                <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
+                            </svg>`;
+        insertFileButton.onclick = this.insertFileButtonCallback;
+        insertFileButtonContainer.appendChild(insertFileButton);
+        
+        div.appendChild(insertFileButtonContainer);
+        
+        // add this button to every element, but only show it on the last one :D
+        const insertFileButtonRightContainer = document.createElement('div');
+        insertFileButtonRightContainer.classList.add(
+            "pdf-actions_insert-file-button-container",
+            rightDirection,
+            `align-center-${rightDirection}`);
+        
+        const insertFileButtonRight = document.createElement('button');
+        insertFileButtonRight.classList.add("btn", "btn-primary", "pdf-actions_insert-file-button");
+        insertFileButtonRight.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-plus" viewBox="0 0 16 16">
+                                <path d="M8 6.5a.5.5 0 0 1 .5.5v1.5H10a.5.5 0 0 1 0 1H8.5V11a.5.5 0 0 1-1 0V9.5H6a.5.5 0 0 1 0-1h1.5V7a.5.5 0 0 1 .5-.5z"/>
+                                <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
+                                insertFileButtonRight</svg>`;
+        insertFileButtonRight.onclick = () => addPdfs();
+        insertFileButtonRightContainer.appendChild(insertFileButtonRight);
+
+        div.appendChild(insertFileButtonRightContainer);
+
+        return div;
+    }
+}
+
+export default PdfActionsManager;

src/main/resources/static/js/multitool/PdfContainer.js

@@ -0,0 +1,206 @@
+class PdfContainer {
+    fileName;
+    pagesContainer;
+    pagesContainerWrapper;
+    pdfAdapters;
+
+    constructor(id, wrapperId, pdfAdapters) {
+        this.fileName = null;
+        this.pagesContainer = document.getElementById(id)
+        this.pagesContainerWrapper = document.getElementById(wrapperId);
+        this.movePageTo = this.movePageTo.bind(this);
+        this.addPdfs = this.addPdfs.bind(this);
+        this.rotateElement = this.rotateElement.bind(this);
+        this.rotateAll = this.rotateAll.bind(this);
+        this.exportPdf = this.exportPdf.bind(this);
+
+        this.pdfAdapters = pdfAdapters;
+
+        this.pdfAdapters.forEach(adapter => {
+            adapter.setActions({
+                movePageTo: this.movePageTo,
+                addPdfs: this.addPdfs,
+                rotateElement: this.rotateElement,
+            })
+        })
+
+        window.addPdfs = this.addPdfs;
+        window.exportPdf = this.exportPdf;
+        window.rotateAll = this.rotateAll;
+    }
+
+    movePageTo(startElement, endElement, scrollTo = false) {
+        const childArray = Array.from(this.pagesContainer.childNodes);
+        const startIndex = childArray.indexOf(startElement);
+        const endIndex = childArray.indexOf(endElement);
+        this.pagesContainer.removeChild(startElement);
+        if(!endElement) {
+            this.pagesContainer.append(startElement);
+        } else {
+            this.pagesContainer.insertBefore(startElement, endElement);
+        }
+
+        if(scrollTo) {
+            const { width } = startElement.getBoundingClientRect();
+            const vector = (endIndex !== -1 && startIndex > endIndex)
+                ?  0-width
+                : width;
+            
+            this.pagesContainerWrapper.scroll({
+                left: this.pagesContainerWrapper.scrollLeft + vector,
+            })
+        }
+    }
+
+    addPdfs(nextSiblingElement) {
+        var input = document.createElement('input');
+        input.type = 'file';
+        input.multiple = true;
+        input.setAttribute("accept", "application/pdf");
+
+        input.onchange = async(e) => {
+            const files = e.target.files;
+            this.fileName = files[0].name;
+            for (var i=0; i < files.length; i++) {
+                this.addPdfFile(files[i], nextSiblingElement);
+            }
+
+            document.querySelectorAll(".enable-on-file").forEach(element => {
+                element.disabled = false;
+            });
+        }
+
+        input.click();
+    }
+
+    rotateElement(element, deg) {
+        var lastTransform = element.style.rotate;
+        if (!lastTransform) {
+            lastTransform = "0";
+        }
+        const lastAngle = parseInt(lastTransform.replace(/[^\d-]/g, ''));
+        const newAngle = lastAngle + deg;
+
+        element.style.rotate = newAngle + "deg";
+    }
+
+    async addPdfFile(file, nextSiblingElement) {
+        const { renderer, pdfDocument } = await this.loadFile(file);
+
+        for (var i=0; i < renderer.pageCount; i++) {
+            const div = document.createElement('div');
+
+            div.classList.add("page-container");
+
+            var img = document.createElement('img');
+            img.classList.add('page-image')
+            const imageSrc = await renderer.renderPage(i)
+            img.src = imageSrc;
+            img.pageIdx = i;
+            img.rend = renderer;
+            img.doc = pdfDocument;
+            div.appendChild(img);
+
+            this.pdfAdapters.forEach((adapter) => {
+                adapter.adapt?.(div)
+            })
+            if (nextSiblingElement) {
+                this.pagesContainer.insertBefore(div, nextSiblingElement);
+            } else {
+                this.pagesContainer.appendChild(div);
+            }
+        }
+    }
+
+    async loadFile(file) {
+        var objectUrl = URL.createObjectURL(file);
+        var pdfDocument = await this.toPdfLib(objectUrl);
+        var renderer = await this.toRenderer(objectUrl);
+        return { renderer, pdfDocument };
+    }
+
+    async toRenderer(objectUrl) {
+        const pdf = await pdfjsLib.getDocument(objectUrl).promise;
+        return {
+            document: pdf,
+            pageCount: pdf.numPages,
+            renderPage: async function(pageIdx) {
+                const page = await this.document.getPage(pageIdx+1);
+
+                const canvas = document.createElement("canvas");
+
+                // set the canvas size to the size of the page
+                if (page.rotate == 90 || page.rotate == 270) {
+                    canvas.width = page.view[3];
+                    canvas.height = page.view[2];
+                } else {
+                    canvas.width = page.view[2];
+                    canvas.height = page.view[3];
+                }
+
+                // render the page onto the canvas
+                var renderContext = {
+                    canvasContext: canvas.getContext("2d"),
+                    viewport: page.getViewport({ scale: 1 })
+                };
+
+                await page.render(renderContext).promise;
+                return canvas.toDataURL();
+            }
+        };
+    }
+
+    async toPdfLib(objectUrl) {
+        const existingPdfBytes = await fetch(objectUrl).then(res => res.arrayBuffer());
+        const pdfDoc = await PDFLib.PDFDocument.load(existingPdfBytes);
+        return pdfDoc;
+    }
+
+    
+
+    rotateAll(deg) {
+        for (var i=0; i<this.pagesContainer.childNodes.length; i++) {
+            const img = this.pagesContainer.childNodes[i].querySelector("img");
+            if (!img) continue;
+            this.rotateElement(img, deg)
+        }
+    }
+
+    async exportPdf() {
+        const pdfDoc = await PDFLib.PDFDocument.create();
+        for (var i=0; i<this.pagesContainer.childNodes.length; i++) {
+            const img = this.pagesContainer.childNodes[i].querySelector("img");
+            if (!img) continue;
+            const pages = await pdfDoc.copyPages(img.doc, [img.pageIdx])
+            const page = pages[0];
+
+            const rotation = img.style.rotate;
+            if (rotation) {
+                const rotationAngle = parseInt(rotation.replace(/[^\d-]/g, ''));
+                page.setRotation(PDFLib.degrees(page.getRotation().angle + rotationAngle))
+            }
+            
+            pdfDoc.addPage(page);
+        }
+        const pdfBytes = await pdfDoc.save();
+        const pdfBlob = new Blob([pdfBytes], { type: 'application/pdf' });
+        const url = URL.createObjectURL(pdfBlob);
+        const downloadOption = localStorage.getItem('downloadOption');
+
+        if (downloadOption === 'sameWindow') {
+            // Open the file in the same window
+            window.location.href = url;
+        } else if (downloadOption === 'newWindow') {
+            // Open the file in a new window
+            window.open(url, '_blank');
+        } else {
+            // Download the file
+            const downloadLink = document.createElement('a');
+            downloadLink.href = url;
+            downloadLink.download = this.fileName ? this.fileName : 'managed.pdf';
+            downloadLink.click();
+        }
+    }
+}
+
+export default PdfContainer;

src/main/resources/static/js/multitool/horizontalScroll.js

@@ -0,0 +1,35 @@
+const scrollDivHorizontally = (id) => {
+    var scrollDelta = 0; // variable to store the accumulated scroll delta
+    var isScrolling = false; // variable to track if scroll is already in progress
+    const divToScrollHorizontally = document.getElementById(id)
+    function scrollLoop() {
+        // Scroll the div horizontally by a fraction of the accumulated scroll delta
+        divToScrollHorizontally.scrollLeft += scrollDelta * 0.1;
+
+        // Reduce the accumulated scroll delta by a fraction
+        scrollDelta *= 0.9;
+
+        // If scroll delta is still significant, continue the scroll loop
+        if (Math.abs(scrollDelta) > 0.1) {
+            requestAnimationFrame(scrollLoop);
+        } else {
+            isScrolling = false; // Reset scroll in progress flag
+        }
+    }
+
+    
+    divToScrollHorizontally.addEventListener("wheel", function(e) {
+        e.preventDefault(); // prevent default mousewheel behavior
+
+        // Accumulate the horizontal scroll delta
+        scrollDelta -= e.deltaX || e.wheelDeltaX || -e.deltaY || -e.wheelDeltaY;
+
+        // If scroll is not already in progress, start the scroll loop
+        if (!isScrolling) {
+            isScrolling = true;
+            requestAnimationFrame(scrollLoop);
+        }
+    });
+}
+
+export default scrollDivHorizontally;

src/main/resources/static/js/tab-container.js

@@ -0,0 +1,39 @@
+
+TabContainer = {
+    initTabGroups() {
+        const groups = document.querySelectorAll(".tab-group");
+        const unloadedGroups = [...groups].filter(g => !g.initialised);
+        unloadedGroups.forEach(group => {
+            const containers = group.querySelectorAll(".tab-container");
+            const tabTitles = [...containers].map(c => c.getAttribute("title"));
+            
+            const tabList = document.createElement("div");
+            tabList.classList.add("tab-buttons");
+            tabTitles.forEach(title => {
+                const tabButton = document.createElement("button");
+                tabButton.innerHTML = title;
+                tabButton.onclick = e => {
+                    this.setActiveTab(e.target);
+                }
+                tabList.appendChild(tabButton);
+            });
+            group.prepend(tabList);
+
+            this.setActiveTab(tabList.firstChild);
+
+            group.initialised = true;
+        });
+    },
+    setActiveTab(tabButton) {
+        const group = tabButton.closest(".tab-group")
+
+        group.querySelectorAll(".active").forEach(el => el.classList.remove("active"));
+
+        tabButton.classList.add("active");
+        group.querySelector(`[title="${tabButton.innerHTML}"]`).classList.add("active");
+    },
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+    TabContainer.initTabGroups();
+})

src/main/resources/static/rainbow.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-rainbow" viewBox="0 0 16 16">
+  <path d="M8 4.5a7 7 0 0 0-7 7 .5.5 0 0 1-1 0 8 8 0 1 1 16 0 .5.5 0 0 1-1 0 7 7 0 0 0-7-7zm0 2a5 5 0 0 0-5 5 .5.5 0 0 1-1 0 6 6 0 1 1 12 0 .5.5 0 0 1-1 0 5 5 0 0 0-5-5zm0 2a3 3 0 0 0-3 3 .5.5 0 0 1-1 0 4 4 0 1 1 8 0 .5.5 0 0 1-1 0 3 3 0 0 0-3-3zm0 2a1 1 0 0 0-1 1 .5.5 0 0 1-1 0 2 2 0 1 1 4 0 .5.5 0 0 1-1 0 1 1 0 0 0-1-1z"/>
+</svg>

src/main/resources/templates/about.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
+
+<th:block th:insert="~{fragments/common :: head(title='<3')}"></th:block>
+
+<body>
+  <div id="page-container">
+    <div id="content-wrap">
+      <div th:insert="~{fragments/navbar.html :: navbar}"></div>
+      <br> <br>
+      <div class="container">
+        <div class="row justify-content-center">
+          <div class="col-md-6">
+            
+        </div>
+      </div>
+    </div>
+    <div th:insert="~{fragments/footer.html :: footer}"></div>
+  </div>
+</body>
+</html>
+

src/main/resources/templates/add-image.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
-
-
-<th:block th:insert="~{fragments/common :: head(title=#{addImage.title})}"></th:block>
-
-
-<body>
-    <div id="page-container">
-        <div id="content-wrap">
-            <div th:insert="~{fragments/navbar.html :: navbar}"></div>
-            <br> <br>
-            <div class="container">
-                <div class="row justify-content-center">
-                    <div class="col-md-6">
-                        <h2 th:text="#{addImage.header}"></h2>
-                        <form method="post" th:action="@{add-image}" enctype="multipart/form-data">
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
-                            <div class="custom-file">
-                                <input type="file" class="custom-file-input" id="fileInput2" name="fileInput2" accept="image/*" required> 
-                                <label class="custom-file-label" for="fileInput2" th:text="#{imgPrompt}"></label>
-                            </div>
-                            <div class="form-group">
-                                <label for="x">X</label> <input type="number" class="form-control" id="x" name="x" step="0.01" required>
-                            </div>
-                            <div class="form-group">
-                                <label for="y">Y</label> <input type="number" class="form-control" id="y" name="y" step="0.01" required>
-                            </div>
-                            <div class="form-group">
-                                <input type="checkbox" id="everyPage" name="everyPage" value="true"> <label for="everyPage" th:text="#{addImage.everyPage}"></label>
-                            </div>
-                            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{addImage.submit}"></button>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div th:insert="~{fragments/footer.html :: footer}"></div>
-    </div>
-</body>
-
-</html>

src/main/resources/templates/convert/file-to-pdf.html

@@ -5,6 +5,7 @@
 
 
 <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
     <div id="page-container">
         <div id="content-wrap">
             <div th:insert="~{fragments/navbar.html :: navbar}"></div>