mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-10-14 06:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix unhandled error warnings, error messages (except import.go)

Browse Source
This commit is contained in:
comp500
2019-11-15 22:28:14 +00:00
parent e51537c677
commit a553c3ce08
12 changed files with 113 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/init.go
View File

@@ -243,25 +243,25 @@ func init() {
initCmd.Flags().String("name", "", "The name of the modpack (omit to define interactively)")
initCmd.Flags().String("index-file", "index.toml", "The index file to use")
viper.BindPFlag("init.index-file", initCmd.Flags().Lookup("index-file"))
_ = viper.BindPFlag("init.index-file", initCmd.Flags().Lookup("index-file"))
initCmd.Flags().String("mc-version", "", "The Minecraft version to use (omit to define interactively)")
viper.BindPFlag("init.mc-version", initCmd.Flags().Lookup("mc-version"))
_ = viper.BindPFlag("init.mc-version", initCmd.Flags().Lookup("mc-version"))
initCmd.Flags().BoolP("latest", "l", false, "Automatically select the latest version of Minecraft")
viper.BindPFlag("init.latest", initCmd.Flags().Lookup("latest"))
_ = viper.BindPFlag("init.latest", initCmd.Flags().Lookup("latest"))
initCmd.Flags().BoolP("snapshot", "s", false, "Use the latest snapshot version with --latest")
viper.BindPFlag("init.snapshot", initCmd.Flags().Lookup("snapshot"))
_ = viper.BindPFlag("init.snapshot", initCmd.Flags().Lookup("snapshot"))
initCmd.Flags().BoolP("reinit", "r", false, "Recreate the pack file if it already exists, rather than exiting")
viper.BindPFlag("init.reinit", initCmd.Flags().Lookup("reinit"))
_ = viper.BindPFlag("init.reinit", initCmd.Flags().Lookup("reinit"))
initCmd.Flags().String("modloader", "", "The mod loader to use (omit to define interactively)")
viper.BindPFlag("init.modloader", initCmd.Flags().Lookup("modloader"))
_ = viper.BindPFlag("init.modloader", initCmd.Flags().Lookup("modloader"))
// ok this is epic
for _, loader := range modLoaders {
for _, component := range loader {
initCmd.Flags().String(component.Name+"-version", "", "The "+component.FriendlyName+" version to use (omit to define interactively)")
viper.BindPFlag("init."+component.Name+"-version", initCmd.Flags().Lookup(component.Name+"-version"))
_ = viper.BindPFlag("init."+component.Name+"-version", initCmd.Flags().Lookup(component.Name+"-version"))
initCmd.Flags().Bool(component.Name+"-latest", false, "Automatically select the latest version of "+component.FriendlyName)
viper.BindPFlag("init."+component.Name+"-latest", initCmd.Flags().Lookup(component.Name+"-latest"))
_ = viper.BindPFlag("init."+component.Name+"-latest", initCmd.Flags().Lookup(component.Name+"-latest"))
}
}
}

4
cmd/root.go
View File

@@ -36,10 +36,10 @@ func init() {
cobra.OnInitialize(initConfig)
rootCmd.PersistentFlags().StringVar(&packFile, "pack-file", "pack.toml", "The modpack metadata file to use")
viper.BindPFlag("pack-file", rootCmd.PersistentFlags().Lookup("pack-file"))
_ = viper.BindPFlag("pack-file", rootCmd.PersistentFlags().Lookup("pack-file"))
rootCmd.PersistentFlags().StringVar(&modsFolder, "mods-folder", "mods", "The default folder to store mod metadata files in")
viper.BindPFlag("mods-folder", rootCmd.PersistentFlags().Lookup("mods-folder"))
_ = viper.BindPFlag("mods-folder", rootCmd.PersistentFlags().Lookup("mods-folder"))
file, err := os.UserConfigDir()
if err != nil {

17
cmd/serve.go
View File

@@ -111,21 +111,24 @@ var serveCmd = &cobra.Command{
if err != nil {
fmt.Printf("Error reading file \"%s\": %s\n", path, err)
w.WriteHeader(404)
w.Write([]byte("File not found"))
_, _ = w.Write([]byte("File not found"))
return
}
defer f.Close()
_, err = io.Copy(w, f)
err2 := f.Close()
if err == nil {
err = err2
}
if err != nil {
fmt.Printf("Error reading file \"%s\": %s\n", path, err)
w.WriteHeader(500)
w.Write([]byte("Failed to read file"))
_, _ = w.Write([]byte("Failed to read file"))
return
}
} else {
fmt.Printf("File not found: %s\n", path)
w.WriteHeader(404)
w.Write([]byte("File not found"))
_, _ = w.Write([]byte("File not found"))
return
}
})
@@ -145,9 +148,9 @@ func init() {
rootCmd.AddCommand(serveCmd)
serveCmd.Flags().IntP("port", "p", 8080, "The port to run the server on")
viper.BindPFlag("serve.port", serveCmd.Flags().Lookup("port"))
_ = viper.BindPFlag("serve.port", serveCmd.Flags().Lookup("port"))
serveCmd.Flags().BoolP("refresh", "r", true, "Automatically refresh the index file")
viper.BindPFlag("serve.refresh", serveCmd.Flags().Lookup("refresh"))
_ = viper.BindPFlag("serve.refresh", serveCmd.Flags().Lookup("refresh"))
serveCmd.Flags().Bool("basic", false, "Disable refreshing and allow all files in the directory, rather than just files listed in the index")
viper.BindPFlag("serve.basic", serveCmd.Flags().Lookup("basic"))
_ = viper.BindPFlag("serve.basic", serveCmd.Flags().Lookup("basic"))
}