Merge branch 'main' into patch-1

.gitattributes

@@ -1,5 +1,6 @@
 # Ignore all JavaScript files in a directory
 src/main/resources/static/pdfjs/* linguist-vendored
+src/main/resources/static/pdfjs/** linguist-vendored
 src/main/resources/static/css/bootstrap-icons.css linguist-vendored
 src/main/resources/static/css/bootstrap.min.css linguist-vendored
 src/main/resources/static/css/fonts/* linguist-vendored

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'stirling.software'
-version = '0.15.0'
+version = '0.15.2'
 sourceCompatibility = '17'
 
 repositories {

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

@@ -27,7 +27,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.utils.WebResponseUtils;
-import org.apache.pdfbox.multipdf.Splitter;
+
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
@@ -50,24 +50,26 @@ public ResponseEntity<byte[]> splitPdf(@ModelAttribute PDFWithPageNums request)
         	pageNumbers.add(document.getNumberOfPages()- 1);
         logger.info("Splitting PDF into pages: {}", pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
 
-        Splitter splitter = new Splitter();
+        // split the document
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
-
-        int previousPageNumber = 1; // PDFBox uses 1-based indexing for pages.
+        int previousPageNumber = 0;
         for (int splitPoint : pageNumbers) {
-        	splitPoint = splitPoint + 1;
-            splitter.setStartPage(previousPageNumber);
-            splitter.setEndPage(splitPoint);
-            List<PDDocument> splitDocuments = splitter.split(document);
+            try (PDDocument splitDocument = new PDDocument()) {
+                for (int i = previousPageNumber; i <= splitPoint; i++) {
+                    PDPage page = document.getPage(i);
+                    splitDocument.addPage(page);
+                    logger.debug("Adding page {} to split document", i);
+                }
+                previousPageNumber = splitPoint + 1;
 
-            for (PDDocument splitDoc : splitDocuments) {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                splitDoc.save(baos);
+                splitDocument.save(baos);
+
                 splitDocumentsBoas.add(baos);
-                splitDoc.close();
+            } catch (Exception e) {
+                logger.error("Failed splitting documents and saving them", e);
+                throw e;
             }
-
-            previousPageNumber = splitPoint + 1;
         }
 
 
@@ -106,4 +108,4 @@ public ResponseEntity<byte[]> splitPdf(@ModelAttribute PDFWithPageNums request)
 
     }
 
-}
+}

src/main/resources/messages_ar_AR.properties

@@ -126,8 +126,13 @@ adminUserSettings.submit=Save User
 # HOME-PAGE #
 #############
 home.desc=متجرك الشامل المستضاف محليًا لجميع احتياجات PDF الخاصة بك.
+home.searchBar=Search for features...
 
 
+home.viewPdf.title=View PDF
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image
+
 home.multiTool.title=أداة متعددة PDF
 home.multiTool.desc=دمج الصفحات وتدويرها وإعادة ترتيبها وإزالتها
 multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side
@@ -478,9 +483,6 @@ pipeline.title=Pipeline
 pageLayout.title=Multi Page Layout
 pageLayout.header=Multi Page Layout
 pageLayout.pagesPerSheet=Pages per sheet:
-##########################
-###  TODO: Translate   ###
-##########################
 pageLayout.addBorder=Add Borders
 pageLayout.submit=Submit
 
@@ -635,6 +637,9 @@ pdfOrganiser.submit=إعادة ترتيب الصفحات
 multiTool.title=أداة متعددة PDF
 multiTool.header=أداة متعددة PDF
 
+#view pdf
+viewPdf.title=View PDF
+viewPdf.header=View PDF
 
 #pageRemover
 pageRemover.title=مزيل الصفحة

src/main/resources/messages_bg_BG.properties

@@ -1,7 +1,7 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr = left to right, rtl = right to left)
+# the direction that the language is written (ltr=left to right, rtl = right to left)
 language.direction=ltr
 
 pdfPrompt=Изберете PDF(и)
@@ -25,7 +25,7 @@ downloadPdf=Изтеглете PDF
 text=Текст
 font=Шрифт
 selectFillter=-- Изберете --
-pageNum=Брой страница 
+pageNum=Брой страница
 sizes.small=Малък
 sizes.medium=Среден
 sizes.large=Голям
@@ -92,7 +92,7 @@ account.title=Настройки на акаунта
 account.accountSettings=Настройки на акаунта
 account.adminSettings=Настройки на администратора - Преглед и добавяне на потребители
 account.userControlSettings=Настройки за потребителски контрол
-account.changeUsername=Нов потребител
+account.changeUsername=Промени потребител
 account.changeUsername=Промени потребител
 account.password=Парола за потвърждение
 account.oldPassword=Стара парола
@@ -119,14 +119,19 @@ adminUserSettings.role=Роля
 adminUserSettings.actions=Действия
 adminUserSettings.apiUser=Ограничен API потребител
 adminUserSettings.webOnlyUser=Само за уеб-потребител
-adminUserSettings.forceChange = Принудете потребителя да промени потребителското име/парола при влизане
+adminUserSettings.forceChange=Принудете потребителя да промени потребителското име/парола при влизане
 adminUserSettings.submit=Съхранете потребителя
 
 #############
 # HOME-PAGE #
 #############
 home.desc=Вашето локално хоствано обслужване на едно място за всички ваши PDF нужди.
+home.searchBar=Search for features...
+
 
+home.viewPdf.title=View PDF
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image
 
 home.multiTool.title=PDF Мулти инструмент
 home.multiTool.desc=Обединяване, завъртане, пренареждане и премахване на страници
@@ -325,7 +330,7 @@ PdfToSinglePage.tags=единична страница
 
 home.showJS.title=Показване на Javascript
 home.showJS.desc=Търси и показва всеки JS, инжектиран в PDF
-showJS.tags=JS
+showJS.tags=Редактиране,Скриване,затъмняване,черен,маркер,скрит
 
 home.autoRedact.title=Автоматично редактиране
 home.autoRedact.desc=Автоматично редактира (зачернява) текст в PDF въз основа на въведен текст
@@ -372,9 +377,9 @@ pdfToSinglePage.submit=Преобразуване към единична стр
 
 
 #pageExtracter
-pageExtrater.title=Извличане на страници
-pageExtrater.header=Извличане на страници
-pageExtrater.submit=Извличане
+pageExtracter.title=Extract Pages
+pageExtracter.header=Extract Pages
+pageExtracter.submit=Extract
 
 
 #getPdfInfo
@@ -632,6 +637,9 @@ pdfOrganiser.submit=Пренареждане на страниците
 multiTool.title=PDF Мулти инструмент
 multiTool.header=PDF Мулти инструмент
 
+#view pdf
+viewPdf.title=View PDF
+viewPdf.header=View PDF
 
 #pageRemover
 pageRemover.title=Премахване на страници
@@ -753,7 +761,7 @@ removePassword.submit=Премахване
 
 
 #changeMetadata
-changeMetadata.title=Промени метаданните
+changeMetadata.title=Заглавие:
 changeMetadata.header=Промени метаданните
 changeMetadata.selectText.1=Моля, редактирайте променливите, които искате да промените
 changeMetadata.selectText.2=Изтрий всички метаданни
@@ -814,4 +822,4 @@ PDFToHTML.submit=Преобразуване
 PDFToXML.title=PDF към XML
 PDFToXML.header=PDF към XML
 PDFToXML.credit=Тази услуга използва LibreOffice за преобразуване на файлове.
-PDFToXML.submit=Преобразуване
+PDFToXML.submit=Преобразуване

src/main/resources/messages_ca_CA.properties

@@ -126,8 +126,13 @@ adminUserSettings.submit=Desar Usuari
 # HOME-PAGE #
 #############
 home.desc=L'eina allotjada localment per a necessitats PDF.
+home.searchBar=Search for features...
 
 
+home.viewPdf.title=View PDF
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image
+
 home.multiTool.title=PDF Multi Tool
 home.multiTool.desc=Fusiona, Rota, Reorganitza, i Esborra pàgines
 multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side
@@ -478,9 +483,6 @@ pipeline.title=Pipeline
 pageLayout.title=Multi Page Layout
 pageLayout.header=Multi Page Layout
 pageLayout.pagesPerSheet=Pages per sheet:
-##########################
-###  TODO: Translate   ###
-##########################
 pageLayout.addBorder=Add Borders
 pageLayout.submit=Submit
 
@@ -635,6 +637,9 @@ pdfOrganiser.submit=Reorganitza Pàgines
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
 
+#view pdf
+viewPdf.title=View PDF
+viewPdf.header=View PDF
 
 #pageRemover
 pageRemover.title=Eliminació Pàgines

src/main/resources/messages_de_DE.properties

@@ -126,8 +126,13 @@ adminUserSettings.submit=Benutzer speichern
 # HOME-PAGE #
 #############
 home.desc=Ihr lokal gehosteter One-Stop-Shop für alle Ihre PDF-Anforderungen.
+home.searchBar=Search for features...
 
 
+home.viewPdf.title=View PDF
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image
+
 home.multiTool.title=PDF-Multitool
 home.multiTool.desc=Seiten zusammenführen, drehen, neu anordnen und entfernen
 multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side
@@ -430,7 +435,7 @@ addPageNumbers.selectText.5=Seiten zu nummerieren
 addPageNumbers.selectText.6=Benutzerdefinierter Text
 addPageNumbers.customTextDesc=Benutzerdefinierter Text
 addPageNumbers.numberPagesDesc=Welche Seiten nummeriert werden sollen, Standardeinstellung 'alle' ('all'), akzeptiert auch 1-5 oder 2,5,9 usw.
-addPageNumbers.customNumberDesc=Standardmäßig {n}, akzeptiert auch 'Seite {n} von {insgesamt}', 'Text-{n}', '{Dateiname}-{n} ('{filename}-{n})
+addPageNumbers.customNumberDesc=Standardmäßig {n}, akzeptiert auch 'Seite {n} von {total}', 'Text-{n}', '{filename}-{n}'
 addPageNumbers.submit=Seitenzahlen hinzufügen
 
 
@@ -478,9 +483,6 @@ pipeline.title=Pipeline
 pageLayout.title=Mehrseitiges Layout
 pageLayout.header=Mehrseitiges Layout
 pageLayout.pagesPerSheet=Seiten pro Blatt:
-##########################
-###  TODO: Translate   ###
-##########################
 pageLayout.addBorder=Add Borders
 pageLayout.submit=Abschicken
 
@@ -635,6 +637,9 @@ pdfOrganiser.submit=Seiten anordnen
 multiTool.title=PDF-Multitool
 multiTool.header=PDF-Multitool
 
+#view pdf
+viewPdf.title=View PDF
+viewPdf.header=View PDF
 
 #pageRemover
 pageRemover.title=Seiten entfernen