chore: Updated uploads

Author: stevedylandev

.gitignore

@@ -5,3 +5,4 @@ pinata
 .vscode
 gon.hcl
 .DS_Store
+Makefile

cmd/main.go

@@ -56,16 +56,22 @@ func main() {
 						Name:  "verbose",
 						Usage: "Show upload progress",
 					},
+					&cli.StringFlag{
+						Name:    "network",
+						Aliases: []string{"net"},
+						Usage:   "Specify the network (public or private). Uses default if not specified",
+					},
 				},
 				Action: func(ctx *cli.Context) error {
 					filePath := ctx.Args().First()
 					groupId := ctx.String("group")
 					name := ctx.String("name")
 					verbose := ctx.Bool("verbose")
+					network := ctx.String("network")
 					if filePath == "" {
 						return errors.New("no file path provided")
 					}
-					_, err := uploads.Upload(filePath, groupId, name, verbose)
+					_, err := uploads.Upload(filePath, groupId, name, verbose, network)
 					return err
 				},
 			},

internal/types/types.go

@@ -2,15 +2,18 @@ package types
 
 type UploadResponse struct {
 	Data struct {
-		Id            string `json:"id"`
-		Name          string `json:"name"`
-		Cid           string `json:"cid"`
-		Size          int    `json:"size"`
-		NumberOfFiles int    `json:"number_of_files"`
-		MimeType      string `json:"mime_type"`
-		CreatedAt     string `json:"created_at"`
-		GroupId       string `json:"group_id,omitempty"`
-		IsDuplicate   bool   `json:"is_duplicate,omitempty"`
+		Id            string            `json:"id"`
+		Name          string            `json:"name"`
+		Cid           string            `json:"cid"`
+		Size          int               `json:"size"`
+		CreatedAt     string            `json:"created_at"`
+		NumberOfFiles int               `json:"number_of_files"`
+		MimeType      string            `json:"mime_type"`
+		GroupId       *string           `json:"group_id"`
+		KeyValues     map[string]string `json:"keyvalues"`
+		Vectorized    bool              `json:"vectorized"`
+		Network       string            `json:"network"`
+		IsDuplicate   bool              `json:"is_duplicate,omitempty"`
 	} `json:"data"`
 }
 

internal/upload/uploads.go

@@ -12,6 +12,7 @@ import (
 	"os"
 	"path/filepath"
 	"pinata/internal/common"
+	"pinata/internal/config"
 	cliConfig "pinata/internal/config"
 	"pinata/internal/types"
 	"strings"
@@ -26,26 +27,26 @@ const (
 	CHUNK_SIZE              = 10 * 1024 * 1024  // Chunk size
 )
 
-func Upload(filePath string, groupId string, name string, verbose bool) (types.UploadResponse, error) {
+func Upload(filePath string, groupId string, name string, verbose bool, network string) (types.UploadResponse, error) {
 
 	stats, err := os.Stat(filePath)
 	if err != nil {
 		return types.UploadResponse{}, err
 	}
 
 	if stats.Size() > MAX_SIZE_REGULAR_UPLOAD {
-		return uploadWithTUS(filePath, groupId, name, verbose, stats)
+		return uploadWithTUS(filePath, groupId, name, verbose, stats, network)
 	}
 
-	return regularUpload(filePath, groupId, name, verbose)
+	return regularUpload(filePath, groupId, name, verbose, network)
 }
 
 type progressReader struct {
 	r   io.Reader
 	bar *progressbar.ProgressBar
 }
 
-func regularUpload(filePath string, groupId string, name string, verbose bool) (types.UploadResponse, error) {
+func regularUpload(filePath string, groupId string, name string, verbose bool, network string) (types.UploadResponse, error) {
 
 	jwt, err := common.FindToken()
 	if err != nil {
@@ -61,7 +62,7 @@ func regularUpload(filePath string, groupId string, name string, verbose bool) (
 		return types.UploadResponse{}, err
 	}
 	body := &bytes.Buffer{}
-	contentType, err := createMultipartRequest(filePath, files, body, stats, groupId, name)
+	contentType, err := createMultipartRequest(filePath, files, body, stats, groupId, name, network)
 	if err != nil {
 		return types.UploadResponse{}, err
 	}
@@ -166,7 +167,7 @@ func formatSize(bytes int) string {
 	return formattedSize
 }
 
-func uploadWithTUS(filePath string, groupId string, name string, verbose bool, stats os.FileInfo) (types.UploadResponse, error) {
+func uploadWithTUS(filePath string, groupId string, name string, verbose bool, stats os.FileInfo, network string) (types.UploadResponse, error) {
 	jwt, err := common.FindToken()
 	if err != nil {
 		return types.UploadResponse{}, err
@@ -194,9 +195,15 @@ func uploadWithTUS(filePath string, groupId string, name string, verbose bool, s
 	}
 	defer f.Close()
 
+	networkParam, err := cliConfig.GetNetworkParam(network)
+	if err != nil {
+		return types.UploadResponse{}, err
+	}
+
 	// Create metadata
 	metadata := map[string]string{
 		"filename": filepath.Base(filePath),
+		"network":  networkParam,
 	}
 	if groupId != "" {
 		metadata["group_id"] = groupId
@@ -289,7 +296,7 @@ func uploadWithTUS(filePath string, groupId string, name string, verbose bool, s
 	return response, nil
 }
 
-func createMultipartRequest(filePath string, files []string, body io.Writer, stats os.FileInfo, groupId string, name string) (string, error) {
+func createMultipartRequest(filePath string, files []string, body io.Writer, stats os.FileInfo, groupId string, name string, network string) (string, error) {
 	contentType := ""
 	writer := multipart.NewWriter(body)
 
@@ -322,6 +329,13 @@ func createMultipartRequest(filePath string, files []string, body io.Writer, sta
 		}
 	}
 
+	networkParam, err := config.GetNetworkParam(network)
+	if err != nil {
+		return "", err
+	}
+
+	err = writer.WriteField("network", networkParam)
+
 	if groupId != "" {
 		err := writer.WriteField("group_id", groupId)
 		if err != nil {
@@ -333,7 +347,7 @@ func createMultipartRequest(filePath string, files []string, body io.Writer, sta
 	if name != "nil" {
 		nameToUse = name
 	}
-	err := writer.WriteField("name", nameToUse)
+	err = writer.WriteField("name", nameToUse)
 	if err != nil {
 		return contentType, err
 	}