cleanup

cmd/install.go

@@ -1,8 +1,11 @@
 package cmd
 
 import (
+	"github.com/nothub/gorinth/http"
 	"github.com/spf13/cobra"
 	"log"
+	"net/url"
+	"os"
 )
 
 func init() {
@@ -15,6 +18,28 @@ var installCmd = &cobra.Command{
 	Long:  `TODO`,
 
 	Run: func(cmd *cobra.Command, args []string) {
-		log.Fatalln("Not yet implemented!")
+		if len(args) < 1 {
+			// TODO: cobra arg checks
+			log.Fatalln("argghh")
+		}
+
+		if _, err := os.Stat(args[0]); err == nil {
+			// arg is existing file path
+
+		} else if _, err := url.Parse(args[0]); err != nil {
+			// arg is valid url
+
+			file, err := http.Instance.DownloadFile(args[0], ".")
+			if err != nil {
+				log.Fatalln(err)
+			}
+			log.Println("Stored mrpack to:", file)
+
+		} else {
+			// arg is project id?
+			// TODO
+		}
+
+		// TODO
 	},
 }

http/client.go

@@ -35,8 +35,8 @@ func init() {
 	}
 }
 
-func (client *Client) GetJson(url string, body io.Reader, respModel interface{}, errModel ErrorModel) error {
-	request, err := http.NewRequest(http.MethodGet, url, body)
+func (client *Client) GetJson(url string, respModel interface{}, errModel ErrorModel) error {
+	request, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return err
 	}

modrinth/api/endpoints.go

@@ -14,7 +14,7 @@ func (client *ApiClient) LabrinthInfo() (*LabrinthInfo, error) {
 	}
 
 	labrinthInfo := LabrinthInfo{}
-	err = client.Http.GetJson(url.String(), nil, &labrinthInfo, &Error{})
+	err = client.Http.GetJson(url.String(), &labrinthInfo, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -32,7 +32,7 @@ func (client *ApiClient) GetProject(id string) (*Project, error) {
 	}
 
 	project := Project{}
-	err = client.Http.GetJson(url.String(), nil, &project, &Error{})
+	err = client.Http.GetJson(url.String(), &project, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -52,7 +52,7 @@ func (client *ApiClient) GetProjects(ids []string) ([]*Project, error) {
 	url.RawQuery = query.Encode()
 
 	var projects []*Project
-	err = client.Http.GetJson(url.String(), nil, &projects, &Error{})
+	err = client.Http.GetJson(url.String(), &projects, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +68,7 @@ func (client *ApiClient) CheckProjectValidity(id string) (*CheckResponse, error)
 	}
 
 	var checkResponse CheckResponse
-	err = client.Http.GetJson(url.String(), nil, &checkResponse, &Error{})
+	err = client.Http.GetJson(url.String(), &checkResponse, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +84,7 @@ func (client *ApiClient) GetDependencies(id string) (*Dependencies, error) {
 	}
 
 	var dependencies Dependencies
-	err = client.Http.GetJson(url.String(), nil, &dependencies, &Error{})
+	err = client.Http.GetJson(url.String(), &dependencies, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -114,7 +114,7 @@ func (client *ApiClient) GetProjectVersions(id string, params *GetProjectVersion
 	url.RawQuery = query.Encode()
 
 	var versions []*Version
-	err = client.Http.GetJson(url.String(), nil, &versions, &Error{})
+	err = client.Http.GetJson(url.String(), &versions, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -136,7 +136,7 @@ func (client *ApiClient) GetVersion(id string) (*Version, error) {
 	}
 
 	var version Version
-	err = client.Http.GetJson(url.String(), nil, &version, &Error{})
+	err = client.Http.GetJson(url.String(), &version, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -156,7 +156,7 @@ func (client *ApiClient) GetVersions(ids []string) ([]*Version, error) {
 	url.RawQuery = query.Encode()
 
 	var versions []*Version
-	err = client.Http.GetJson(url.String(), nil, &versions, &Error{})
+	err = client.Http.GetJson(url.String(), &versions, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -178,7 +178,7 @@ func (client *ApiClient) VersionFromHash(hash string, algorithm HashAlgo) (*Vers
 	url.RawQuery = query.Encode()
 
 	var version *Version
-	err = client.Http.GetJson(url.String(), nil, &version, &Error{})
+	err = client.Http.GetJson(url.String(), &version, &Error{})
 	if err != nil {
 		return nil, err
 	}
@@ -194,7 +194,7 @@ func (client *ApiClient) GetLatestGameVersion() (string, error) {
 	}
 
 	var gameVersions []*GameVersion
-	err = client.Http.GetJson(url.String(), nil, &gameVersions, &Error{})
+	err = client.Http.GetJson(url.String(), &gameVersions, &Error{})
 	if err != nil {
 		return "", err
 	}

mojang/api.go

@@ -13,7 +13,7 @@ func LatestVersion() (string, error) {
 			Snapshot string `json:"snapshot"`
 		} `json:"latest"`
 	}
-	err := http.Instance.GetJson(manifestUrl, nil, &manifest, nil)
+	err := http.Instance.GetJson(manifestUrl, &manifest, nil)
 	if err != nil {
 		return "", err
 	}

server/fabric.go

@@ -42,7 +42,7 @@ func latestFabricLoaderVersion(mcVer string) (string, error) {
 			Stable  bool   `json:"stable"`
 		} `json:"loader"`
 	}
-	err := http.Instance.GetJson("https://meta.fabricmc.net/v2/versions/loader/"+mcVer, nil, &loaders, nil)
+	err := http.Instance.GetJson("https://meta.fabricmc.net/v2/versions/loader/"+mcVer, &loaders, nil)
 	if err != nil {
 		return "", err
 	}
@@ -59,7 +59,7 @@ func latestFabricInstallerVersion() (string, error) {
 		Version string `json:"version"`
 		Stable  bool   `json:"stable"`
 	}
-	err := http.Instance.GetJson("https://meta.fabricmc.net/v2/versions/installer", nil, &installers, nil)
+	err := http.Instance.GetJson("https://meta.fabricmc.net/v2/versions/installer", &installers, nil)
 	if err != nil {
 		return "", err
 	}

server/paper.go

@@ -24,7 +24,7 @@ func (supplier *Paper) GetUrl() (string, error) {
 			} `json:"downloads"`
 		} `json:"builds"`
 	}
-	err := http.Instance.GetJson("https://api.papermc.io/v2/projects/paper/versions/"+supplier.MinecraftVersion+"/builds", nil, &response, nil)
+	err := http.Instance.GetJson("https://api.papermc.io/v2/projects/paper/versions/"+supplier.MinecraftVersion+"/builds", &response, nil)
 	if err != nil {
 		return "", err
 	}