Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cli/cmd/inspect/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ func NewCommand(ctx context.Context, cliCtx cli.Context) *cobra.Command {
versionData.AddRow(indent3+v.Version+":", "")
versionData.AddRow(indent4+"ID:", v.Id)
versionData.AddRow(indent4+"Minecraft version"+":", v.MinecraftVersion)
versionData.AddRow(indent4+"Min Players"+":", v.MinPlayers)
versionData.AddRow(indent4+"Max Players"+":", v.MaxPlayers)
versionData.AddRow(indent4+"Created at:", fmtTime(v.CreatedAt))
versionData.AddRow(indent4+"Build status:", v.BuildStatus)
versionData.Print()
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/publish/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ func (b builder) handlePrerequisites(ctx context.Context, data *buildData) error
Hash: data.local.hash,
FileHashes: hashes,
MinecraftVersion: data.local.minecraftVersion,
MinPlayers: data.local.minPlayers,
MaxPlayers: data.local.maxPlayers,
})
if err != nil {
return fmt.Errorf("error while creating flavor version: %w", err)
Expand Down
44 changes: 31 additions & 13 deletions cli/cmd/publish/plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,14 @@ type actionable struct {
}

type plan struct {
addedFlavors []localFlavor
changedFlavors []changedFlavor
deletedFlavors []deletedFlavor
actionables []actionable
conflicts []conflict
updateThumbnail bool
chunkWillBeRemoved bool
addedFlavors []localFlavor
changedFlavors []changedFlavor
deletedFlavors []deletedFlavor
actionables []actionable
conflicts []conflict
updateThumbnail bool
chunkWillBeRemoved bool
minOrMaxPlayersChanged bool
}

func newPlan(logger *slog.Logger, cfg config.Config, supportedVersions []string, chunk *chunkv1alpha1.Chunk) plan {
Expand All @@ -140,6 +141,8 @@ func newPlan(logger *slog.Logger, cfg config.Config, supportedVersions []string,
version: f.Version,
path: f.Path,
minecraftVersion: f.MinecraftVersion,
minPlayers: uint32(f.MinPlayers),
maxPlayers: uint32(f.MaxPlayers),
}

if !slices.Contains(supportedVersions, local.minecraftVersion) {
Expand Down Expand Up @@ -198,12 +201,18 @@ func newPlan(logger *slog.Logger, cfg config.Config, supportedVersions []string,
added, changed, removed = local.fileDiff(prevVersion.FileHashes)
)

if prevVersion.MinPlayers != local.minPlayers || prevVersion.MaxPlayers != local.maxPlayers {
p.minOrMaxPlayersChanged = true
}

p.changedFlavors = append(p.changedFlavors, changedFlavor{
onDisk: local,
prevVersion: prevVersion.Version,
addedFiles: added,
modifiedFiles: changed,
removedFiles: removed,
onDisk: local,
prevVersion: prevVersion.Version,
prevMinPlayers: prevVersion.MinPlayers,
prevMaxPlayers: prevVersion.MaxPlayers,
addedFiles: added,
modifiedFiles: changed,
removedFiles: removed,
})
continue
}
Expand Down Expand Up @@ -344,6 +353,8 @@ func (p plan) print() {
sec.AddRow(cli.ColorGreen+indent1+fl.name+":", "")
sec.AddRow(indent2+addPrefix+"Version:", fl.version)
sec.AddRow(indent2+addPrefix+"Path:", fl.path)
sec.AddRow(indent2+addPrefix+"Min Players:", fl.minPlayers)
sec.AddRow(indent2+addPrefix+"Max Players:", fl.maxPlayers)
sec.AddRow(indent2+addPrefix+"Files:", "")
sec.Print()
for _, fi := range fl.files {
Expand All @@ -359,8 +370,15 @@ func (p plan) print() {
sec.AddRow(cli.ColorYellow+indent1+fl.onDisk.name+":", "")
sec.AddRow(indent2+modPrefix+"Version:", fmt.Sprintf("%s -> %s", fl.prevVersion, fl.onDisk.version))
sec.AddRow(indent2+modPrefix+"Path:", fl.onDisk.path)
sec.AddRow(indent2+modPrefix+"Files:", "")
sec.AddRow(indent2+modPrefix+"Min Players:", fmt.Sprintf("%d -> %d", fl.prevMinPlayers, fl.onDisk.minPlayers))
sec.AddRow(indent2+modPrefix+"Max Players:", fmt.Sprintf("%d -> %d", fl.prevMaxPlayers, fl.onDisk.maxPlayers))

if len(fl.addedFiles)+len(fl.modifiedFiles)+len(fl.removedFiles) > 0 {
sec.AddRow(indent2+modPrefix+"Files:", "")
}

sec.Print()

for _, fh := range fl.addedFiles {
fmt.Println(indent3, addPrefix, fh.Path)
}
Expand Down
17 changes: 11 additions & 6 deletions cli/cmd/publish/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ import (
)

type changedFlavor struct {
onDisk localFlavor
prevVersion string
addedFiles []file.Hash
modifiedFiles []file.Hash
removedFiles []file.Hash
onDisk localFlavor
prevVersion string
prevMinPlayers uint32
prevMaxPlayers uint32
addedFiles []file.Hash
modifiedFiles []file.Hash
removedFiles []file.Hash
}

type localFlavor struct {
Expand All @@ -53,6 +55,8 @@ type localFlavor struct {
path string
hash string
files []file.Hash
minPlayers uint32
maxPlayers uint32
}

type deletedFlavor struct {
Expand Down Expand Up @@ -196,7 +200,8 @@ func NewCommand(ctx context.Context, cliCtx cli.Context) *cobra.Command {
len(plan.changedFlavors)+
len(plan.actionables)+
len(plan.deletedFlavors) == 0 &&
!plan.updateThumbnail {
!plan.updateThumbnail &&
!plan.minOrMaxPlayersChanged {
fmt.Println("Nothing to publish.")
return nil
}
Expand Down
4 changes: 4 additions & 0 deletions cli/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ type Flavor struct {
Version string `json:"version"`
MinecraftVersion string `json:"minecraftVersion"`
Path string `json:"path"`
MinPlayers int `json:"minPlayers"`
MaxPlayers int `json:"maxPlayers"`
}

var schemaV1Alpha1 = zog.Struct(zog.Shape{
Expand All @@ -42,6 +44,8 @@ var schemaV1Alpha1 = zog.Struct(zog.Shape{
"version": zog.String().Required(),
"minecraftVersion": zog.String().Required(),
"path": zog.String().Required(),
"minPlayers": zog.Int().GTE(1).Required(),
"maxPlayers": zog.Int().GTE(1).Required(),
})),
}),
})
Expand Down