refactor: always set referer for images from html

michalczmiel · Feb 15, 2024 · 2ad5129 · 2ad5129
1 parent 34938e5
commit 2ad5129
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/cmd/html.go b/cmd/html.go
@@ -62,6 +62,14 @@ func runHtmlCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	referer, err := internal.GetRootUrl(url)
+	if err != nil {
+		return err
+	}
+
+	// download images from the same domain
+	parameters.Referer = referer
+
 	return internal.Run(links, parameters, httpClient, fileSystem)
 }
 

diff --git a/internal/images.go b/internal/images.go
@@ -85,17 +85,8 @@ func addExtensionIfMissing(filePath, imageType string) string {
 }
 
 func downloadImage(link DownloadInput, httClient HttpClient, fileSystem FileSystem, parameters *Parameters) (outputPath string, err error) {
-	referer, err := getRootUrl(link.Url)
-	if err != nil {
-		return "", err
-	}
-
-	if parameters.Referer != "" {
-		referer = parameters.Referer
-	}
-
 	response, err := httClient.Request(link.Url, map[string]string{
-		"Referer": referer,
+		"Referer": parameters.Referer,
 	})
 	if err != nil {
 		return "", err

diff --git a/internal/url.go b/internal/url.go
@@ -37,7 +37,7 @@ func RemoveDuplicates(original []string) []string {
 	return output
 }
 
-func getRootUrl(u string) (string, error) {
+func GetRootUrl(u string) (string, error) {
 	parsedUrl, err := url.Parse(u)
 	if err != nil {
 		return "", err

diff --git a/internal/url_test.go b/internal/url_test.go
@@ -81,7 +81,7 @@ func TestGetRootUrl(t *testing.T) {
 	}
 
 	for _, tt := range testdata {
-		actual, err := getRootUrl(tt.url)
+		actual, err := GetRootUrl(tt.url)
 
 		if err != nil {
 			t.Errorf("unexpected error: %s", err)