From eb8b6a9a17693eb13405c6288fa185612f038a63 Mon Sep 17 00:00:00 2001
From: Jarek Sacha <jpsacha@gmail.com>
Date: Mon, 5 Jun 2023 21:10:39 -0400
Subject: [PATCH] Refactor: `using` `given` logger

---
 src/main/scala/ij_plugins/imagej_launcher/IJDir.scala     | 2 +-
 src/main/scala/ij_plugins/imagej_launcher/Launcher.scala  | 4 ++--
 src/main/scala/ij_plugins/imagej_launcher/Updater.scala   | 8 ++++----
 .../scala/ij_plugins/imagej_launcher/UpdaterDemo.scala    | 3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/ij_plugins/imagej_launcher/IJDir.scala b/src/main/scala/ij_plugins/imagej_launcher/IJDir.scala
index 096cc5d..36260af 100644
--- a/src/main/scala/ij_plugins/imagej_launcher/IJDir.scala
+++ b/src/main/scala/ij_plugins/imagej_launcher/IJDir.scala
@@ -16,7 +16,7 @@ object IJDir:
   val jarsDirName = "jars"
 
   /** Locate ImageJ directory */
-  def locate(config: Config, logger: Logger): Either[String, Path] =
+  def locate(config: Config)(using logger: Logger): Either[String, Path] =
     logger.debug("Looking for ImageJ directory")
 
     config.ijDir match
diff --git a/src/main/scala/ij_plugins/imagej_launcher/Launcher.scala b/src/main/scala/ij_plugins/imagej_launcher/Launcher.scala
index 56dde7b..694d183 100644
--- a/src/main/scala/ij_plugins/imagej_launcher/Launcher.scala
+++ b/src/main/scala/ij_plugins/imagej_launcher/Launcher.scala
@@ -28,8 +28,8 @@ class Launcher(using logger: Logger):
 
   private def prepareLaunch(config: Config): Either[String, Seq[String]] =
     for
-      ijDir       <- IJDir.locate(config, logger)
-      _           <- Updater.update(ijDir, config.dryRun, logger)
+      ijDir       <- IJDir.locate(config)
+      _           <- Updater.update(ijDir, config.dryRun)
       ijConfig    <- IJConfigFile.readFromDir(ijDir)
       launcherJar <- findImageJLauncherJar(ijDir.toIO)
       javaExe     <- locateJavaExecutable(config, ijDir.toIO)
diff --git a/src/main/scala/ij_plugins/imagej_launcher/Updater.scala b/src/main/scala/ij_plugins/imagej_launcher/Updater.scala
index 62219c4..beb5e75 100644
--- a/src/main/scala/ij_plugins/imagej_launcher/Updater.scala
+++ b/src/main/scala/ij_plugins/imagej_launcher/Updater.scala
@@ -18,7 +18,7 @@ object Updater:
    * @param logger configured logger
    * @return Number of files processed or an error message.
    */
-  def update(ijDir: Path, dryRun: Boolean, logger: Logger): Either[String, Long] =
+  def update(ijDir: Path, dryRun: Boolean)(using logger: Logger): Either[String, Long] =
     try
       val updateDir = ijDir / "update"
       // Count used only for debug info
@@ -39,7 +39,7 @@ object Updater:
               if !dryRun then os.move(src, dst, replaceExisting = true, createFolders = true)
             count += 1
         logger.debug(s"Delete update directory: $updateDir")
-        if !dryRun then deleteEmptyDirs(updateDir, logger)
+        if !dryRun then deleteEmptyDirs(updateDir)
         Right(count)
       else
         logger.info("No update found")
@@ -49,11 +49,11 @@ object Updater:
         ex.printStackTrace()
         Left(s"Failed to perform update: ${ex.getMessage} - ${ex.getClass.getSimpleName}")
 
-  private def deleteEmptyDirs(dir: Path, logger: Logger): Unit =
+  private def deleteEmptyDirs(dir: Path)(using logger: Logger): Unit =
     logger.debug(s"Cleaning directory: $dir")
     os.list(dir)
       .filter(os.isDir)
-      .foreach(p => deleteEmptyDirs(p, logger))
+      .foreach(p => deleteEmptyDirs(p))
 
     if os.list(dir).isEmpty then
       logger.debug(s"Removing empty dir: $dir")
diff --git a/src/test/scala/ij_plugins/imagej_launcher/UpdaterDemo.scala b/src/test/scala/ij_plugins/imagej_launcher/UpdaterDemo.scala
index 6e7f24a..49f674a 100644
--- a/src/test/scala/ij_plugins/imagej_launcher/UpdaterDemo.scala
+++ b/src/test/scala/ij_plugins/imagej_launcher/UpdaterDemo.scala
@@ -4,6 +4,7 @@ import os.Path
 
 @main
 def updaterDemo(ijDir: String): Unit =
-  Updater.update(Path(ijDir), dryRun = false, new Logger(Logger.Level.Debug)) match
+  given logger: Logger = new Logger(Logger.Level.Debug)
+  Updater.update(Path(ijDir), dryRun = false) match
     case Right(count) => println(s"Processed $count files")
     case Left(error)  => println(s"Failed with error: $error")