TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-06-01 09:32:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup code for URL type

Browse source
This commit is contained in:
yusing 2025-02-02 06:33:32 +08:00
parent 0c7b188587
commit 721ddcb590
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
internal/net/types/url.go
View file

@ -2,13 +2,16 @@ package types
import ( import (
urlPkg "net/url" urlPkg "net/url"
"github.com/yusing/go-proxy/internal/utils"
) )
type URL struct { type URL struct {
*urlPkg.URL _ utils.NoCopy
urlPkg.URL
} }
func MustParseURL(url string) URL { func MustParseURL(url string) *URL {
u, err := ParseURL(url) u, err := ParseURL(url)
if err != nil { if err != nil {
panic(err) panic(err)
@ -16,40 +19,37 @@ func MustParseURL(url string) URL {
return u return u
} }
func ParseURL(url string) (URL, error) { func ParseURL(url string) (u *URL, err error) {
u, err := urlPkg.Parse(url) return u, u.Parse(url)
}
func NewURL(url *urlPkg.URL) *URL {
return &URL{URL: *url}
}
func (u *URL) Parse(url string) error {
uu, err := urlPkg.Parse(url)
if err != nil { if err != nil {
return URL{}, err return err
} }
return URL{URL: u}, nil u.URL = *uu
return nil
} }
func NewURL(url *urlPkg.URL) URL { func (u *URL) String() string {
return URL{url} if u == nil {
}
func (u URL) Nil() bool {
return u.URL == nil
}
func (u URL) String() string {
if u.URL == nil {
return "nil" return "nil"
} }
return u.URL.String() return u.URL.String()
} }
func (u URL) MarshalJSON() (text []byte, err error) { func (u *URL) MarshalJSON() (text []byte, err error) {
if u.URL == nil { if u == nil {
return []byte("null"), nil return []byte("null"), nil
} }
return []byte("\"" + u.URL.String() + "\""), nil return []byte("\"" + u.URL.String() + "\""), nil
} }
func (u URL) Equals(other *URL) bool { func (u *URL) Equals(other *URL) bool {
return u.URL == other.URL || u.String() == other.String() return u.String() == other.String()
}
func (u URL) JoinPath(path string) URL {
return URL{u.URL.JoinPath(path)}
} }