添加对临时文件的清理

648540858
1 parent b1a66406
Showing 5 changed files with 67 additions and 12 deletions
src/main/java/top/panll/assist/WvpProAssistApplication.java
src/main/java/top/panll/assist/dto/UserSettings.java
src/main/java/top/panll/assist/service/FileManagerTimer.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/resources/application-dev.yml
@@ -2,8 +2,10 @@ package top.panll.assist;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
+@EnableScheduling
 public class WvpProAssistApplication {
     public static void main(String[] args) {
@@ -9,9 +9,12 @@ public class UserSettings {
     @Value("${userSettings.record}")
     private String record;
-    @Value("${userSettings.recordDay}")
+    @Value("${userSettings.recordDay:7}")
     private int recordDay;
+    @Value("${userSettings.recordTempDay:-1}")
+    private int recordTempDay;
+
     @Value("${userSettings.ffmpeg}")
     private String ffmpeg;
@@ -49,4 +52,16 @@ public class UserSettings {
     public void setRecordDay(int recordDay) {
         this.recordDay = recordDay;
     }
+
+    public int getRecordTempDay() {
+        if (recordTempDay == -1) {
+            return recordDay;
+        }else {
+            return recordTempDay;
+        }
+    }
+
+    public void setRecordTempDay(int recordTempDay) {
+        this.recordTempDay = recordTempDay;
+    }
 }
@@ -28,16 +28,16 @@ public class FileManagerTimer {
     @Autowired
     private VideoFileService videoFileService;
-//    @Scheduled(fixedDelay = 20000)   //测试 20秒执行一次
+//    @Scheduled(fixedDelay = 2000)   //测试 20秒执行一次
     @Scheduled(cron = "0 0 0 * * ?")   //每天的0点执行
     public void execute(){
         int recordDay = userSettings.getRecordDay();
-        Date date=new Date();
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        calendar.add(Calendar.DAY_OF_MONTH, 0 - recordDay);
-        date = calendar.getTime();
-        logger.info("[录像巡查]移除 {} 之前的文件", formatter.format(date));
+        Date lastDate=new Date();
+        Calendar lastCalendar = Calendar.getInstance();
+        lastCalendar.setTime(lastDate);
+        lastCalendar.add(Calendar.DAY_OF_MONTH, 0 - recordDay);
+        lastDate = lastCalendar.getTime();
+        logger.info("[录像巡查]移除 {} 之前的文件", formatter.format(lastDate));
         File recordFileDir = new File(userSettings.getRecord());
         if (recordFileDir.canWrite()) {
             List<File> appList = videoFileService.getAppList(false);
@@ -49,12 +49,17 @@ public class FileManagerTimer {
                     List<File> streamList = videoFileService.getStreamList(appFile, false);
                     if (streamList != null && streamList.size() > 0) {
                         for (File streamFile : streamList) {
+                            // 带有sig标记文件的为收藏文件，不被自动清理任务移除
+                            File signFile = new File(streamFile.getAbsolutePath() + File.separator + "sign");
+                            if (signFile.exists()) {
+                                continue;
+                            }
                             List<File> dateList = videoFileService.getDateList(streamFile, null, null, false);
                             if (dateList != null && dateList.size() > 0) {
                                 for (File dateFile : dateList) {
                                     try {
                                         Date parse = formatter.parse(dateFile.getName());
-                                        if (parse.before(date)) {
+                                        if (parse.before(lastDate)) {
                                             boolean result = FileUtils.deleteQuietly(dateFile);
                                             if (result) {
                                                 logger.info("[录像巡查]成功移除 {} ", dateFile.getAbsolutePath());
@@ -85,7 +90,28 @@ public class FileManagerTimer {
                             logger.info("[录像巡查]移除失败 {} ", appFile.getAbsolutePath());
                         }
                     }
-
+                }
+            }
+        }
+        // 清理任务临时文件
+        int recordTempDay = userSettings.getRecordTempDay();
+        Date lastTempDate = new Date();
+        Calendar lastTempCalendar = Calendar.getInstance();
+        lastTempCalendar.setTime(lastTempDate);
+        lastTempCalendar.add(Calendar.DAY_OF_MONTH, 0 - recordTempDay);
+        lastTempDate = lastTempCalendar.getTime();
+        logger.info("[录像巡查]移除合并任务临时文件 {} 之前的文件", formatter.format(lastTempDate));
+        File recordTempFile = new File(recordFileDir.getParentFile().getAbsolutePath() + File.separator +  "recordTemp");
+        if (recordTempFile.exists() && recordTempFile.isDirectory() && recordTempFile.canWrite()) {
+            File[] tempFiles = recordTempFile.listFiles();
+            for (File tempFile : tempFiles) {
+                if (tempFile.isDirectory() && new Date(tempFile.lastModified()).before(lastTempDate)) {
+                    boolean result = FileUtils.deleteQuietly(tempFile);
+                    if (result) {
+                        logger.info("[录像巡查]成功移除合并任务临时文件 {} ", tempFile.getAbsolutePath());
+                    }else {
+                        logger.info("[录像巡查]合并任务临时文件移除失败 {} ", tempFile.getAbsolutePath());
+                    }
                 }
             }
         }
@@ -52,7 +52,10 @@ public class VideoFileService {
     public List<File> getAppList(Boolean sort) {
         File recordFile = new File(userSettings.getRecord());
         if (recordFile != null && recordFile.isDirectory()) {
-            File[] files = recordFile.listFiles();
+            File[] files = recordFile.listFiles((File dir, String name) -> {
+                File currentFile = new File(dir.getAbsolutePath() + File.separator + name);
+                return  currentFile.isDirectory();
+            });
             List<File> result = Arrays.asList(files);
             if (sort != null && sort) {
                 Collections.sort(result);
@@ -107,7 +110,10 @@ public class VideoFileService {
     public List<File> getStreamList(File appFile, Boolean sort) {
         if (appFile != null && appFile.isDirectory()) {
-            File[] files = appFile.listFiles();
+            File[] files = appFile.listFiles((File dir, String name) -> {
+                File currentFile = new File(dir.getAbsolutePath() + File.separator + name);
+                return  currentFile.isDirectory();
+            });
             List<File> result = Arrays.asList(files);
             if (sort != null && sort) {
                 Collections.sort(result);
@@ -390,6 +396,10 @@ public class VideoFileService {
             return null;
         }
         File[] dateFiles = streamFile.listFiles((File dir, String name)->{
+            File currentFile = new File(dir.getAbsolutePath() + File.separator + name);
+            if (currentFile.isDirectory()){
+                return false;
+            }
             Date date = null;
             try {
                 date = simpleDateFormat.parse(name);
@@ -32,6 +32,8 @@ userSettings:
     record: /media/lin/Server/ZLMediaKit/dev/ZLMediaKit/release/linux/Debug/www/record
     # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
     recordDay: 7
+    # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理
+    # recordTempDay: 7
     # [必选 ] ffmpeg路径
     ffmpeg: /usr/bin/ffmpeg
     # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息