Handle input with new lines

src/media/fetch.go

@@ -90,12 +90,13 @@ func getUrl(r *http.Request) string {
 	return strings.TrimSpace(r.URL.Query().Get("url"))
 }
 
-func getMediaResults(url string) ([]Media, string, error) {
+func getMediaResults(inputUrl string) ([]Media, string, error) {
-	if url == "" {
+	if inputUrl == "" {
 		return nil, "", errors.New("missing URL")
 	}
 
-	url = utils.NormalizeUrl(url)
+	url := utils.NormalizeUrl(inputUrl)
+	log.Info().Msgf("Got input '%s' and extracted '%s'", inputUrl, url)
 
 	// NOTE: This system is for a simple use case, meant to run at home. This is not a great design for a robust system.
 	// We are hashing the URL here and writing files to disk to a consistent directory based on the ID. You can imagine

src/utils/urls.go

@@ -1,16 +1,24 @@
 package utils
 
-import "strings"
+import (
+	"bufio"
+	"strings"
+)
 
 func NormalizeUrl(url string) string {
 	url = strings.TrimSpace(url)
 	parts := strings.Split(url, " ")
 
+	// Find the first URL. Will split the string by spaces and new lines and return the first thing that looks like a URL
+	// TODO: We could try to parse the url, but will save that for later
 	for _, part := range parts {
 		// Take the firs string that looks like a URL.
-		// TODO: We could try to parse the url, but will save that for later
+		sc := bufio.NewScanner(strings.NewReader(part))
-		if strings.HasPrefix(part, "http") || strings.HasPrefix(part, "www") {
+		for sc.Scan() {
-			return part
+			p := sc.Text()
+			if strings.HasPrefix(p, "http") || strings.HasPrefix(p, "www") {
+				return p
+			}
 		}
 	}
 

src/utils/urls_test.go

@@ -10,6 +10,8 @@ func TestNormalizeUrl(t *testing.T) {
 		{url: "example.com", want: "example.com"},
 		{url: "https://example.com", want: "https://example.com"},
 		{url: "https://example.com this is an example", want: "https://example.com"},
+		{url: "https://example.com\nthis is an example", want: "https://example.com"},
+		{url: "Downloading https://example.com\nthis is an example", want: "https://example.com"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.url, func(t *testing.T) {