[cli] Remove verbosity flag (#63)

This commit is contained in:
Paul Campbell 2019-06-14 20:21:58 +01:00 committed by GitHub
parent 03227a3720
commit 90770eaafb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 12 deletions

View file

@ -15,6 +15,10 @@ The format is based on [[https://keepachangelog.com/en/1.0.0/][Keep a Changelog]
- Suppress Transfer event messages - Suppress Transfer event messages
** Removed
- ~-v~ verbosity flag
* [0.4.0] - 2019-06-11 * [0.4.0] - 2019-06-11
** Added ** Added

View file

@ -22,7 +22,6 @@ hash of the file contents.
-i, --include <value> Include matching paths -i, --include <value> Include matching paths
-x, --exclude <value> Exclude matching paths -x, --exclude <value> Exclude matching paths
-d, --debug Enable debug logging -d, --debug Enable debug logging
-v, --verbose <value> Verbosity level (1-5)
#+end_example #+end_example
The ~--include~ and ~--exclude~ parameters can be used more than once. The ~--include~ and ~--exclude~ parameters can be used more than once.

View file

@ -12,7 +12,7 @@ object Main extends IOApp {
Config(source = Paths.get(".").toFile) Config(source = Paths.get(".").toFile)
override def run(args: List[String]): IO[ExitCode] = { override def run(args: List[String]): IO[ExitCode] = {
val exitCaseLogger = new PrintLogger[IO](1, false) val exitCaseLogger = new PrintLogger[IO](false)
ParseArgs(args, defaultConfig) ParseArgs(args, defaultConfig)
.map(Program[IO]) .map(Program[IO])
.getOrElse(IO(ExitCode.Error)) .getOrElse(IO(ExitCode.Error))

View file

@ -37,13 +37,7 @@ object ParseArgs {
.text("Exclude matching paths"), .text("Exclude matching paths"),
opt[Unit]('d', "debug") opt[Unit]('d', "debug")
.action((_, c) => c.copy(debug = true)) .action((_, c) => c.copy(debug = true))
.text("Enable debug logging"), .text("Enable debug logging")
opt[Int]('v', "verbose")
.validate(i =>
if (i >= 1 && i <= 5) Right(Unit)
else Left("Verbosity level must be between 1 and 5"))
.action((i, c) => c.copy(verbose = i))
.text("Verbosity level (1-5)")
) )
} }

View file

@ -3,7 +3,7 @@ package net.kemitix.s3thorp.cli
import cats.Monad import cats.Monad
import net.kemitix.s3thorp.domain.Logger import net.kemitix.s3thorp.domain.Logger
class PrintLogger[M[_]: Monad](verbosity: Int, isDebug: Boolean) extends Logger[M] { class PrintLogger[M[_]: Monad](isDebug: Boolean) extends Logger[M] {
override def debug(message: => String): M[Unit] = override def debug(message: => String): M[Unit] =
if (isDebug) Monad[M].pure(println(s"[ DEBUG] $message")) if (isDebug) Monad[M].pure(println(s"[ DEBUG] $message"))

View file

@ -10,7 +10,7 @@ import net.kemitix.s3thorp.domain.{Config, Logger}
object Program { object Program {
def apply[M[_]: Monad](config: Config): M[ExitCode] = { def apply[M[_]: Monad](config: Config): M[ExitCode] = {
implicit val logger: Logger[M] = new PrintLogger[M](config.verbose, config.debug) implicit val logger: Logger[M] = new PrintLogger[M](config.debug)
for { for {
_ <- logger.info("S3Thorp - hashed sync for s3") _ <- logger.info("S3Thorp - hashed sync for s3")
_ <- Sync.run[M](config, S3ClientBuilder.defaultClient) _ <- Sync.run[M](config, S3ClientBuilder.defaultClient)

View file

@ -5,7 +5,6 @@ import java.io.File
final case class Config( final case class Config(
bucket: Bucket = Bucket(""), bucket: Bucket = Bucket(""),
prefix: RemoteKey = RemoteKey(""), prefix: RemoteKey = RemoteKey(""),
verbose: Int = 1,
filters: List[Filter] = List(), filters: List[Filter] = List(),
multiPartThreshold: Long = 1024 * 1024 * 5, multiPartThreshold: Long = 1024 * 1024 * 5,
maxRetries: Int = 3, maxRetries: Int = 3,