main: fixes downloads cleanup

util/av/remux.go

@@ -16,6 +16,7 @@ func RemuxFile(
 	if err != nil {
 		return fmt.Errorf("failed to rename file: %v", err)
 	}
+	defer os.Remove(tempFileName)
 	err = ffmpeg.
 		Input(tempFileName).
 		Output(outputFile, ffmpeg.KwArgs{
@@ -27,9 +28,5 @@ func RemuxFile(
 	if err != nil {
 		return fmt.Errorf("failed to remux file: %v", err)
 	}
-	err = os.Remove(tempFileName)
-	if err != nil {
-		return fmt.Errorf("failed to remove temp file: %v", err)
-	}
 	return nil
 }

util/download.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"log"
 	"math"
 	"net/http"
 	"os"
@@ -64,6 +63,7 @@ func DownloadFile(
 			if config.Remux {
 				err := av.RemuxFile(filePath)
 				if err != nil {
+					os.Remove(filePath)
 					return "", fmt.Errorf("remuxing failed: %w", err)
 				}
 			}
@@ -93,13 +93,10 @@ func DownloadFileWithSegments(
 	if err := os.MkdirAll(tempDir, 0755); err != nil {
 		return "", fmt.Errorf("failed to create temporary directory: %w", err)
 	}
-	var cleanupErr error
-	defer func() {
-		if cleanupErr = os.RemoveAll(tempDir); cleanupErr != nil {
-			log.Printf("warning: failed to clean up temp directory %s: %v\n", tempDir, cleanupErr)
-		}
-	}()
-	downloadedFiles, err := DownloadSegments(ctx, segmentURLs, config)
+
+	defer os.RemoveAll(tempDir)
+
+	downloadedFiles, err := downloadSegments(ctx, segmentURLs, config)
 	if err != nil {
 		os.RemoveAll(tempDir)
 		return "", fmt.Errorf("failed to download segments: %w", err)
@@ -446,7 +443,7 @@ func createChunks(fileSize int, chunkSize int) [][2]int {
 	return chunks
 }
 
-func DownloadSegments(
+func downloadSegments(
 	ctx context.Context,
 	segmentURLs []string,
 	config *models.DownloadConfig,
@@ -462,6 +459,7 @@ func DownloadSegments(
 	if err := os.MkdirAll(tempDir, 0755); err != nil {
 		return nil, fmt.Errorf("failed to create temporary directory: %w", err)
 	}
+	defer os.RemoveAll(tempDir)
 
 	semaphore := make(chan struct{}, config.Concurrency)
 	var wg sync.WaitGroup
@@ -524,13 +522,6 @@ func DownloadSegments(
 		close(errChan)
 	}()
 
-	for err := range errChan {
-		if err != nil {
-			os.RemoveAll(tempDir)
-			return nil, err
-		}
-	}
-
 	return downloadedFiles, nil
 }