make requested changes

Author: cosrnic

cmd/mc/skin/add.go

@@ -1,12 +1,15 @@
 package skin
 
 import (
+	"context"
 	"errors"
 	"fmt"
-	"slices"
+	"os"
+	"os/signal"
 
 	"github.com/google/uuid"
 	"github.com/mworzala/mc/internal/pkg/cli"
+	"github.com/mworzala/mc/internal/pkg/mojang"
 	"github.com/spf13/cobra"
 )
 
@@ -21,13 +24,12 @@ type addSkinOpts struct {
 }
 
 var (
-	ErrInvalidType    = errors.New("invalid type")
 	ErrInvalidVariant = errors.New("invalid variant")
 
-	validVariants = []string{"classic", "slim"}
+	validationMap = map[string]bool{"classic": true, "slim": true}
 )
 
-func newAddCmd(app *cli.App) *cobra.Command {
+func newAddCmd(app *cli.App, account string) *cobra.Command {
 	var o addSkinOpts
 
 	cmd := &cobra.Command{
@@ -43,7 +45,8 @@ func newAddCmd(app *cli.App) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&o.account, "account", "", "Account to use")
+	o.account = account
+
 	cmd.Flags().StringVar(&o.variant, "variant", "classic", "Skin variant [classic/slim]")
 	cmd.Flags().StringVar(&o.cape, "cape", "", "Cape name, 'none' to remove")
 	cmd.Flags().BoolVar(&o.apply, "apply", false, "Apply the skin")
@@ -59,7 +62,7 @@ func (o *addSkinOpts) validateArgs(cmd *cobra.Command, args []string) (err error
 		return err
 	}
 
-	if !slices.Contains(validVariants, o.variant) {
+	if !validationMap[o.variant] {
 		return ErrInvalidVariant
 	}
 
@@ -84,7 +87,11 @@ func (o *addSkinOpts) execute(args []string) error {
 		return err
 	}
 
-	info, err := o.app.SkinManager().GetProfileInformation(token)
+	client := mojang.NewProfileClient(o.app.Build.Version)
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer cancel()
+
+	info, err := client.ProfileInformation(ctx, token)
 	if err != nil {
 		return err
 	}
@@ -112,13 +119,18 @@ func (o *addSkinOpts) execute(args []string) error {
 
 	if o.apply {
 
-		err = skin.Apply(token)
+		err = o.app.SkinManager().ApplySkin(skin, client, ctx, token)
 		if err != nil {
 			return err
 		}
+		if !o.app.Config.NonInteractive {
+			fmt.Printf("skin %s applied", skin.Name)
+		}
 	}
 
-	fmt.Printf("skin %s with cape %s was added to the list", skin.Name, skin.Cape)
+	if !o.app.Config.NonInteractive {
+		fmt.Printf("skin %s with cape %s was added to the list", skin.Name, skin.Cape)
+	}
 
 	return o.app.SkinManager().Save()
 

cmd/mc/skin/apply.go

@@ -1,7 +1,13 @@
 package skin
 
 import (
+	"context"
+	"fmt"
+	"os"
+	"os/signal"
+
 	"github.com/mworzala/mc/internal/pkg/cli"
+	"github.com/mworzala/mc/internal/pkg/mojang"
 	"github.com/spf13/cobra"
 )
 
@@ -11,7 +17,7 @@ type applySkinOpts struct {
 	account string
 }
 
-func newApplyCmd(app *cli.App) *cobra.Command {
+func newApplyCmd(app *cli.App, account string) *cobra.Command {
 	var o applySkinOpts
 
 	cmd := &cobra.Command{
@@ -28,7 +34,7 @@ func newApplyCmd(app *cli.App) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&o.account, "account", "", "Account to use")
+	o.account = account
 
 	return cmd
 }
@@ -58,5 +64,17 @@ func (o *applySkinOpts) execute(args []string) error {
 		return err
 	}
 
-	return skin.Apply(token)
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer cancel()
+
+	client := mojang.NewProfileClient(o.app.Build.Version)
+
+	err = o.app.SkinManager().ApplySkin(skin, client, ctx, token)
+	if err != nil {
+		return err
+	}
+	if !o.app.Config.NonInteractive {
+		fmt.Printf("skin %s applied", skin.Name)
+	}
+	return nil
 }

cmd/mc/skin/list.go

@@ -32,8 +32,8 @@ func (o *listSkinsOpts) listSkins() error {
 	var result appModel.SkinList
 	for _, skin := range skinManager.Skins() {
 		result = append(result, &appModel.Skin{
-			Name: skin.Name,
-			Date: skin.AddedDate,
+			Name:     skin.Name,
+			Modified: skin.AddedDate,
 		})
 	}
 

cmd/mc/skin/skin.go

@@ -8,12 +8,16 @@ import (
 func NewSkinCmd(app *cli.App) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "skin",
-		Short: "Manage Minecraft Skins and Capes",
+		Short: "Manage Minecraft skins and capes",
 	}
 
+	var account string
+
+	cmd.Flags().StringVar(&account, "account", "", "Account to use")
+
 	cmd.AddCommand(newListCmd(app))
-	cmd.AddCommand(newAddCmd(app))
-	cmd.AddCommand(newApplyCmd(app))
+	cmd.AddCommand(newAddCmd(app, account))
+	cmd.AddCommand(newApplyCmd(app, account))
 
 	return cmd
 }

internal/pkg/cli/model/skin.go

@@ -8,21 +8,21 @@ import (
 )
 
 type Skin struct {
-	Name string
-	Date time.Time
+	Name     string
+	Modified time.Time
 }
 
 func (i *Skin) String() string {
-	return fmt.Sprintf("%s\t%s", i.Name, i.Date)
+	return fmt.Sprintf("%s\t%s", i.Name, i.Modified)
 }
 
 type SkinList []*Skin
 
 func (l SkinList) String() string {
 	table := uitable.New()
-	table.AddRow("NAME", "DATE")
+	table.AddRow("NAME", "MODIFIED")
 	for _, skin := range l {
-		table.AddRow(skin.Name, skin.Date)
+		table.AddRow(skin.Name, skin.Modified)
 	}
 	return table.String()
 }