feat: Show original URL in HTTP progress bars

twpayne · Jan 17, 2025 · 3176ad1 · 3176ad1
1 parent 6cae2f1
commit 3176ad1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/internal/chezmoi/sourcestate.go b/internal/chezmoi/sourcestate.go
@@ -917,7 +917,7 @@ TARGET:
 
 // ReadOptions are options to SourceState.Read.
 type ReadOptions struct {
-	ReadHTTPResponse func(*http.Response) ([]byte, error)
+	ReadHTTPResponse func(string, *http.Response) ([]byte, error)
 	RefreshExternals RefreshExternals
 	TimeNow          func() time.Time
 }
@@ -1634,7 +1634,7 @@ func (s *SourceState) getExternalDataRaw(
 	if options == nil || options.ReadHTTPResponse == nil {
 		data, err = io.ReadAll(resp.Body)
 	} else {
-		data, err = options.ReadHTTPResponse(resp)
+		data, err = options.ReadHTTPResponse(urlStr, resp)
 	}
 	resp.Body.Close()
 	if err != nil {

diff --git a/internal/cmd/readhttpresponse.go b/internal/cmd/readhttpresponse.go
@@ -107,7 +107,7 @@ func (m httpSpinnerModel) View() string {
 	return "[" + m.spinner.View() + "] " + m.url
 }
 
-func (c *Config) readHTTPResponse(resp *http.Response) ([]byte, error) {
+func (c *Config) readHTTPResponse(url string, resp *http.Response) ([]byte, error) {
 	switch {
 	case c.noTTY || !c.Progress.Value(c.progressAutoFunc):
 		return io.ReadAll(resp.Body)
@@ -123,7 +123,7 @@ func (c *Config) readHTTPResponse(resp *http.Response) ([]byte, error) {
 		httpProgress.ShowPercentage = false
 
 		model := httpProgressModel{
-			url:           resp.Request.URL.String(),
+			url:           url,
 			contentLength: int(resp.ContentLength),
 			progress:      httpProgress,
 		}