improvements to runtime logging

Author: LumePart

src/debug/debug.go

@@ -11,16 +11,16 @@ func Init(level string) {
 	slog.SetLogLoggerLevel(getLogLevel(level))
 }
 
-func Debug(ctx string) slog.Attr {
+func RuntimeAttr(ctx string) slog.Attr {
 		_, file, line, ok := runtime.Caller(1)
         if ok {
 			return slog.Group("runtime",
             	slog.String("file", file), 
-				slog.Int("line",line), 
-				slog.String("msg", ctx),
+				slog.Int("line", line),
+				slog.String("ctx", ctx),
 		)
         } else {
-            return slog.String("msg", ctx)
+            return slog.String("msg", "failed getting runtime")
         }
 }
 

src/downloader/downloader.go

@@ -172,7 +172,7 @@ func moveDownload(srcDir, destDir, trackPath, file string) error { // Move downl
 
 	defer func() error {
 		if cerr := in.Close(); cerr != nil {
-			return fmt.Errorf("warning: failed to close source file: %s", cerr)
+			return fmt.Errorf("failed to close source file: %s", cerr)
 		}
 		return nil
 	}()

src/downloader/monitor.go

@@ -88,7 +88,7 @@ func (c *DownloadClient) MonitorDownloads(tracks []*models.Track, m Monitor) err
 				file, path := parsePath(track.File)
 				if monCfg.MigrateDownload {
 					if err = moveDownload(monCfg.FromDir, monCfg.ToDir, path, file); err != nil {
-						debug.Debug(err.Error())
+						slog.Debug("error while moving file", debug.RuntimeAttr(err.Error()))
 					} else {
 						slog.Info("track moved successfully", "service", monCfg.Service)
 					}
@@ -97,7 +97,7 @@ func (c *DownloadClient) MonitorDownloads(tracks []*models.Track, m Monitor) err
 				track.File = file
 				successDownloads += 1
 				if err = m.Cleanup(*track, fileStatus.ID); err != nil {
-					debug.Debug(err.Error())
+					slog.Debug("cleanup failed", debug.RuntimeAttr(err.Error()))
 				}
 				continue
 
@@ -111,7 +111,7 @@ func (c *DownloadClient) MonitorDownloads(tracks []*models.Track, m Monitor) err
 				slog.Info("[monitor] no download progress for file, skipping", "service", monCfg.Service, "file", track.File, "duration", monCfg.MonitorDuration)
 				tracker.Skipped = true
 				if err = m.Cleanup(*track, fileStatus.ID); err != nil {
-					debug.Debug(err.Error())
+					slog.Debug("cleanup failed", debug.RuntimeAttr(err.Error()))
 				}
 				continue
 			}

src/downloader/slskd.go

@@ -204,11 +204,11 @@ func (c Slskd) searchStatus(ID, trackDetails string, count int) (bool, error) {
 	} else if queryResult.IsComplete && (queryResult.FileCount == 0 || queryResult.FileCount == queryResult.LockedFileCount) {
 		return false, fmt.Errorf("search complete, did not find any available files for %s", trackDetails)
 	} else if count >= c.Cfg.Retry {
-		debug.Debug(fmt.Sprintf("search not completed for ID: %s", ID))
+		slog.Debug(fmt.Sprintf("failed to remove %s", ID), debug.RuntimeAttr(""))
 		return false, fmt.Errorf("search wasn't completed after %d retries, skipping %s", count, trackDetails)
 	}
 
-	debug.Debug(fmt.Sprintf("[%d/%d] Searching for %s", count, c.Cfg.Retry, trackDetails))
+	slog.Debug(fmt.Sprintf("[%s] (%d/%d) Searching for %s", "slskd", count, c.Cfg.Retry, trackDetails))
 	time.Sleep(20 * time.Second)
 	return c.searchStatus(ID, trackDetails, count+1)
 }
@@ -336,7 +336,7 @@ func (c Slskd) queueDownload(files []File, track *models.Track) error {
 		continue
 	}
 	if err := c.deleteSearch(track.ID); err != nil {
-		debug.Debug(fmt.Sprintf("failed to delete search: %s", err.Error()))
+		slog.Debug("failed to delete search", debug.RuntimeAttr(err.Error()))
 	}
 	return fmt.Errorf("couldn't download track: %s - %s", track.CleanTitle, track.Artist)
 }
@@ -400,10 +400,10 @@ func (c Slskd) deleteDownload(user, ID string) error {
 
 func (c *Slskd) Cleanup(track models.Track, fileID string) error {
 	if err := c.deleteSearch(track.ID); err != nil {
-		debug.Debug(fmt.Sprintf("failed to delete search request: %v", err))
+		slog.Debug("failed to delete search request", debug.RuntimeAttr(err.Error()))
 	}
 	if err := c.deleteDownload(track.MainArtistID, fileID); err != nil {
-		debug.Debug(fmt.Sprintf("failed to delete download: %v", err))
+		slog.Debug("failed to delete download", debug.RuntimeAttr(err.Error()))
 	}
 	return nil
 }

src/downloader/youtube.go

@@ -91,7 +91,7 @@ func (c *Youtube) QueryTrack(track *models.Track) error { // Queries youtube for
 
 func queryYTMusic(track *models.Track, query string) error {
 
-	debug.Debug(fmt.Sprintf("Querying YTMusic for track %s", query))
+	slog.Debug(fmt.Sprintf("Querying YTMusic for track %s", query))
 
 	cmd := exec.Command("python3", "search_ytmusic.py", query, "1")
 
@@ -187,7 +187,7 @@ func saveVideo(c Youtube, track models.Track, stream *goutubedl.DownloadResult)
 	if _, err = io.Copy(file, stream); err != nil {
 		slog.Error("failed to copy stream to file", "context", err.Error())
 		if err = os.Remove(input); err != nil {
-			debug.Debug(fmt.Sprintf("failed to remove %s: %s", input, err.Error()))
+			slog.Debug(fmt.Sprintf("failed to remove file %s", input), debug.RuntimeAttr(err.Error()))
 		}
 		return false
 	}
@@ -205,12 +205,12 @@ func saveVideo(c Youtube, track models.Track, stream *goutubedl.DownloadResult)
 	if err = cmd.Run(); err != nil {
 		slog.Error("failed to convert audio", "context", err.Error())
 		if err = os.Remove(input); err != nil {
-			debug.Debug(fmt.Sprintf("failed to remove %s: %s", input, err.Error()))
+			slog.Debug(fmt.Sprintf("failed to remove %s", input), debug.RuntimeAttr(err.Error()))
 		}
 		return false
 	}
 	if err = os.Remove(input); err != nil {
-		debug.Debug(fmt.Sprintf("failed to remove %s: %s", input, err.Error()))
+		slog.Debug(fmt.Sprintf("failed to remove %s", input), debug.RuntimeAttr(err.Error()))
 	}
 	return true
 }

src/util/http.go

@@ -56,7 +56,7 @@ func (c *HttpClient) MakeRequest(method, url string, payload io.Reader, headers
 	}
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		debug.Debug(fmt.Sprintf("full response: %s", string(body)))
+		slog.Debug("response info", debug.RuntimeAttr(string(body)))
 		return nil, fmt.Errorf("got %d from %s", resp.StatusCode, url)
 	}
 
@@ -66,7 +66,7 @@ func (c *HttpClient) MakeRequest(method, url string, payload io.Reader, headers
 func ParseResp[T any](body []byte, target *T) error {
 
 	if err := json.Unmarshal(body, target); err != nil {
-		debug.Debug(fmt.Sprintf("full response: %s", string(body)))
+		slog.Debug("response info", debug.RuntimeAttr(string(body)))
 		return fmt.Errorf("error unmarshaling response body: %s", err.Error())
 	}
 	return nil