Skip to content

Commit

Permalink
all logs go to stderr
Browse files Browse the repository at this point in the history
  • Loading branch information
nothub committed Apr 7, 2024
1 parent c3a83c7 commit 2c467eb
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 44 deletions.
19 changes: 9 additions & 10 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cmd

import (
"fmt"
"github.com/nothub/mrpack-install/buildinfo"
"github.com/nothub/mrpack-install/files"
modrinth "github.com/nothub/mrpack-install/modrinth/api"
Expand Down Expand Up @@ -110,7 +109,7 @@ var RootCmd = &cobra.Command{
log.Fatalln(err)
}

fmt.Printf("Installing %q from %q to %q\n", index.Name, zipPath, serverDir)
log.Printf("Installing %q from %q to %q\n", index.Name, zipPath, serverDir)
err = os.MkdirAll(serverDir, 0755)
if err != nil {
log.Fatalln(err)
Expand All @@ -126,20 +125,20 @@ var RootCmd = &cobra.Command{

// download server if not present
if !files.IsFile(filepath.Join(serverDir, serverFile)) {
fmt.Println("Server file not present, downloading...")
fmt.Println("(Point --server-dir and --server-file to existing targets to skip this step)")
log.Println("Server file not present, downloading...")
log.Println("(Point --server-dir and --server-file to existing targets to skip this step)")
inst := server.InstallerFromDeps(&index.Deps)
err := inst.Install(serverDir, serverFile)
if err != nil {
log.Fatalln(err)
}
} else {
fmt.Println("Server file already present, proceeding...")
log.Println("Server file already present, proceeding...")
}

// downloads
downloads := index.ServerDownloads()
fmt.Printf("Downloading %v dependencies...\n", len(downloads))
log.Printf("Downloading %v dependencies...\n", len(downloads))
downloader := download.Downloader{
Downloads: downloads,
Threads: int(dlThreads),
Expand All @@ -148,7 +147,7 @@ var RootCmd = &cobra.Command{
downloader.Download(serverDir)

// overrides
fmt.Println("Extracting overrides...")
log.Println("Extracting overrides...")
err = mrpack.ExtractOverrides(zipPath, serverDir)
if err != nil {
log.Fatalln(err)
Expand All @@ -167,7 +166,7 @@ var RootCmd = &cobra.Command{

files.RmEmptyDirs(serverDir)

fmt.Println("Installation done :) Have a nice day ✌️")
log.Println("Installation done :) Have a nice day ✌️")
},
}

Expand All @@ -179,7 +178,7 @@ func handleArgs(input string, version string, serverDir string, host string) (*m

archivePath := ""
if web.IsValidHttpUrl(input) {
fmt.Println("Downloading mrpack file from", input)
log.Println("Downloading mrpack file from", input)
file, err := web.DefaultClient.DownloadFile(input, serverDir, "")
if err != nil {
log.Fatalln(err.Error())
Expand Down Expand Up @@ -217,7 +216,7 @@ func handleArgs(input string, version string, serverDir string, host string) (*m

for i := range fileInfos {
if strings.HasSuffix(fileInfos[i].Filename, ".mrpack") {
fmt.Println("Downloading mrpack file from", fileInfos[i].Url)
log.Println("Downloading mrpack file from", fileInfos[i].Url)
file, err := web.DefaultClient.DownloadFile(fileInfos[i].Url, serverDir, "")
if err != nil {
log.Fatalln(err.Error())
Expand Down
3 changes: 1 addition & 2 deletions files/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package files

import (
"errors"
"fmt"
"log"
"os"
"path/filepath"
Expand Down Expand Up @@ -98,7 +97,7 @@ func RmEmptyDirs(dir string) {
for _, path := range dirs {
err := os.Remove(path)
if err != nil {
fmt.Printf("Unable to delete empty directory %s. %s\n", path, err.Error())
log.Printf("Unable to delete empty directory %s. %s\n", path, err.Error())
}
}
}
7 changes: 3 additions & 4 deletions modrinth/mrpack/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"archive/zip"
"encoding/json"
"errors"
"fmt"
"github.com/nothub/mrpack-install/web/download"
"io"
"log"
Expand Down Expand Up @@ -69,7 +68,7 @@ func ReadIndex(zipFile string) (*Index, error) {
defer func(r *zip.ReadCloser) {
err := r.Close()
if err != nil {
fmt.Println(err)
log.Println(err)
}
}(r)

Expand All @@ -91,7 +90,7 @@ func ReadIndex(zipFile string) (*Index, error) {
defer func(fileReader io.ReadCloser) {
err := fileReader.Close()
if err != nil {
fmt.Println(err)
log.Println(err)
}
}(fileReader)

Expand Down Expand Up @@ -120,7 +119,7 @@ func (index *Index) ServerDownloads() []*download.Download {
}

if len(file.Downloads) < 1 {
fmt.Printf("No downloads for file: %s\n", file.Path)
log.Printf("No downloads for file: %s\n", file.Path)
continue
}

Expand Down
3 changes: 1 addition & 2 deletions modrinth/mrpack/overrides.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package mrpack
import (
"archive/zip"
"crypto"
"fmt"
"github.com/nothub/hashutils/chksum"
"github.com/nothub/hashutils/encoding"
"github.com/nothub/mrpack-install/files"
Expand Down Expand Up @@ -82,7 +81,7 @@ func ExtractOverrides(zipFile string, serverDir string) (err error) {
return err
}

fmt.Printf("Override: %s\n", targetPath)
log.Printf("Override: %s\n", targetPath)

return nil
})
Expand Down
4 changes: 2 additions & 2 deletions modrinth/mrpack/zip.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package mrpack

import (
"archive/zip"
"fmt"
"log"
)

func IterZip(zipPath string, callback func(file *zip.File) error) error {
Expand All @@ -14,7 +14,7 @@ func IterZip(zipPath string, callback func(file *zip.File) error) error {
defer func(r *zip.ReadCloser) {
err := r.Close()
if err != nil {
fmt.Println(err)
log.Println(err)
}
}(r)

Expand Down
4 changes: 2 additions & 2 deletions server/fabric.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package server

import (
"errors"
"fmt"
"github.com/nothub/mrpack-install/web"
"log"
"net/url"
)

Expand Down Expand Up @@ -38,7 +38,7 @@ func (inst *FabricInstaller) Install(serverDir string, serverFile string) error
return err
}

fmt.Println("Server jar downloaded to:", file)
log.Println("Server jar downloaded to:", file)
return nil
}

Expand Down
3 changes: 2 additions & 1 deletion server/forge.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package server
import (
"fmt"
"github.com/nothub/mrpack-install/web"
"log"
"os"
"os/exec"
"path/filepath"
Expand All @@ -27,7 +28,7 @@ func (inst *ForgeInstaller) Install(serverDir string, serverFile string) error {
}

cmd := exec.Command("java", "-jar", installerFile, "--installServer", serverDir)
fmt.Println("Executing command:", cmd.String())
log.Println("Executing command:", cmd.String())
if err = cmd.Run(); err != nil {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions server/neoforge.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package server

import (
"fmt"
"github.com/nothub/mrpack-install/web"
"log"
)
Expand All @@ -23,6 +22,6 @@ func (inst *NeoForgeInstaller) Install(serverDir string, serverFile string) erro
if err != nil {
return err
}
fmt.Println("Server jar downloaded to:", file)
log.Println("Server jar downloaded to:", file)
return nil
}
4 changes: 2 additions & 2 deletions server/paper.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package server

import (
"errors"
"fmt"
"github.com/nothub/mrpack-install/web"
"log"
"strconv"
)

Expand Down Expand Up @@ -42,7 +42,7 @@ func (inst *PaperInstaller) Install(serverDir string, serverFile string) error {
return err
}

fmt.Println("Server jar downloaded to:", file)
log.Println("Server jar downloaded to:", file)
return nil
}
}
Expand Down
4 changes: 2 additions & 2 deletions server/quilt.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package server

import (
"errors"
"fmt"
"github.com/nothub/mrpack-install/files"
"github.com/nothub/mrpack-install/maven"
"github.com/nothub/mrpack-install/web"
"log"
"os"
"os/exec"
"path/filepath"
Expand All @@ -29,7 +29,7 @@ func (inst *QuiltInstaller) Install(serverDir string, serverFile string) error {
}

cmd := exec.Command("java", "-jar", installer, "install", "server", inst.MinecraftVersion, "--install-dir="+serverDir, "--create-scripts", "--download-server")
fmt.Println("Executing command:", cmd.String())
log.Println("Executing command:", cmd.String())
err = cmd.Run()
if err != nil {
return err
Expand Down
3 changes: 1 addition & 2 deletions update/backup/backup.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package backup

import (
"fmt"
"log"
"os"
"path/filepath"
Expand All @@ -18,7 +17,7 @@ func SetDir(s string) {
}

func Create(filePath string, serverDir string) error {
fmt.Printf("Backup: %s\n", filePath)
log.Printf("Backup: %s\n", filePath)

if dir == "" {
dir = filepath.Join(serverDir, "backups", time.Now().Format("20060102150405"))
Expand Down
9 changes: 4 additions & 5 deletions update/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package update

import (
"crypto"
"fmt"
"github.com/nothub/hashutils/chksum"
"github.com/nothub/hashutils/encoding"
"github.com/nothub/mrpack-install/files"
Expand All @@ -19,7 +18,7 @@ import (
import "golang.org/x/exp/slices"

func Cmd(serverDir string, dlThreads uint8, dlRetries uint8, index *mrpack.Index, zipPath string, oldState *packstate.Schema) {
fmt.Printf("Updating %q in %q with %q\n", index.Name, serverDir, zipPath)
log.Printf("Updating %q in %q with %q\n", index.Name, serverDir, zipPath)
err := os.Chdir(serverDir)
if err != nil {
log.Fatalln(err)
Expand Down Expand Up @@ -90,7 +89,7 @@ func Cmd(serverDir string, dlThreads uint8, dlRetries uint8, index *mrpack.Index
}
}

fmt.Printf("Downloading %v dependencies...\n", len(downloads))
log.Printf("Downloading %v dependencies...\n", len(downloads))
downloader := download.Downloader{
Downloads: downloads,
Threads: int(dlThreads),
Expand All @@ -99,7 +98,7 @@ func Cmd(serverDir string, dlThreads uint8, dlRetries uint8, index *mrpack.Index
downloader.Download(serverDir)

// overrides
fmt.Println("Extracting overrides...")
log.Println("Extracting overrides...")
err = mrpack.ExtractOverrides(zipPath, serverDir)
if err != nil {
log.Fatalln(err)
Expand All @@ -113,5 +112,5 @@ func Cmd(serverDir string, dlThreads uint8, dlRetries uint8, index *mrpack.Index

files.RmEmptyDirs(serverDir)

fmt.Println("Update finished :) Have a nice day ✌️")
log.Println("Update finished :) Have a nice day ✌️")
}
3 changes: 1 addition & 2 deletions web/download/multi.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package download

import (
"crypto"
"fmt"
"github.com/nothub/hashutils/chksum"
"github.com/nothub/hashutils/encoding"
modrinth "github.com/nothub/mrpack-install/modrinth/api"
Expand Down Expand Up @@ -49,7 +48,7 @@ func (g *Downloader) Download(baseDir string) {
continue
}
// success yay
fmt.Printf("Download: %s\n", f)
log.Printf("Download: %s\n", f)
success = true
break
}
Expand Down
3 changes: 1 addition & 2 deletions web/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"encoding/json"
"encoding/xml"
"errors"
"fmt"
"io"
"log"
"net/http"
Expand Down Expand Up @@ -32,7 +31,7 @@ func (c *Client) GetModel(url string, respModel interface{}, errModel error, dec
defer func(Body io.Closer) {
err := Body.Close()
if err != nil {
fmt.Println(err)
log.Println(err)
}
}(res.Body)

Expand Down
8 changes: 4 additions & 4 deletions web/ratelimits.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package web

import (
"fmt"
"log"
"net/http"
"strconv"
"time"
Expand Down Expand Up @@ -31,15 +31,15 @@ func updateRateLimits(response *http.Response) {
// number of requests left for the time window
remaining, err := strconv.ParseUint(response.Header.Get("x-ratelimit-remaining"), 10, 0)
if err != nil {
fmt.Println("Failed to parse ratelimit-remaining value", err, "sent by", response.Request.Host)
log.Println("Failed to parse ratelimit-remaining value", err, "sent by", response.Request.Host)
return
}
limits.Remaining = remaining

// number of seconds before the rate limit resets
reset, err := strconv.ParseUint(response.Header.Get("x-ratelimit-reset"), 10, 0)
if err != nil {
fmt.Println("Failed to parse ratelimit-reset value", err, "sent by", response.Request.Host)
log.Println("Failed to parse ratelimit-reset value", err, "sent by", response.Request.Host)
return
}
limits.ResetDelay = time.Duration(reset) * time.Second
Expand All @@ -55,7 +55,7 @@ func awaitRateLimits(host string) {
return
}
if rateLimits[host].Remaining <= 1 {
fmt.Println("Awaiting rate limits for:", host, "Sleeping for", rateLimits[host].ResetDelay, "seconds...")
log.Println("Awaiting rate limits for:", host, "Sleeping for", rateLimits[host].ResetDelay, "seconds...")
time.Sleep(rateLimits[host].ResetDelay)
}
}

0 comments on commit 2c467eb

Please sign in to comment.