统一持久化临时目录

Author: j2rong4cn

internal/bootstrap/config.go

@@ -125,9 +125,14 @@ func InitConfig() {
 	if err != nil {
 		log.Fatalf("create temp dir error: %+v", err)
 	}
+	err = os.MkdirAll(conf.GetPersistentTempDir(), 0o777)
+	if err != nil {
+		log.Fatalf("create persistent temp dir error: %+v", err)
+	}
 	log.Debugf("config: %+v", conf.Conf)
 	base.InitClient()
 	initURL()
+	CleanTempDir()
 }
 
 func confFromEnv() {
@@ -160,6 +165,9 @@ func CleanTempDir() {
 		log.Errorln("failed list temp file: ", err)
 	}
 	for _, file := range files {
+		if file.Name() == "persistent" {
+			continue
+		}
 		if err := os.RemoveAll(filepath.Join(conf.Conf.TempDir, file.Name())); err != nil {
 			log.Errorln("failed delete temp file: ", err)
 		}

internal/bootstrap/task.go

@@ -38,9 +38,6 @@ func InitTaskManager() {
 	op.RegisterSettingChangingCallback(func() {
 		tool.TransferTaskManager.SetWorkersNumActive(taskFilterNegative(setting.GetInt(conf.TaskOfflineDownloadTransferThreadsNum, conf.Conf.Tasks.Transfer.Workers)))
 	})
-	if len(tool.TransferTaskManager.GetAll()) == 0 { //prevent offline downloaded files from being deleted
-		CleanTempDir()
-	}
 	fs.ArchiveDownloadTaskManager = tache.NewManager[*fs.ArchiveDownloadTask](tache.WithWorks(setting.GetInt(conf.TaskDecompressDownloadThreadsNum, conf.Conf.Tasks.Decompress.Workers)), tache.WithPersistFunction(db.GetTaskDataFunc("decompress", conf.Conf.Tasks.Decompress.TaskPersistant), db.UpdateTaskDataFunc("decompress", conf.Conf.Tasks.Decompress.TaskPersistant)), tache.WithMaxRetry(conf.Conf.Tasks.Decompress.MaxRetry))
 	op.RegisterSettingChangingCallback(func() {
 		fs.ArchiveDownloadTaskManager.SetWorkersNumActive(taskFilterNegative(setting.GetInt(conf.TaskDecompressDownloadThreadsNum, conf.Conf.Tasks.Decompress.Workers)))

internal/conf/config.go

@@ -245,3 +245,7 @@ func DefaultConfig(dataDir string) *Config {
 		LastLaunchedVersion: "",
 	}
 }
+
+func GetPersistentTempDir() string {
+	return filepath.Join(Conf.TempDir, "persistent")
+}

internal/db/slice_upload.go

@@ -6,12 +6,12 @@ import (
 	"path/filepath"
 	"strings"
 	"time"
-	
+
+	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/model/tables"
-	"github.com/OpenListTeam/OpenList/v4/pkg/tempdir"
 	"github.com/pkg/errors"
-	"gorm.io/gorm"
 	log "github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 )
 
 func CreateSliceUpload(su *tables.SliceUpload) error {
@@ -52,11 +52,11 @@ func GetIncompleteSliceUploads() ([]*tables.SliceUpload, error) {
 		tables.SliceUploadStatusProxyComplete,
 		tables.SliceUploadStatusPendingComplete,
 	}).Find(&uploads).Error
-	
+
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
-	
+
 	return uploads, nil
 }
 
@@ -75,10 +75,10 @@ func UpdateSliceStatusAtomic(taskID string, sliceNum int, status []byte) error {
 		if err := tx.Where("task_id = ?", taskID).First(&su).Error; err != nil {
 			return err
 		}
-		
+
 		// 更新分片状态
 		tables.SetSliceUploaded(su.SliceUploadStatus, sliceNum)
-		
+
 		// 保存更新
 		return tx.Save(&su).Error
 	}))
@@ -88,15 +88,15 @@ func UpdateSliceStatusAtomic(taskID string, sliceNum int, status []byte) error {
 func CleanupOrphanedSliceUploads() error {
 	// 清理超过24小时的未完成任务
 	cutoff := time.Now().Add(-24 * time.Hour)
-	
+
 	var orphanedTasks []tables.SliceUpload
-	if err := db.Where("status IN (?, ?) AND updated_at < ?", 
-		tables.SliceUploadStatusWaiting, 
-		tables.SliceUploadStatusUploading, 
+	if err := db.Where("status IN (?, ?) AND updated_at < ?",
+		tables.SliceUploadStatusWaiting,
+		tables.SliceUploadStatusUploading,
 		cutoff).Find(&orphanedTasks).Error; err != nil {
 		return errors.WithStack(err)
 	}
-	
+
 	cleanedCount := 0
 	for _, task := range orphanedTasks {
 		// 清理临时文件
@@ -107,106 +107,106 @@ func CleanupOrphanedSliceUploads() error {
 				log.Debugf("Removed orphaned tmp file: %s", task.TmpFile)
 			}
 		}
-		
+
 		// 删除数据库记录
 		if err := db.Delete(&task).Error; err != nil {
 			log.Errorf("Failed to delete orphaned slice upload task %s: %v", task.TaskID, err)
 		} else {
 			cleanedCount++
 		}
 	}
-	
+
 	if cleanedCount > 0 {
 		log.Infof("Cleaned up %d orphaned slice upload tasks", cleanedCount)
 	}
-	
+
 	// 额外清理：扫描临时目录中的孤儿文件
 	return cleanupOrphanedTempFiles()
 }
 
 // cleanupOrphanedTempFiles 清理临时目录中的孤儿文件
 func cleanupOrphanedTempFiles() error {
 	// 获取临时目录路径，使用共享的tempdir包
-	tempDir := tempdir.GetPersistentTempDir()
-	
+	tempDir := conf.GetPersistentTempDir()
+
 	// 检查临时目录是否存在
 	if _, err := os.Stat(tempDir); os.IsNotExist(err) {
 		log.Debugf("Temp directory does not exist: %s", tempDir)
 		return nil
 	}
-	
+
 	// 获取所有活跃的分片上传任务的临时文件列表
 	var activeTasks []tables.SliceUpload
-	if err := db.Where("tmp_file IS NOT NULL AND tmp_file != '' AND status IN (?, ?)", 
-		tables.SliceUploadStatusWaiting, 
+	if err := db.Where("tmp_file IS NOT NULL AND tmp_file != '' AND status IN (?, ?)",
+		tables.SliceUploadStatusWaiting,
 		tables.SliceUploadStatusUploading).Find(&activeTasks).Error; err != nil {
 		return errors.WithStack(err)
 	}
-	
+
 	// 构建活跃文件的映射表
 	activeFiles := make(map[string]bool)
 	for _, task := range activeTasks {
 		if task.TmpFile != "" {
 			activeFiles[task.TmpFile] = true
 		}
 	}
-	
+
 	cleanedCount := 0
 	cutoff := time.Now().Add(-24 * time.Hour) // 只清理超过24小时的文件
-	
+
 	// 遍历临时目录
 	err := filepath.WalkDir(tempDir, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			log.Warnf("Failed to access path %s: %v", path, err)
 			return nil // 继续处理其他文件
 		}
-		
+
 		// 跳过目录
 		if d.IsDir() {
 			return nil
 		}
-		
+
 		// 只处理分片上传临时文件（以slice_upload_开头）
 		if !strings.HasPrefix(d.Name(), "slice_upload_") {
 			return nil
 		}
-		
+
 		// 检查文件是否在活跃任务列表中
 		if activeFiles[path] {
 			return nil // 文件仍在使用中，跳过
 		}
-		
+
 		// 检查文件修改时间
 		info, err := d.Info()
 		if err != nil {
 			log.Warnf("Failed to get file info for %s: %v", path, err)
 			return nil
 		}
-		
+
 		// 只清理超过24小时的文件
 		if info.ModTime().After(cutoff) {
 			return nil
 		}
-		
+
 		// 删除孤儿文件
 		if err := os.Remove(path); err != nil {
 			log.Warnf("Failed to remove orphaned temp file %s: %v", path, err)
 		} else {
 			log.Debugf("Removed orphaned temp file: %s", path)
 			cleanedCount++
 		}
-		
+
 		return nil
 	})
-	
+
 	if err != nil {
 		log.Errorf("Failed to walk temp directory %s: %v", tempDir, err)
 		return errors.WithStack(err)
 	}
-	
+
 	if cleanedCount > 0 {
 		log.Infof("Cleaned up %d orphaned temp files from %s", cleanedCount, tempDir)
 	}
-	
+
 	return nil
 }