Refactored downloader

api/internal/app/router/router.go

@@ -2,16 +2,20 @@ package router
 
 import (
 	"downloader/internal/app/api/download"
+	"downloader/internal/app/infrastructure/logger"
 	"downloader/internal/core/ports/download_request/in_memory"
-	"downloader/internal/core/ports/downloader/yt_downloader"
+	"downloader/internal/core/ports/downloadhandler"
+	"downloader/internal/core/ports/filehandler/mover/local"
+	"downloader/internal/core/ports/fileorchestrator"
+	"downloader/internal/core/ports/fileorchestrator/destinationhandler"
+	"downloader/internal/core/ports/fileorchestrator/sourcehandler"
 	"downloader/internal/core/services/download/default"
+	"downloader/internal/core/services/download/handlers"
+	"downloader/internal/core/services/downloader"
 	"downloader/pkg/common/uuid"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"net/http"
-	"os"
 	"time"
 )
 
@@ -54,40 +58,21 @@ func (router *router) setupRoutes() *router {
 }
 
 func setupDownloadRoute(router *router) {
-	sugaredLogger := setupLogger()
+	newLogger := logger.New()
+	sourceHandler := sourcehandler.New()
+	mover := local.New(newLogger)
+	destinationHandler := destinationhandler.New(mover)
+	fileOrchestrator := fileorchestrator.New(newLogger, sourceHandler, destinationHandler)
 
-	drRepository := in_memory.NewInMemoryRepository(sugaredLogger)
-	downloader := yt_downloader.New(sugaredLogger)
-	drBackgroundService := _default.NewLocalBackgroundService(drRepository, sugaredLogger, downloader)
+	drRepository := in_memory.NewInMemoryRepository(newLogger)
+	//dlHandler := downloadhandler.NewYoutubeDlDownloader(newLogger)
+	dlHandler := downloadhandler.NewYtDlpDownloader(newLogger)
+	ondlHandler := handlers.New(drRepository, newLogger)
+	dwnloader := downloader.New(newLogger, fileOrchestrator, dlHandler, ondlHandler)
+	drBackgroundService := _default.NewLocalBackgroundService(drRepository, newLogger, dwnloader)
 	gen := uuid.New()
+	drService := _default.NewLocalService(drRepository, gen, drBackgroundService, newLogger)
 
-	drService := _default.NewLocalService(drRepository, gen, drBackgroundService, sugaredLogger)
 	downloadApi := download.New(drService)
 	downloadApi.SetupDownloadApi(router.internalRouter)
 }
-
-func setupLogger() *zap.SugaredLogger {
-	consoleEncoder := zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig())
-	jsonEncoder := zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig())
-
-	consoleDebugging := zapcore.Lock(os.Stdout)
-	lowPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
-		return lvl < zapcore.ErrorLevel
-	})
-	highPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
-		return lvl >= zapcore.ErrorLevel
-	})
-	consoleErrors := zapcore.Lock(os.Stderr)
-	core := zapcore.NewTee(
-		zapcore.NewCore(jsonEncoder, consoleErrors, highPriority),
-		zapcore.NewCore(jsonEncoder, consoleDebugging, highPriority),
-		zapcore.NewCore(consoleEncoder, consoleErrors, highPriority),
-		zapcore.NewCore(consoleEncoder, consoleDebugging, lowPriority),
-	)
-	logger := zap.New(core)
-	defer func(logger *zap.Logger) {
-		_ = logger.Sync()
-	}(logger)
-	sugaredLogger := logger.Sugar()
-	return sugaredLogger
-}