Create commons for shared stuff for pufferd

pufferpanel · Oct 14, 2018 · 305a44f · 305a44f
1 parent 7ed9156
commit 305a44f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 12 deletions.
diff --git a/programs/operations/ops/tools_common.go → commons/download.go b/programs/operations/ops/tools_common.go → commons/download.go
@@ -14,7 +14,7 @@
  limitations under the License.
 */
 
-package ops
+package commons
 
 import (
 	"github.com/pufferpanel/apufferi/logging"

diff --git a/programs/operations/ops/impl/mojangdl/mojangdl.go b/programs/operations/ops/impl/mojangdl/mojangdl.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"github.com/pufferpanel/apufferi/common"
 	"github.com/pufferpanel/apufferi/logging"
+	"github.com/pufferpanel/pufferd/commons"
 	"github.com/pufferpanel/pufferd/environments"
 	"github.com/pufferpanel/pufferd/programs/operations/ops"
 	"net/http"
@@ -43,8 +44,14 @@ func (op MojangDl) Run(env environments.Environment) error {
 	}
 
 	var data MojangLauncherJson
-	json.NewDecoder(response.Body).Decode(&data)
-	response.Body.Close()
+	err = json.NewDecoder(response.Body).Decode(&data)
+	if err != nil {
+		return err
+	}
+	err = response.Body.Close()
+	if err != nil {
+		return err
+	}
 
 	var targetVersion string
 	switch op.Version {
@@ -80,15 +87,21 @@ func downloadServerFromJson(url, target string, env environments.Environment) er
 	}
 
 	var data MojangVersionJson
-	json.NewDecoder(response.Body).Decode(&data)
-	response.Body.Close()
+	err = json.NewDecoder(response.Body).Decode(&data)
+	if err != nil {
+		return err
+	}
+	err = response.Body.Close()
+	if err != nil {
+		return err
+	}
 
 	serverBlock := data.Downloads["server"]
 
 	logging.Debugf("Version jar located, downloading from %s", serverBlock.Url)
 	env.DisplayToConsole(fmt.Sprintf("Version jar located, downloading from %s\n", serverBlock.Url))
 
-	return ops.DownloadFile(serverBlock.Url, target, env)
+	return commons.DownloadFile(serverBlock.Url, target, env)
 }
 
 type MojangDlOperationFactory struct {

diff --git a/programs/operations/ops/impl/spongeforgedl/spongeforgedl.go b/programs/operations/ops/impl/spongeforgedl/spongeforgedl.go
@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/pufferpanel/apufferi/common"
+	"github.com/pufferpanel/pufferd/commons"
 	"github.com/pufferpanel/pufferd/environments"
 	"github.com/pufferpanel/pufferd/programs/operations/ops"
 	"net/http"
@@ -69,8 +70,14 @@ func (op SpongeForgeDl) Run(env environments.Environment) error {
 		}
 
 		var all []download
-		json.NewDecoder(response.Body).Decode(&all)
-		response.Body.Close()
+		err = json.NewDecoder(response.Body).Decode(&all)
+		if err != nil {
+			return err
+		}
+		err = response.Body.Close()
+		if err != nil {
+			return err
+		}
 
 		versionData = all[0]
 	} else {
@@ -82,8 +89,14 @@ func (op SpongeForgeDl) Run(env environments.Environment) error {
 			return err
 		}
 
-		json.NewDecoder(response.Body).Decode(&versionData)
-		response.Body.Close()
+		err = json.NewDecoder(response.Body).Decode(&versionData)
+		if err != nil {
+			return err
+		}
+		err = response.Body.Close()
+		if err != nil {
+			return err
+		}
 	}
 
 	if versionData.Artifacts == nil || len(versionData.Artifacts) == 0 {
@@ -94,7 +107,7 @@ func (op SpongeForgeDl) Run(env environments.Environment) error {
 	versionMapping["forge"] = versionData.Dependencies.Forge
 	versionMapping["minecraft"] = versionData.Dependencies.Minecraft
 
-	err := ops.DownloadFile(common.ReplaceTokens(FORGE_URL, versionMapping), "forge-installer.jar", env)
+	err := commons.DownloadFile(common.ReplaceTokens(FORGE_URL, versionMapping), "forge-installer.jar", env)
 	if err != nil {
 		return err
 	}
@@ -104,7 +117,7 @@ func (op SpongeForgeDl) Run(env environments.Environment) error {
 		return err
 	}
 
-	err = ops.DownloadFile(versionData.Artifacts[""].Url, path.Join("mods", "spongeforge.jar"), env)
+	err = commons.DownloadFile(versionData.Artifacts[""].Url, path.Join("mods", "spongeforge.jar"), env)
 	if err != nil {
 		return err
 	}