fix(cache): improve error handling and use standard io constants

2 files · +17 -6

M internal/cache/favicon.go +13 -3


@@ -106,7 +106,11 @@ func (fc *FaviconCache) downloadFavicon(faviconURL string) error {
106	106		if err != nil {
107	107		return fmt.Errorf("failed to download favicon: %w", err)
108	108		}
109		-	defer resp.Body.Close()
	109	+	defer func() {
	110	+	if err := resp.Body.Close(); err != nil {
	111	+	log.Printf("[favicon] failed to close response body: %v", err)
	112	+	}
	113	+	}()
110	114
111	115		// Log redirects for debugging
112	116		if resp.Request.URL.String() != faviconURL {

@@ -126,14 +130,20 @@ func (fc *FaviconCache) downloadFavicon(faviconURL string) error {
126	130		if err != nil {
127	131		return fmt.Errorf("failed to create download temp file: %w", err)
128	132		}
129		-	defer downloadFile.Close()
	133	+	defer func() {
	134	+	if err := downloadFile.Close(); err != nil {
	135	+	log.Printf("[favicon] failed to close download file: %v", err)
	136	+	}
	137	+	}()
130	138		defer os.Remove(tempDownloadFile)
131	139
132	140		// Save raw favicon data
133	141		if _, err := io.Copy(downloadFile, limitedBody); err != nil {
134	142		return fmt.Errorf("failed to save favicon data: %w", err)
135	143		}
136		-	downloadFile.Close()
	144	+	if err := downloadFile.Close(); err != nil {
	145	+	log.Printf("[favicon] failed to close download file: %v", err)
	146	+	}
137	147
138	148		// Detect if it's an ICO file and convert with ffmpeg if needed
139	149		if err := fc.convertToPNG(tempDownloadFile, cachedPath, faviconURL); err != nil {

 	if err != nil {
 		return fmt.Errorf("failed to download favicon: %w", err)
 	}
-	defer resp.Body.Close()
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			log.Printf("[favicon] failed to close response body: %v", err)
+		}
+	}()
 	// Log redirects for debugging
 	if resp.Request.URL.String() != faviconURL {
 	if err != nil {
 		return fmt.Errorf("failed to create download temp file: %w", err)
 	}
-	defer downloadFile.Close()
+	defer func() {
+		if err := downloadFile.Close(); err != nil {
+			log.Printf("[favicon] failed to close download file: %v", err)
+		}
+	}()
 	defer os.Remove(tempDownloadFile)
 	// Save raw favicon data
 	if _, err := io.Copy(downloadFile, limitedBody); err != nil {
 		return fmt.Errorf("failed to save favicon data: %w", err)
 	}
-	downloadFile.Close()
+	if err := downloadFile.Close(); err != nil {
+		log.Printf("[favicon] failed to close download file: %v", err)
+	}
 	// Detect if it's an ICO file and convert with ffmpeg if needed
 	if err := fc.convertToPNG(tempDownloadFile, cachedPath, faviconURL); err != nil {

M internal/cache/filter_cache.go +4 -3


@@ -3,6 +3,7 @@ package cache
3	3		import (
4	4		"encoding/binary"
5	5		"fmt"
	6	+	"io"
6	7		"os"
7	8		"syscall"
8	9		"time"

@@ -233,7 +234,7 @@ func (fc FilterCache) Write(data FilterData) error {
233	234		return fmt.Errorf("failed to write header: %w", err)
234	235		}
235	236
236		-	dataStart, _ := file.Seek(0, os.SEEK_CUR)
	237	+	dataStart, _ := file.Seek(0, io.SeekCurrent)
237	238
238	239		// Write network rules
239	240		for _, rule := range data.NetworkRules {

@@ -252,11 +253,11 @@ func (fc FilterCache) Write(data FilterData) error {
252	253		}
253	254
254	255		// Calculate data size
255		-	dataEnd, _ := file.Seek(0, os.SEEK_CUR)
	256	+	dataEnd, _ := file.Seek(0, io.SeekCurrent)
256	257		dataSize := uint64(dataEnd - dataStart)
257	258
258	259		// Update header with data size
259		-	if _, err := file.Seek(0, os.SEEK_SET); err != nil {
	260	+	if _, err := file.Seek(0, io.SeekStart); err != nil {
260	261		os.Remove(tmpPath)
261	262		return err
262	263		}

 import (
 	"encoding/binary"
 	"fmt"
+	"io"
 	"os"
 	"syscall"
 	"time"
 		return fmt.Errorf("failed to write header: %w", err)
 	}
-	dataStart, _ := file.Seek(0, os.SEEK_CUR)
+	dataStart, _ := file.Seek(0, io.SeekCurrent)
 	// Write network rules
 	for _, rule := range data.NetworkRules {
 	}
 	// Calculate data size
-	dataEnd, _ := file.Seek(0, os.SEEK_CUR)
+	dataEnd, _ := file.Seek(0, io.SeekCurrent)
 	dataSize := uint64(dataEnd - dataStart)
 	// Update header with data size
-	if _, err := file.Seek(0, os.SEEK_SET); err != nil {
+	if _, err := file.Seek(0, io.SeekStart); err != nil {
 		os.Remove(tmpPath)
 		return err
 	}