util: move to internal/netutil

vinegarhq · Jan 30, 2024 · fd48ebb · fd48ebb
1 parent 77307d1
commit fd48ebb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/bloxstraprpc/message.go b/bloxstraprpc/message.go
@@ -16,8 +16,8 @@ import (
 type RichPresenceImage struct {
 	AssetID   *int64  `json:"assetId"`
 	HoverText *string `json:"hoverText"`
-	Clear     bool   `json:"clear"`
-	Reset     bool   `json:"reset"`
+	Clear     bool    `json:"clear"`
+	Reset     bool    `json:"reset"`
 }
 
 // Data holds game information sent from a BloxstrapRPC message

diff --git a/util/net.go → internal/netutil/netutil.go b/util/net.go → internal/netutil/netutil.go
@@ -1,4 +1,5 @@
-package util
+// Package netutil provides shared utility networking functions.
+package netutil
 
 import (
 	"errors"

diff --git a/roblox/bootstrapper/package.go b/roblox/bootstrapper/package.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/vinegarhq/vinegar/util"
+	"github.com/vinegarhq/vinegar/internal/netutil"
 )
 
 // Package is a representation of a Binary package.
@@ -58,13 +58,13 @@ func (p *Package) Download(dest, deployURL string) error {
 
 	log.Printf("Downloading Package %s (%s)", p.Name, dest)
 
-	if err := util.Download(deployURL+"-"+p.Name, dest); err == nil {
+	if err := netutil.Download(deployURL+"-"+p.Name, dest); err == nil {
 		return p.Verify(dest)
 	}
 
 	log.Printf("Failed to fetch package %s, retrying...", p.Name)
 
-	if err := util.Download(deployURL+"-"+p.Name, dest); err != nil {
+	if err := netutil.Download(deployURL+"-"+p.Name, dest); err != nil {
 		return fmt.Errorf("download package %s: %w", p.Name, err)
 	}
 

diff --git a/roblox/bootstrapper/pkg_manifest.go b/roblox/bootstrapper/pkg_manifest.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vinegarhq/vinegar/util"
+	"github.com/vinegarhq/vinegar/internal/netutil"
 )
 
 // PackageManifest is a representation of a Binary version's packages
@@ -49,7 +49,7 @@ func FetchPackageManifest(d *Deployment) (PackageManifest, error) {
 
 	log.Printf("Fetching manifest for %s (%s)", d.GUID, url)
 
-	smanif, err := util.Body(url)
+	smanif, err := netutil.Body(url)
 	if err != nil {
 		return PackageManifest{}, fmt.Errorf("fetch %s package manifest: %w", d.GUID, err)
 	}

diff --git a/util/util.go b/util/util.go
diff --git a/wine/dxvk/dxvk.go b/wine/dxvk/dxvk.go
@@ -11,7 +11,7 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/vinegarhq/vinegar/util"
+	"github.com/vinegarhq/vinegar/internal/netutil"
 	"github.com/vinegarhq/vinegar/wine"
 )
 
@@ -59,7 +59,7 @@ func Install(ver string, pfx *wine.Prefix) error {
 
 	log.Printf("Downloading DXVK %s (%s)", ver, url)
 
-	if err := util.Download(url, f.Name()); err != nil {
+	if err := netutil.Download(url, f.Name()); err != nil {
 		return fmt.Errorf("download dxvk %s: %w", ver, err)
 	}