merge instead of overwrite capability

This commit is contained in:
Fran Jurmanović
2025-02-05 18:39:18 +01:00
parent 9118574203
commit f1d723e674
3 changed files with 12 additions and 0 deletions

View File

@@ -12,6 +12,7 @@ import (
"time"
"github.com/gofiber/fiber/v2"
"github.com/qjebbs/go-jsons"
"golang.org/x/text/encoding/unicode"
"golang.org/x/text/transform"
)
@@ -38,6 +39,7 @@ func NewConfigService(repository *repository.ConfigRepository, serverRepository
func (as ConfigService) UpdateConfig(ctx *fiber.Ctx, body *map[string]interface{}) (*model.Config, error) {
serverID, _ := ctx.ParamsInt("id")
configFile := ctx.Params("file")
merge := ctx.QueryBool("merge")
server := as.serverRepository.GetFirst(ctx.UserContext(), serverID)
@@ -63,6 +65,13 @@ func (as ConfigService) UpdateConfig(ctx *fiber.Ctx, body *map[string]interface{
return nil, err
}
if merge {
newData, err = jsons.Merge(oldDataUTF8, newData)
if err != nil {
return nil, err
}
}
newDataUTF16, err := EncodeUTF16LEBOM(newData)
if err != nil {
return nil, err