mirror of
				https://github.com/Frooodle/Stirling-PDF.git
				synced 2025-10-25 11:17:28 +02:00 
			
		
		
		
	Python fix for new release (#3247)
# Description of Changes Please provide a summary of the changes, including: - What was changed - Why the change was made - Any challenges encountered Closes #(issue_number) --- ## Checklist ### General - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [ ] I have performed a self-review of my own code - [ ] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details. --------- Co-authored-by: a <a> Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com> Co-authored-by: Connor Yoh <con.yoh13@gmail.com>
This commit is contained in:
		
							parent
							
								
									546749ad5f
								
							
						
					
					
						commit
						9951695eb1
					
				| @ -73,8 +73,8 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a | |||||||
|     py3-pillow@testing \ |     py3-pillow@testing \ | ||||||
|     py3-pdf2image@testing && \ |     py3-pdf2image@testing && \ | ||||||
|     python3 -m venv /opt/venv && \ |     python3 -m venv /opt/venv && \ | ||||||
|     pip install --upgrade pip && \ |     /opt/venv/bin/pip install --upgrade pip && \ | ||||||
|     pip install --no-cache-dir --upgrade unoserver weasyprint && \ |     /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \ | ||||||
|     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \ |     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \ | ||||||
|     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \ |     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \ | ||||||
|     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \ |     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \ | ||||||
|  | |||||||
| @ -83,8 +83,8 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a | |||||||
|     py3-pillow@testing \ |     py3-pillow@testing \ | ||||||
|     py3-pdf2image@testing && \ |     py3-pdf2image@testing && \ | ||||||
|     python3 -m venv /opt/venv && \ |     python3 -m venv /opt/venv && \ | ||||||
|     pip install --upgrade pip && \ |     /opt/venv/bin/pip install --upgrade pip && \ | ||||||
|     pip install --no-cache-dir --upgrade unoserver weasyprint && \ |     /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \ | ||||||
|     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \ |     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \ | ||||||
|     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \ |     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \ | ||||||
|     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \ |     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \ | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| services: | services: | ||||||
|   stirling-pdf: |   stirling-pdf: | ||||||
|     container_name: Stirling-PDF-Security-Fat-with-login |     container_name: Stirling-PDF-Security-Fat-with-login | ||||||
|     image: stirlingtools/stirling-pdf:latest-fat |     image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat | ||||||
|     deploy: |     deploy: | ||||||
|       resources: |       resources: | ||||||
|         limits: |         limits: | ||||||
|  | |||||||
| @ -147,10 +147,10 @@ public class MergeController { | |||||||
|                 filesToDelete.add(tempFile); // Add temp file to the list for later deletion |                 filesToDelete.add(tempFile); // Add temp file to the list for later deletion | ||||||
|                 mergerUtility.addSource(tempFile); // Add source file to the merger utility |                 mergerUtility.addSource(tempFile); // Add source file to the merger utility | ||||||
|             } |             } | ||||||
|              | 
 | ||||||
|             mergedTempFile = Files.createTempFile("merged-", ".pdf").toFile(); |             mergedTempFile = Files.createTempFile("merged-", ".pdf").toFile(); | ||||||
|             mergerUtility.setDestinationFileName(mergedTempFile.getAbsolutePath()); |             mergerUtility.setDestinationFileName(mergedTempFile.getAbsolutePath()); | ||||||
|              | 
 | ||||||
|             mergerUtility.mergeDocuments( |             mergerUtility.mergeDocuments( | ||||||
|                     pdfDocumentFactory.getStreamCacheFunction(totalSize)); // Merge the documents |                     pdfDocumentFactory.getStreamCacheFunction(totalSize)); // Merge the documents | ||||||
| 
 | 
 | ||||||
| @ -189,14 +189,14 @@ public class MergeController { | |||||||
|             log.error("Error in merge pdf process", ex); |             log.error("Error in merge pdf process", ex); | ||||||
|             throw ex; |             throw ex; | ||||||
|         } finally { |         } finally { | ||||||
|         	if (mergedDocument != null) { |             if (mergedDocument != null) { | ||||||
|                 mergedDocument.close(); // Close the merged document |                 mergedDocument.close(); // Close the merged document | ||||||
|             } |             } | ||||||
|             for (File file : filesToDelete) { |             for (File file : filesToDelete) { | ||||||
|                 if (file != null) { |                 if (file != null) { | ||||||
|                     Files.deleteIfExists(file.toPath()); // Delete temporary files |                     Files.deleteIfExists(file.toPath()); // Delete temporary files | ||||||
|                 } |                 } | ||||||
|             }  |             } | ||||||
|             if (mergedTempFile != null) { |             if (mergedTempFile != null) { | ||||||
|                 Files.deleteIfExists(mergedTempFile.toPath()); |                 Files.deleteIfExists(mergedTempFile.toPath()); | ||||||
|             } |             } | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user