🐛 Bug fixes and optimization

pkg/internal/services/analyzer.go

@@ -53,7 +53,10 @@ func ScanUnanalyzedFileFromDatabase() {
 	}
 
 	var attachments []models.Attachment
-	if err := database.C.Where("destination = ? OR is_analyzed = ?", models.AttachmentDstTemporary, false).Find(&attachments).Error; err != nil {
+	if err := database.C.
+		Where("is_uploaded = ?", true).
+		Where("destination = ? OR is_analyzed = ?", models.AttachmentDstTemporary, false).
+		Find(&attachments).Error; err != nil {
 		log.Error().Err(err).Msg("Scan unanalyzed files from database failed...")
 		return
 	}
@@ -93,7 +96,9 @@ func ScanUnanalyzedFileFromDatabase() {
 }
 
 func AnalyzeAttachment(file models.Attachment) error {
-	if file.Destination != models.AttachmentDstTemporary {
+	if !file.IsUploaded {
+		return fmt.Errorf("file isn't finish multipart upload")
+	} else if file.Destination != models.AttachmentDstTemporary {
 		return fmt.Errorf("attachment isn't in temporary storage, unable to analyze")
 	}
 

pkg/internal/services/merger.go

@@ -25,6 +25,7 @@ func MergeFileChunks(meta models.Attachment, arrange []string) (models.Attachmen
 	}
 	defer destFile.Close()
 
+	// Merge files
 	for _, chunk := range arrange {
 		chunkPath := filepath.Join(dest.Path, fmt.Sprintf("%s.%s", meta.Uuid, chunk))
 		chunkFile, err := os.Open(chunkPath)
@@ -41,10 +42,17 @@ func MergeFileChunks(meta models.Attachment, arrange []string) (models.Attachmen
 		_ = chunkFile.Close()
 	}
 
+	// Do post-upload tasks
 	meta.IsUploaded = true
 	database.C.Save(&meta)
 
 	PublishAnalyzeTask(meta)
 
+	// Clean up
+	for _, chunk := range arrange {
+		chunkPath := filepath.Join(dest.Path, fmt.Sprintf("%s.%s", meta.Uuid, chunk))
+		_ = os.Remove(chunkPath)
+	}
+
 	return meta, nil
 }

pkg/internal/services/recycler.go

@@ -64,7 +64,7 @@ func RunMarkLifecycleDeletionTask() {
 }
 
 func RunMarkMultipartDeletionTask() {
-	lifecycle := time.Now().Add(-24 * time.Hour)
+	lifecycle := time.Now().Add(-60 * time.Minute)
 	tx := database.C.
 		Where("created_at < ?", lifecycle).
 		Where("is_uploaded = ?", false).