fix:fixed #20 in experimental ix

MC-XiaoHei · Apr 5, 2024 · 58c7fee · 58c7fee
1 parent b2bec5e
commit 58c7fee
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,7 @@ repositories {
 
 dependencies {
     compileOnly(files("libs/ThemisAPI_0.15.3.jar"))
-    compileOnly(files("libs/Matrix_7.7.15A.jar"))
+    compileOnly(files("libs/Matrix_7.7.31A.jar"))
     implementation("com.moandjiezana.toml:toml4j:0.7.2")
     compileOnly("top.leavesmc.leaves:leaves-api:1.20.4-R0.1-SNAPSHOT")
     implementation("dev.jorel:commandapi-bukkit-shade:9.3.0")

diff --git a/libs/Matrix_7.7.15A.jar b/libs/Matrix_7.7.15A.jar
diff --git a/libs/Matrix_7.7.31A.jar b/libs/Matrix_7.7.31A.jar
diff --git a/src/main/java/cn/xor7/iseeyou/ConfigData.kt b/src/main/java/cn/xor7/iseeyou/ConfigData.kt
@@ -56,6 +56,7 @@ data class HighSpeedPauseConfig(
 
 data class OutdatedRecordRetentionConfig(
     var enabled: Boolean = false,
+    var interval: Int = 24,
     var days: Int = 7,
 )
 

diff --git a/src/main/java/cn/xor7/iseeyou/ISeeYou.kt b/src/main/java/cn/xor7/iseeyou/ISeeYou.kt
@@ -23,6 +23,10 @@ import java.time.Duration
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.util.*
+import java.util.concurrent.Callable
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
 import kotlin.io.path.isDirectory
 import kotlin.math.pow
 
@@ -62,9 +66,14 @@ class ISeeYou : JavaPlugin(), CommandExecutor {
                 (toml!!.data.pauseRecordingOnHighSpeed.threshold / 20).pow(2.0)
             if (toml!!.data.clearOutdatedRecordFile.enabled) {
                 cleanOutdatedRecordings()
+                var interval = toml!!.data.clearOutdatedRecordFile.interval
+                if (interval !in 1..24 ) {
+                    interval = 24
+                    logger.warning("Failed to load the interval parameter, reset to the default value of 24.")
+                }
                 object : BukkitRunnable() {
                     override fun run() = cleanOutdatedRecordings()
-                }.runTaskTimer(this, 0, 20 * 60 * 60 * 24) // Every day
+                }.runTaskTimer(this, 0, 20 * 60 * 60 * (interval.toLong()))
             }
             Bukkit.getPluginManager().registerEvents(EventListener, this)
         } else {
@@ -203,16 +212,29 @@ class ISeeYou : JavaPlugin(), CommandExecutor {
 
     private fun cleanOutdatedRecordings() {
         try {
-            val recordingsDir = Paths.get(".")
-            logger.info("Start to delete outdated recordings in $recordingsDir")
+            val recordPathA: String = toml!!.data.recordPath
+            val recordPathB: String = toml!!.data.recordSuspiciousPlayer.recordPath
+            val recordingsDirA = Paths.get(recordPathA).parent
+            val recordingsDirB = Paths.get(recordPathB).parent
+
+            logger.info("Start to delete outdated recordings in $recordingsDirA and $recordingsDirB")
             var deletedCount = 0
-            Files.walk(recordingsDir).use { paths ->
-                paths.filter { Files.isDirectory(it) && it.parent == recordingsDir }
+
+            Files.walk(recordingsDirA).use { paths ->
+                paths.filter { Files.isDirectory(it) && it.parent == recordingsDirA }
                     .forEach { folder ->
                         deletedCount += deleteRecordingFiles(folder)
                     }
             }
-            logger.info("Finished deleting outdated recordings in $recordingsDir, deleted $deletedCount files")
+
+            Files.walk(recordingsDirB).use { paths ->
+                paths.filter { Files.isDirectory(it) && it.parent == recordingsDirB }
+                    .forEach { folder ->
+                        deletedCount += deleteRecordingFiles(folder)
+                    }
+            }
+
+            logger.info("Finished deleting outdated recordings, deleted $deletedCount files")
         } catch (e: IOException) {
             logger.severe("Error occurred while cleaning outdated recordings: ${e.message}")
             e.printStackTrace()
@@ -221,28 +243,48 @@ class ISeeYou : JavaPlugin(), CommandExecutor {
 
     private fun deleteRecordingFiles(folderPath: Path): Int {
         var deletedCount = 0
+        var fileCount = 0
         try {
             val currentDate = LocalDate.now()
             Files.walk(folderPath).use { paths ->
                 paths.filter { Files.isRegularFile(it) && it.toString().endsWith(".mcpr") }
                     .forEach { file ->
+                        fileCount++
                         val fileName = file.fileName.toString()
                         val creationDateStr = fileName.substringBefore('@')
                         val creationDate = LocalDate.parse(creationDateStr)
                         val daysSinceCreation =
                             Duration.between(creationDate.atStartOfDay(), currentDate.atStartOfDay()).toDays()
                         if (daysSinceCreation > outdatedRecordRetentionDays) {
+                            val executor = Executors.newSingleThreadExecutor()
+                            val future = executor.submit(Callable {
+                                try {
+                                    Files.delete(file)
+                                    logger.info("Deleted recording file: $fileName")
+                                    true
+                                } catch (e: IOException) {
+                                    logger.severe("Error occurred while deleting recording file: $fileName, Error: ${e.message}")
+                                    e.printStackTrace()
+                                    false
+                                }
+                            })
+
                             try {
-                                Files.delete(file)
-                                logger.info("Deleted recording file: $fileName")
-                                deletedCount++
-                            } catch (e: IOException) {
-                                logger.severe("Error occurred while deleting recording file: $fileName, Error: ${e.message}")
-                                e.printStackTrace()
+                                if (future.get(2, TimeUnit.SECONDS)) {
+                                    deletedCount++
+                                }
+                            } catch (e: TimeoutException) {
+                                logger.warning("Timeout deleting file: $fileName. Skipping...")
+                                future.cancel(true)
+                            } finally {
+                                executor.shutdown()
                             }
                         }
                     }
             }
+            if (fileCount == 0 || deletedCount == 0) {
+                logger.info("No outdated recording files found to delete.")
+            }
         } catch (e: IOException) {
             logger.severe("Error occurred while processing recording files in folder: $folderPath, Error: ${e.message}")
             e.printStackTrace()