feat(JCEF): clean outdated library directories

CCBlueX · Feb 20, 2025 · 3907c2a · 3907c2a
1 parent dd9506d
commit 3907c2a
Showing 1 changed file with 25 additions and 23 deletions.
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/integration/browser/supports/JcefBrowser.kt b/src/main/kotlin/net/ccbluex/liquidbounce/integration/browser/supports/JcefBrowser.kt
@@ -109,37 +109,39 @@ class JcefBrowser : IBrowser, EventListener {
     }
 
     /**
-     * Cleans up old cache directories.
+     * Cleans up old cache and library directories.
      *
      * TODO: Check if we have an active PID using the cache directory, if so, check if the LiquidBounce
      *   process attached to the JCEF PID is still running or not. If not, we could kill the JCEF process
      *   and clean up the cache directory.
      */
     fun cleanup() {
-        if (cacheFolder.exists()) {
-            runCatching {
-                cacheFolder.listFiles()
-                    ?.filter { file ->
-                        file.isDirectory && System.currentTimeMillis() - file.lastModified() > CACHE_CLEANUP_THRESHOLD
-                    }
-                    ?.sumOf { file ->
-                        try {
-                            val fileSize = file.walkTopDown().sumOf { uFile -> uFile.length() }
-                            file.deleteRecursively()
-                            fileSize
-                        } catch (e: Exception) {
-                            logger.error("Failed to clean up old cache directory", e)
-                            0
-                        }
-                    } ?: 0
-            }.onFailure {
-                // Not a big deal, not fatal.
-                logger.error("Failed to clean up old JCEF cache directories", it)
-            }.onSuccess { size ->
-                if (size > 0) {
-                    logger.info("Cleaned up ${size.formatBytesAsSize()} JCEF cache directories")
+        runCatching {
+            val currentLibraryDirectory = MCEF.INSTANCE.resourceManager?.commitDirectory
+
+            buildList {
+                cacheFolder.listFiles()?.let(::addAll)
+                librariesFolder.listFiles()?.let(::addAll)
+            }.filter { file ->
+                file != currentLibraryDirectory && file.isDirectory
+                    && System.currentTimeMillis() - file.lastModified() > CACHE_CLEANUP_THRESHOLD
+            }.sumOf { file ->
+                try {
+                    val fileSize = file.walkTopDown().sumOf { uFile -> uFile.length() }
+                    file.deleteRecursively()
+                    fileSize
+                } catch (e: Exception) {
+                    logger.error("Failed to clean up old cache directory", e)
+                    0
                 }
             }
+        }.onFailure {
+            // Not a big deal, not fatal.
+            logger.error("Failed to clean up old JCEF cache directories", it)
+        }.onSuccess { size ->
+            if (size > 0) {
+                logger.info("Cleaned up ${size.formatBytesAsSize()} JCEF cache directories")
+            }
         }
     }