cleanup: remove unused logs, make logs more clean

Signed-off-by: Tomkoid <[email protected]>
tomkoid · Jun 2, 2024 · 0ab43bc · 0ab43bc
1 parent 041be68
commit 0ab43bc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/internal/audio/monitor.go b/internal/audio/monitor.go
@@ -35,7 +35,6 @@ func AudioMonitor(c *pulseaudio.Client, config *config.Config) {
  var ms mutedSink
 
  log.Println("Starting audio monitoring.")
- log.Println(ms.Name)
 
  // Monitor the default sink for changes
  for {
@@ -58,9 +57,9 @@ func AudioMonitor(c *pulseaudio.Client, config *config.Config) {
  defaultSink.CardID,
  )
 
- if ms.Name == defaultSink.CardID {
+ if config.Resume && ms.Name == defaultSink.CardID {
  log.Println(
- "Audio was muted, so unmuted it.!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
+ "Audio was muted, unmuted it.",
  )
 
  initialSinkName = defaultSink.CardID
@@ -78,8 +77,8 @@ func AudioMonitor(c *pulseaudio.Client, config *config.Config) {
  ms.Name = initialSinkName
  ms.Players = playingPlayers
  }
- log.Printf("1: %s\n", ms.Name)
- log.Printf("2: %s\n", defaultSink.CardID)
+ // log.Printf("1: %s\n", ms.Name)
+ // log.Printf("2: %s\n", defaultSink.CardID)
 
  initialSinkName = defaultSink.CardID
  }

diff --git a/internal/audio/playing.go b/internal/audio/playing.go
@@ -1,7 +1,6 @@
 package audio
 
 import (
- "log"
  "strings"
 
  "codeberg.org/tomkoid/audstopper/internal/tools"
@@ -18,7 +17,6 @@ func isPlaying(player string) (bool, []string) {
  }
 
  if string(output) == "Playing\n" {
- println("playerctl playing!!!!!!!!!!!!!!!!!!!!!!!!!")
  playing = true
  players = append(players, player)
  }
@@ -31,12 +29,11 @@ func isPlaying(player string) (bool, []string) {
 
  println(string(output))
  if strings.Contains(string(output), "[playing]") {
- println("mpc playing!!!!!!!!!!!!!!!!!!!!!!!!!")
  playing = true
  players = append(players, player)
  }
  }
 
- log.Printf("returned from isplaying: %v", players)
+ // log.Printf("returned from isplaying: %v", players)
  return playing, players 
 }
diff --git a/internal/audio/resume.go b/internal/audio/resume.go
@@ -11,9 +11,7 @@ func resumeAudio(config *config.Config, givenPlayers []string) {
  log.Println("Resuming audio.")
 
  for _, player := range listPlayers(config) {
- log.Printf("available player: %s", player)
  for _, givenPlayer := range givenPlayers {
- log.Printf("comparison(%s, %s)", player.Name, givenPlayer)
  if player.Name == givenPlayer {
  log.Printf("Resuming audio for %s\n", givenPlayer)
  _, err := tools.RunCommand(player.ResumeCommand[0], player.ResumeCommand[1:]...)

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -50,10 +50,13 @@ func GetConfig() Config {
 
  configStr, err := readConfigFile(configFilePath)
  if err != nil {
- log.Println("using default config")
+ log.Println("Using default config.")
+ if err.Error() != "config file does not exist" {
+ log.Printf("config error: %s\n", err.Error())
+ }
  return config
  } else {
- log.Printf("using config from %s\n", configFilePath)
+ log.Printf("Using config from %s.\n", configFilePath)
  }
 
  err = toml.Unmarshal([]byte(configStr), &config)