chore: incoming 1810 changelog entry

Author: ksylvan

cmd/generate_changelog/incoming/1810.txt

@@ -0,0 +1,3 @@
+### PR [#1810](https://github.com/danielmiessler/Fabric/pull/1810) by [tonymet](https://github.com/tonymet): improve subtitle lang, retry, debugging & error handling
+
+- Improve subtitle lang, retry, debugging & error handling

internal/log/log.go

@@ -61,11 +61,6 @@ func Debug(l Level, format string, a ...interface{}) {
 	}
 }
 
-// Debug(Trace) convenience function
-func DTrace(a ...interface{}) {
-	Debug(Trace, "%s\n", a...)
-}
-
 // Log writes a message unconditionally to stderr.
 // This is for important messages that should always be shown regardless of debug level.
 func Log(format string, a ...interface{}) {

internal/tools/youtube/youtube.go

@@ -151,18 +151,18 @@ func detectError(ytOutput io.Reader) error {
 	scanner := bufio.NewScanner(ytOutput)
 	for scanner.Scan() {
 		curLine := scanner.Text()
-		debuglog.DTrace(curLine)
-		if strings.Contains(curLine, "429") || strings.Contains(curLine, "Too Many Requests") {
-			return fmt.Errorf("YouTube rate limit exceeded. Try again later or use different yt-dlp arguments like '--sleep-requests 1' to slow down requests.")
+		debuglog.Debug(debuglog.Trace, "%s\n", curLine)
+		errorMessages := map[string]string{
+			"429":                                 "YouTube rate limit exceeded. Try again later or use different yt-dlp arguments like '--sleep-requests 1' to slow down requests.",
+			"Too Many Requests":                   "YouTube rate limit exceeded. Try again later or use different yt-dlp arguments like '--sleep-requests 1' to slow down requests.",
+			"Sign in to confirm you're not a bot": "YouTube requires authentication (bot detection). Use --yt-dlp-args='--cookies-from-browser BROWSER' where BROWSER is chrome, firefox, brave, etc.",
+			"Use --cookies-from-browser":          "YouTube requires authentication (bot detection). Use --yt-dlp-args='--cookies-from-browser BROWSER' where BROWSER is chrome, firefox, brave, etc.",
 		}
-		if strings.Contains(curLine, "Sign in to confirm you're not a bot") || strings.Contains(curLine, "Use --cookies-from-browser") {
-			return fmt.Errorf("YouTube requires authentication (bot detection). Use --yt-dlp-args='--cookies-from-browser BROWSER' where BROWSER is chrome, firefox, brave, etc.")
-		}
-		if strings.Contains(curLine, "There are no subtitles for the requested languages") {
-			return fmt.Errorf("There are no subtitles for the requested languages")
-		}
-		if strings.Contains(curLine, "Downloading subtitles:") {
-			return nil
+
+		for key, message := range errorMessages {
+			if strings.Contains(curLine, key) {
+				return fmt.Errorf("%s", message)
+			}
 		}
 	}
 	if err := scanner.Err(); err != nil {