Tweaks

- error handling
- http request/response cleanup

Author: porjo

files.go

@@ -90,13 +90,13 @@ func LoadVideoMeta(config Config, video *youtube.Video) (*VideoMeta, error) {
 	if config.MetaJSON != "" {
 		file, e := os.ReadFile(config.MetaJSON)
 		if e != nil {
-			e2 := fmt.Errorf("error reading file %q: %s", config.MetaJSON, e)
+			e2 := fmt.Errorf("error reading file %q: %w", config.MetaJSON, e)
 			return nil, e2
 		}
 
 		e = json.Unmarshal(file, &videoMeta)
 		if e != nil {
-			e2 := fmt.Errorf("error parsing file %q: %s", config.MetaJSON, e)
+			e2 := fmt.Errorf("error parsing file %q: %w", config.MetaJSON, e)
 			return nil, e2
 		}
 
@@ -192,7 +192,7 @@ func Open(filename string, mediaType MediaType) (io.ReadCloser, int, error) {
 		var resp *http.Response
 		resp, err = http.Head(filename)
 		if err != nil {
-			return reader, 0, fmt.Errorf("error opening %s: %s", filename, err)
+			return reader, 0, fmt.Errorf("error opening %q: %w", filename, err)
 		}
 		lenStr := resp.Header.Get("content-length")
 		if lenStr != "" {
@@ -204,9 +204,11 @@ func Open(filename string, mediaType MediaType) (io.ReadCloser, int, error) {
 
 		resp, err = http.Get(filename)
 		if err != nil {
-			return reader, 0, fmt.Errorf("error opening %s: %s", filename, err)
+			return reader, 0, fmt.Errorf("error opening %q: %w", filename, err)
 		}
-		if resp.ContentLength != 0 {
+		// Go doc: When err is nil, resp always contains a non-nil resp.Body. Caller should close resp.Body when done reading from it.
+		defer resp.Body.Close()
+		if resp.ContentLength > 0 {
 			filesize = resp.ContentLength
 		}
 		reader = resp.Body
@@ -217,23 +219,23 @@ func Open(filename string, mediaType MediaType) (io.ReadCloser, int, error) {
 		var fileInfo os.FileInfo
 		file, err = os.Open(filename)
 		if err != nil {
-			return reader, 0, fmt.Errorf("error opening %s: %s", filename, err)
+			return reader, 0, fmt.Errorf("error opening %q: %w", filename, err)
 		}
 
 		fileInfo, err = file.Stat()
 		if err != nil {
-			return reader, 0, fmt.Errorf("error stat'ing %s: %s", filename, err)
+			return reader, 0, fmt.Errorf("error stat'ing %q: %w", filename, err)
 		}
 
 		// check the file looks like the media type it is supposed to be
 		buf := make([]byte, 512)
 		_, err = file.Read(buf)
 		if err != nil {
-			return reader, 0, fmt.Errorf("error reading %s: %s", filename, err)
+			return reader, 0, fmt.Errorf("error reading %q: %w", filename, err)
 		}
 		_, err = file.Seek(0, 0)
 		if err != nil {
-			return reader, 0, fmt.Errorf("error reading %s: %s", filename, err)
+			return reader, 0, fmt.Errorf("error reading %q: %w", filename, err)
 		}
 		contentType := http.DetectContentType(buf)
 		switch mediaType {

http.go

@@ -63,7 +63,7 @@ func playlistList(service *youtube.Service, pageToken string) (*youtube.Playlist
 
 	response, err := call.Do()
 	if err != nil {
-		return nil, fmt.Errorf("error retrieving playlists: %s", err)
+		return nil, fmt.Errorf("error retrieving playlists: %w", err)
 	}
 
 	return response, nil
@@ -107,7 +107,7 @@ func (plx *Playlistx) AddVideoToPlaylist(service *youtube.Service, videoID strin
 		// API doesn't return playlist ID here!?
 		playlist, err = insertCall.Do()
 		if err != nil {
-			return fmt.Errorf("error creating playlist with title %q: %s", plx.Title, err)
+			return fmt.Errorf("error creating playlist with title %q: %w", plx.Title, err)
 		}
 	}
 

internal/limiter/limiter.go

@@ -15,11 +15,11 @@ limitations under the License.
 package limiter
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"io"
 	"net/http"
+	"net/http/httputil"
 	"strings"
 	"sync"
 	"time"
@@ -226,9 +226,10 @@ func (t *LimitTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 			t.reader.ReadCloser.Close()
 		}
 
+		// wrap request body in a limitchecker
 		t.reader.ReadCloser = r.Body
-
 		r.Body = &t.reader
+
 		t.reader.Unlock()
 	}
 
@@ -241,13 +242,11 @@ func (t *LimitTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 	if err == nil {
 		t.logger.Debugf("Response status code: %d\n", resp.StatusCode)
 		if resp.Body != nil {
-			defer resp.Body.Close()
-			bodyBytes, err := io.ReadAll(resp.Body)
+			respBytes, err := httputil.DumpResponse(resp, true)
 			if err != nil {
-				t.logger.Debugf("Error reading response body: %s\n", err)
+				t.logger.Debugf("Error reading response: %s\n", err)
 			} else {
-				t.logger.Debugf("response body %s", bodyBytes)
-				resp.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
+				t.logger.Debugf("response dump:\n%s", respBytes)
 			}
 		}
 	}

oauth.go

@@ -300,12 +300,12 @@ func BuildOAuthHTTPClient(ctx context.Context, scopes []string, oAuthPort int) (
 func (f CacheFile) Token() (*oauth2.Token, error) {
 	file, err := os.Open(string(f))
 	if err != nil {
-		return nil, fmt.Errorf("CacheFile.Token: %s", err.Error())
+		return nil, fmt.Errorf("CacheFile.Token: %w", err)
 	}
 	defer file.Close()
 	tok := &oauth2.Token{}
 	if err := json.NewDecoder(file).Decode(tok); err != nil {
-		return nil, fmt.Errorf("CacheFile.Token: %s", err.Error())
+		return nil, fmt.Errorf("CacheFile.Token: %w", err)
 	}
 	return tok, nil
 }
@@ -314,14 +314,14 @@ func (f CacheFile) Token() (*oauth2.Token, error) {
 func (f CacheFile) PutToken(tok *oauth2.Token) error {
 	file, err := os.OpenFile(string(f), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
-		return fmt.Errorf("CacheFile.PutToken: %s", err.Error())
+		return fmt.Errorf("CacheFile.PutToken: %w", err)
 	}
 	if err := json.NewEncoder(file).Encode(tok); err != nil {
 		file.Close()
-		return fmt.Errorf("CacheFile.PutToken: %s", err.Error())
+		return fmt.Errorf("CacheFile.PutToken: %w", err)
 	}
 	if err := file.Close(); err != nil {
-		return fmt.Errorf("CacheFile.PutToken: %s", err.Error())
+		return fmt.Errorf("CacheFile.PutToken: %w", err)
 	}
 	return nil
 }