From 8455c193eb8e8ed0612b032ed9d562233222a63a Mon Sep 17 00:00:00 2001
From: Thomas von Dein <tom@vondein.org>
Date: Mon, 1 Jan 2024 20:53:05 +0100
Subject: [PATCH] pass a io.Writer to loggers and outputs so we can test the
 cmdline

---
 config.go | 13 +++++++------
 main.go   | 21 ++++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/config.go b/config.go
index 862a8e1..be53e30 100644
--- a/config.go
+++ b/config.go
@@ -19,6 +19,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -87,7 +88,7 @@ func (c *Config) IncrImgs(num int) {
 }
 
 // load commandline flags and config file
-func InitConfig() (*Config, error) {
+func InitConfig(w io.Writer) (*Config, error) {
 	var k = koanf.New(".")
 
 	// determine template based on os
@@ -103,13 +104,13 @@ func InitConfig() (*Config, error) {
 		"loglevel": "notice",
 		"userid":   0,
 	}, "."), nil); err != nil {
-                return nil, err
-        }
+		return nil, err
+	}
 
 	// setup custom usage
 	f := flag.NewFlagSet("config", flag.ContinueOnError)
 	f.Usage = func() {
-		fmt.Println(Usage)
+		fmt.Fprintln(w, Usage)
 		os.Exit(0)
 	}
 
@@ -125,8 +126,8 @@ func InitConfig() (*Config, error) {
 	f.BoolP("manual", "m", false, "show manual")
 
 	if err := f.Parse(os.Args[1:]); err != nil {
-                return nil, err
-        }
+		return nil, err
+	}
 
 	// generate a  list of config files to try  to load, including the
 	// one provided via -c, if any
diff --git a/main.go b/main.go
index fdefc9a..5f334c3 100644
--- a/main.go
+++ b/main.go
@@ -20,6 +20,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"io"
 	"log/slog"
 	"os"
 	"runtime/debug"
@@ -30,10 +31,10 @@ import (
 const LevelNotice = slog.Level(2)
 
 func main() {
-	os.Exit(Main())
+	os.Exit(Main(os.Stdout))
 }
 
-func Main() int {
+func Main(w io.Writer) int {
 	logLevel := &slog.LevelVar{}
 	opts := &tint.Options{
 		Level:     logLevel,
@@ -49,22 +50,22 @@ func Main() int {
 	}
 
 	logLevel.Set(LevelNotice)
-	var handler slog.Handler = tint.NewHandler(os.Stdout, opts)
+	handler := tint.NewHandler(w, opts)
 	logger := slog.New(handler)
 	slog.SetDefault(logger)
 
-	conf, err := InitConfig()
+	conf, err := InitConfig(w)
 	if err != nil {
 		return Die(err)
 	}
 
 	if conf.Showversion {
-		fmt.Printf("This is kleingebaeck version %s\n", VERSION)
+		fmt.Fprintf(w, "This is kleingebaeck version %s\n", VERSION)
 		return 0
 	}
 
 	if conf.Showhelp {
-		fmt.Println(Usage)
+		fmt.Fprintln(w, Usage)
 		return 0
 	}
 
@@ -90,7 +91,7 @@ func Main() int {
 		}
 
 		logLevel.Set(slog.LevelDebug)
-		var handler slog.Handler = tint.NewHandler(os.Stdout, opts)
+		handler := tint.NewHandler(w, opts)
 		debuglogger := slog.New(handler).With(
 			slog.Group("program_info",
 				slog.Int("pid", os.Getpid()),
@@ -100,6 +101,8 @@ func Main() int {
 		slog.SetDefault(debuglogger)
 	}
 
+	// defaultlogger := log.Default()
+	// defaultlogger.SetOutput(w)
 	slog.Debug("config", "conf", conf)
 
 	// prepare output dir
@@ -131,10 +134,10 @@ func Main() int {
 		if conf.StatsCountAds == 1 {
 			adstr = "ad"
 		}
-		fmt.Printf("Successfully downloaded %d %s with %d images to %s.\n",
+		fmt.Fprintf(w, "Successfully downloaded %d %s with %d images to %s.\n",
 			conf.StatsCountAds, adstr, conf.StatsCountImages, conf.Outdir)
 	} else {
-		fmt.Printf("No ads found.")
+		fmt.Fprintf(w, "No ads found.")
 	}
 
 	return 0