.

gemini/url.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.antanst.com/antanst/xerrors"
+	"gemserve/lib/apperrors"
 )
 
 type URL struct {
@@ -28,7 +28,7 @@ func (u *URL) Scan(value interface{}) error {
 	}
 	b, ok := value.(string)
 	if !ok {
-		return xerrors.NewError(fmt.Errorf("database scan error: expected string, got %T", value), 0, "Database scan error", true)
+		return apperrors.NewFatalError(fmt.Errorf("database scan error: expected string, got %T", value))
 	}
 	parsedURL, err := ParseURL(b, "", false)
 	if err != nil {
@@ -67,7 +67,7 @@ func ParseURL(input string, descr string, normalize bool) (*URL, error) {
 	} else {
 		u, err = url.Parse(input)
 		if err != nil {
-			return nil, xerrors.NewError(fmt.Errorf("error parsing URL: %w: %s", err, input), 0, "URL parse error", false)
+			return nil, fmt.Errorf("error parsing URL: %w: %s", err, input)
 		}
 	}
 
@@ -80,7 +80,7 @@ func ParseURL(input string, descr string, normalize bool) (*URL, error) {
 	}
 	port, err := strconv.Atoi(strPort)
 	if err != nil {
-		return nil, xerrors.NewError(fmt.Errorf("error parsing URL: %w: %s", err, input), 0, "URL parse error", false)
+		return nil, fmt.Errorf("error parsing URL: %w: %s", err, input)
 	}
 	full := fmt.Sprintf("%s://%s:%d%s", protocol, hostname, port, urlPath)
 	// full field should also contain query params and url fragments
@@ -126,13 +126,13 @@ func NormalizeURL(rawURL string) (*url.URL, error) {
 	// Parse the URL
 	u, err := url.Parse(rawURL)
 	if err != nil {
-		return nil, xerrors.NewError(fmt.Errorf("error normalizing URL: %w: %s", err, rawURL), 0, "URL normalization error", false)
+		return nil, fmt.Errorf("error normalizing URL: %w: %s", err, rawURL)
 	}
 	if u.Scheme == "" {
-		return nil, xerrors.NewError(fmt.Errorf("error normalizing URL: No scheme: %s", rawURL), 0, "Missing URL scheme", false)
+		return nil, fmt.Errorf("error normalizing URL: No scheme: %s", rawURL)
 	}
 	if u.Host == "" {
-		return nil, xerrors.NewError(fmt.Errorf("error normalizing URL: No host: %s", rawURL), 0, "Missing URL host", false)
+		return nil, fmt.Errorf("error normalizing URL: No host: %s", rawURL)
 	}
 
 	// Convert scheme to lowercase

gemini/url_test.go

@@ -11,7 +11,7 @@ func TestParseURL(t *testing.T) {
 	input := "gemini://caolan.uk/cgi-bin/weather.py/wxfcs/3162"
 	parsed, err := ParseURL(input, "", true)
 	value, _ := parsed.Value()
-	if err != nil || !(value == "gemini://caolan.uk:1965/cgi-bin/weather.py/wxfcs/3162") {
+	if err != nil || (value != "gemini://caolan.uk:1965/cgi-bin/weather.py/wxfcs/3162") {
 		t.Errorf("fail: %s", parsed)
 	}
 }