From 9d42534d260543ac4fbf8d2e62e1f45312bfb008 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Tue, 5 Aug 2025 22:51:17 +0100
Subject: [PATCH] Update TempFileCleanupService.java

---
 .../service/TempFileCleanupService.java       | 60 +++++++++++++++++--
 1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/app/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java b/app/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java
index df85a016b..26ebc36f0 100644
--- a/app/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java
+++ b/app/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java
@@ -56,13 +56,20 @@ public class TempFileCleanupService {
                             || fileName.startsWith("pdf-stream-")
                             || fileName.startsWith("PDFBox")
                             || fileName.startsWith("input_")
-                            || fileName.startsWith("overlay-");
+                            || fileName.startsWith("overlay-")
+                            || fileName.startsWith("signature")
+                            || fileName.startsWith("original_")
+                            || fileName.startsWith("preprocessed_")
+                            || fileName.startsWith("temp")
+                            || fileName.startsWith("gs_")
+                            || fileName.startsWith("MultiPart");
 
     // File patterns that identify common system temp files
     private static final Predicate<String> IS_SYSTEM_TEMP_FILE =
             fileName ->
-                    fileName.matches("lu\\d+[a-z0-9]*\\.tmp")
+                    fileName.matches("lu\\d+[a-z0-9]*(\\.tmp)?")
                             || fileName.matches("ocr_process\\d+")
+                            || fileName.contains("ocrmypdf.io.")
                             || (fileName.startsWith("tmp") && !fileName.contains("jetty"))
                             || fileName.startsWith("OSL_PIPE_")
                             || (fileName.endsWith(".tmp") && !fileName.contains("jetty"));
@@ -70,8 +77,9 @@ public class TempFileCleanupService {
     // File patterns that should be excluded from cleanup
     private static final Predicate<String> SHOULD_SKIP =
             fileName ->
-                    fileName.contains("jetty")
-                            || fileName.startsWith("jetty-")
+                    (fileName.contains("jetty")
+                                    && !fileName.startsWith("jetty-0_0_0_0-8080--_-any-"))
+                            || fileName.startsWith("jetty-docbase")
                             || "proc".equals(fileName)
                             || "sys".equals(fileName)
                             || "dev".equals(fileName)
@@ -395,6 +403,18 @@ public class TempFileCleanupService {
             log.debug("Could not check file info, skipping: {}", path);
         }
 
+        // Fallback: if file is in our managed temp directories and older than maxAge, delete it
+        // regardless of filename pattern (this catches any temp files we might have missed)
+        if (!shouldDelete && maxAgeMillis > 0 && lastModified > 0) {
+            boolean isInManagedTempDir = isInManagedTempDirectory(path);
+            boolean isOlderThanMaxAge = (currentTime - lastModified) > maxAgeMillis;
+
+            if (isInManagedTempDir && isOlderThanMaxAge) {
+                shouldDelete = true;
+                log.debug("Deleting old file in managed temp directory: {}", path);
+            }
+        }
+
         // Check file age against maxAgeMillis only if it's not an empty file that we've already
         // decided to delete
         if (!isEmptyFile && shouldDelete && maxAgeMillis > 0) {
@@ -405,6 +425,38 @@ public class TempFileCleanupService {
         return shouldDelete;
     }
 
+    /** Check if a path is within one of our managed temp directories. */
+    private boolean isInManagedTempDirectory(Path path) {
+        try {
+            ApplicationProperties.TempFileManagement tempFiles =
+                    applicationProperties.getSystem().getTempFileManagement();
+
+            String baseTmpDir = tempFiles.getBaseTmpDir();
+            String libreOfficeDir = tempFiles.getLibreofficeDir();
+
+            // Check if path is under our main temp directory
+            if (baseTmpDir != null && !baseTmpDir.isEmpty()) {
+                Path baseTempPath = Path.of(baseTmpDir).toAbsolutePath().normalize();
+                if (path.toAbsolutePath().normalize().startsWith(baseTempPath)) {
+                    return true;
+                }
+            }
+
+            // Check if path is under LibreOffice temp directory
+            if (libreOfficeDir != null && !libreOfficeDir.isEmpty()) {
+                Path libreOfficePath = Path.of(libreOfficeDir).toAbsolutePath().normalize();
+                if (path.toAbsolutePath().normalize().startsWith(libreOfficePath)) {
+                    return true;
+                }
+            }
+
+        } catch (Exception e) {
+            log.debug("Error checking if path is in managed temp directory: {}", path, e);
+        }
+
+        return false;
+    }
+
     /** Clean up LibreOffice temporary files. This method is called after LibreOffice operations. */
     public void cleanupLibreOfficeTempFiles() {
         // Cleanup known LibreOffice temp directories