fix: use different paths for recording and transcoding (#21)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>

internal/pkg/mediaconvert/coordinator.go

@@ -38,9 +38,12 @@ import (
 	"go.uber.org/zap"
 )
 
+var recordingDir = "r"
+
 // StreamCoordinator represents manager for streams. It creates a new stream for a client and manages it's life cycle.
 type StreamCoordinator struct {
 	conf          *config.Config
+	outputDir     string
 	uploadOptions uploader.Options
 
 	activeTranscoding int32
@@ -59,18 +62,21 @@ var _ handler.LengthDeferrerDataStore = (*StreamCoordinator)(nil)
 
 // NewStreamCoordinator creates a new scheduler for transcode operations.
 func NewStreamCoordinator(ctx context.Context, c *config.Config) *StreamCoordinator {
+	outputDir := filepath.Join(c.OutputDir, recordingDir)
+
 	return &StreamCoordinator{
-		conf: c,
+		conf:      c,
+		outputDir: outputDir,
 		uploadOptions: uploader.Options{
 			RetryDelay:  time.Millisecond * 100,
 			Timeout:     c.Timeout,
 			WorkerCount: uint32(c.MaxThreadCount),
 			RetryCount:  10,
 			BufferSize:  128,
-			Dir:         c.OutputDir,
+			Dir:         outputDir,
 		},
 		mainContext: ctx,
-		logger:      log.FromContext(ctx).With(zap.String("Scheduler", c.OutputDir)),
+		logger:      log.FromContext(ctx).With(zap.String("Scheduler", outputDir)),
 	}
 }
 
@@ -115,7 +121,7 @@ func (s *StreamCoordinator) NewUpload(ctx context.Context, info handler.FileInfo
 
 	var commandOptions = Options{
 		Input:     "pipe:0",
-		OutputDir: s.conf.OutputDir,
+		OutputDir: s.outputDir,
 		Threads:   s.conf.MaxThreadCount,
 		UploadID:  info.ID,
 		Profiles:  profiles,

internal/pkg/mediaconvert/transcoder.go

@@ -34,19 +34,25 @@ import (
 	"gopkg.in/vansante/go-ffprobe.v2"
 )
 
+var transcodingDir = "t"
+
 // Transcoder process one transcoding task
 type Transcoder struct {
-	ctx    context.Context
-	cfg    *config.Config
-	logger *zap.Logger
+	ctx       context.Context
+	cfg       *config.Config
+	outputDir string
+	logger    *zap.Logger
 }
 
 // NewTranscoder creates a new instance of task transcoder
 func NewTranscoder(ctx context.Context, cfg *config.Config) *Transcoder {
+	outputDir := filepath.Join(cfg.OutputDir, transcodingDir)
+
 	var p = &Transcoder{
-		cfg:    cfg,
-		ctx:    ctx,
-		logger: log.FromContext(ctx).With(zap.String("transcoding", "transcoder")),
+		cfg:       cfg,
+		ctx:       ctx,
+		outputDir: outputDir,
+		logger:    log.FromContext(ctx).With(zap.String("transcoding", "transcoder")),
 	}
 
 	return p
@@ -67,7 +73,7 @@ func (p *Transcoder) Transcode(ctx context.Context, task *Task) (*TaskResult, er
 	}
 
 	logger.Debug("phase 2: preparing fs")
-	var destinationFolder = filepath.Join(p.cfg.OutputDir, task.ID)
+	var destinationFolder = filepath.Join(p.outputDir, task.ID)
 	var _, filename = filepath.Split(task.Source)
 	err = os.MkdirAll(destinationFolder, os.ModePerm)
 	if err != nil {
@@ -139,7 +145,7 @@ func (p *Transcoder) Transcode(ctx context.Context, task *Task) (*TaskResult, er
 
 	var opts = Options{
 		Input:     sourceFilePath,
-		OutputDir: p.cfg.OutputDir,
+		OutputDir: p.outputDir,
 		LogLevel:  LogLevel(p.cfg.LogLevel),
 		Profiles:  profiles,
 		UploadID:  task.ID,
@@ -158,9 +164,9 @@ func (p *Transcoder) Transcode(ctx context.Context, task *Task) (*TaskResult, er
 		SourceFile:  sourceFilePath,
 	})
 
-	err = manifest.GenerateHLSPlaylist(profiles, p.cfg.OutputDir, opts.UploadID)
+	err = manifest.GenerateHLSPlaylist(profiles, p.outputDir, opts.UploadID)
 	if err != nil {
-		logger.Error("can not generate hls playlist", zap.String("out", p.cfg.OutputDir), zap.String("uploadID", opts.UploadID))
+		logger.Error("can not generate hls playlist", zap.String("out", p.outputDir), zap.String("uploadID", opts.UploadID))
 		return nil, errors.Wrapf(err, "can not generate hls playlist")
 	}