aiden
/
synctv
mirror of https://github.com/synctv-org/synctv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Feat: add setting cmd

Browse Source
pull/21/head
zijiren233 1 year ago
parent ff6d2faa9f
commit 6d7ad91f13
13 changed files with 247 additions and 110 deletions
Show Stats Download Patch File Download Diff File

2
cmd/root.go
Unescape Escape View File

@ -9,6 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/synctv-org/synctv/cmd/admin"
"github.com/synctv-org/synctv/cmd/flags"
"github.com/synctv-org/synctv/cmd/setting"
"github.com/synctv-org/synctv/cmd/user"
"github.com/synctv-org/synctv/internal/version"
)
@ -44,4 +45,5 @@ func init() {
func init() {
RootCmd.AddCommand(admin.AdminCmd)
RootCmd.AddCommand(user.UserCmd)
RootCmd.AddCommand(setting.SettingCmd)
}

47
cmd/setting/fix.go
Unescape Escape View File

@ -0,0 +1,47 @@
package setting
import (
"fmt"
"github.com/spf13/cobra"
"github.com/synctv-org/synctv/internal/bootstrap"
"github.com/synctv-org/synctv/internal/settings"
)
var FixCmd = &cobra.Command{
Use: "fix",
Short: "fix setting",
Long: `fix setting`,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
return bootstrap.New(bootstrap.WithContext(cmd.Context())).Add(
bootstrap.InitDiscardLog,
bootstrap.InitConfig,
bootstrap.InitDatabase,
bootstrap.InitSetting,
).Run()
},
RunE: func(cmd *cobra.Command, args []string) error {
count := 0
errorCount := 0
for k, s := range settings.Settings {
_, err := s.Interface()
if err != nil {
fmt.Printf("setting %s, interface error: %v\n", k, err)
err = s.SetString(s.DefaultString())
if err != nil {
errorCount++
fmt.Printf("setting %s fix error: %v\n", k, err)
} else {
count++
fmt.Printf("setting %s fix success\n", k)
}
}
}
fmt.Printf("fix success: %d, fix error: %d\n", count, errorCount)
return nil
},
}
func init() {
SettingCmd.AddCommand(FixCmd)
}

9
cmd/setting/setting.go
Unescape Escape View File

@ -0,0 +1,9 @@
package setting
import "github.com/spf13/cobra"
var SettingCmd = &cobra.Command{
Use: "setting",
Short: "setting",
Long: `you must first shut down the server, otherwise the changes will not take effect.`,
}

47
cmd/setting/show.go
Unescape Escape View File

@ -0,0 +1,47 @@
package setting
import (
"fmt"
"os"
"github.com/spf13/cobra"
"github.com/synctv-org/synctv/internal/bootstrap"
"github.com/synctv-org/synctv/internal/model"
"github.com/synctv-org/synctv/internal/settings"
"gopkg.in/yaml.v3"
)
var ShowCmd = &cobra.Command{
Use: "show",
Short: "show setting",
Long: `show setting`,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
return bootstrap.New(bootstrap.WithContext(cmd.Context())).Add(
bootstrap.InitDiscardLog,
bootstrap.InitConfig,
bootstrap.InitDatabase,
bootstrap.InitSetting,
).Run()
},
RunE: func(cmd *cobra.Command, args []string) error {
m := make(map[model.SettingGroup]map[string]any)
for g, s := range settings.GroupSettings {
if _, ok := m[g]; !ok {
m[g] = make(map[string]any)
}
for _, v := range s {
i, err := v.Interface()
if err != nil {
fmt.Printf("parse setting %s error: %v\ntry to fix setting\n", v.Name(), err)
return nil
}
m[g][v.Name()] = i
}
}
return yaml.NewEncoder(os.Stdout).Encode(m)
},
}
func init() {
SettingCmd.AddCommand(ShowCmd)
}

4
internal/bootstrap/setting.go
Unescape Escape View File

@ -3,9 +3,9 @@ package bootstrap
import (
"context"
"github.com/synctv-org/synctv/internal/setting"
"github.com/synctv-org/synctv/internal/settings"
)
func InitSetting(ctx context.Context) error {
return setting.Init()
return settings.Init()
}

4
internal/model/setting.go
Unescape Escape View File

@ -11,6 +11,10 @@ const (
type SettingGroup string
func (s SettingGroup) String() string {
return string(s)
}
const (
SettingGroupRoom SettingGroup = "room"
SettingGroupUser SettingGroup = "user"

90
internal/setting/bool.go
Unescape Escape View File

@ -1,90 +0,0 @@
package setting
import (
log "github.com/sirupsen/logrus"
"github.com/synctv-org/synctv/internal/db"
"github.com/synctv-org/synctv/internal/model"
)
type BoolSetting interface {
Setting
Set(bool) error
Get() (bool, error)
}
type Bool struct {
name string
value string
group model.SettingGroup
}
func NewBool(name, value string, group model.SettingGroup) *Bool {
return &Bool{
name: name,
value: value,
group: group,
}
}
func (b *Bool) Name() string {
return b.name
}
func (b *Bool) InitRaw(s string) {
if b.value == s {
return
}
b.value = s
}
func (b *Bool) Set(value bool) error {
if value {
if b.value == "1" {
return nil
}
b.value = "1"
} else {
if b.value == "0" {
return nil
}
b.value = "0"
}
return db.UpdateSettingItemValue(b.name, b.value)
}
func (b *Bool) Get() (bool, error) {
return b.value == "1", nil
}
func (b *Bool) Raw() string {
return b.value
}
func (b *Bool) Type() model.SettingType {
return model.SettingTypeBool
}
func (b *Bool) Group() model.SettingGroup {
return b.group
}
func (b *Bool) Interface() (any, error) {
return b.Get()
}
func newBoolSetting(k, v string, g model.SettingGroup) BoolSetting {
if Settings == nil {
Settings = make(map[string]Setting)
}
if GroupsSetting == nil {
GroupsSetting = make(map[model.SettingGroup][]Setting)
}
_, loaded := Settings[k]
if loaded {
log.Fatalf("setting %s already exists", k)
}
b := NewBool(k, v, g)
Settings[k] = b
GroupsSetting[g] = append(GroupsSetting[g], b)
return b
}

7
internal/setting/var.go
Unescape Escape View File

@ -1,7 +0,0 @@
package setting
import "github.com/synctv-org/synctv/internal/model"
var (
DisableCreateRoom = newBoolSetting("disable_create_room", "0", model.SettingGroupRoom)
)

115
internal/settings/bool.go
Unescape Escape View File

@ -0,0 +1,115 @@
package settings
import (
log "github.com/sirupsen/logrus"
"github.com/synctv-org/synctv/internal/db"
"github.com/synctv-org/synctv/internal/model"
)
type BoolSetting interface {
Setting
Set(bool) error
Get() (bool, error)
Default() bool
}
type Bool struct {
name string
value string
defaultValue bool
group model.SettingGroup
}
func NewBool(name string, value bool, group model.SettingGroup) *Bool {
b := &Bool{
name: name,
group: group,
defaultValue: value,
}
if value {
b.value = "1"
} else {
b.value = "0"
}
return b
}
func (b *Bool) Name() string {
return b.name
}
func (b *Bool) Init(s string) {
if b.value == s {
return
}
b.value = s
}
func (b *Bool) Default() bool {
return b.defaultValue
}
func (b *Bool) DefaultString() string {
if b.defaultValue {
return "1"
} else {
return "0"
}
}
func (b *Bool) DefaultInterface() any {
return b.Default()
}
func (b *Bool) SetString(value string) error {
if b.value == value {
return nil
}
b.value = value
return db.UpdateSettingItemValue(b.name, value)
}
func (b *Bool) Set(value bool) error {
if value {
return b.SetString("1")
} else {
return b.SetString("0")
}
}
func (b *Bool) Get() (bool, error) {
return b.value == "1", nil
}
func (b *Bool) String() string {
return b.value
}
func (b *Bool) Type() model.SettingType {
return model.SettingTypeBool
}
func (b *Bool) Group() model.SettingGroup {
return b.group
}
func (b *Bool) Interface() (any, error) {
return b.Get()
}
func newBoolSetting(k string, v bool, g model.SettingGroup) BoolSetting {
if Settings == nil {
Settings = make(map[string]Setting)
}
if GroupSettings == nil {
GroupSettings = make(map[model.SettingGroup][]Setting)
}
_, loaded := Settings[k]
if loaded {
log.Fatalf("setting %s already exists", k)
}
b := NewBool(k, v, g)
Settings[k] = b
GroupSettings[g] = append(GroupSettings[g], b)
return b
}

15
internal/setting/setting.go → internal/settings/setting.go
Unescape Escape View File

@ -1,4 +1,4 @@
package setting
package settings
import (
"fmt"
@ -10,15 +10,18 @@ import (
var (
Settings map[string]Setting
GroupsSetting map[model.SettingGroup][]Setting
GroupSettings map[model.SettingGroup][]Setting
)
type Setting interface {
Name() string
InitRaw(string)
Raw() string
Type() model.SettingType
Group() model.SettingGroup
Init(string)
String() string
SetString(string) error
DefaultString() string
DefaultInterface() any
Interface() (any, error)
}
@ -112,7 +115,7 @@ func initSettings(i ...Setting) error {
for _, b := range i {
s := &model.Setting{
Name: b.Name(),
Value: b.Raw(),
Value: b.String(),
Type: b.Type(),
Group: b.Group(),
}
@ -120,7 +123,7 @@ func initSettings(i ...Setting) error {
if err != nil {
return err
}
b.InitRaw(s.Value)
b.Init(s.Value)
}
return nil
}

7
internal/settings/var.go
Unescape Escape View File

@ -0,0 +1,7 @@
package settings
import "github.com/synctv-org/synctv/internal/model"
var (
DisableCreateRoom = newBoolSetting("disable_create_room", false, model.SettingGroupRoom)
)

6
server/handlers/admin.go
Unescape Escape View File

@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
dbModel "github.com/synctv-org/synctv/internal/model"
"github.com/synctv-org/synctv/internal/op"
"github.com/synctv-org/synctv/internal/setting"
"github.com/synctv-org/synctv/internal/settings"
"github.com/synctv-org/synctv/server/model"
)
@ -20,7 +20,7 @@ func EditAdminSettings(ctx *gin.Context) {
}
for k, v := range req {
err := setting.SetValue(k, v)
err := settings.SetValue(k, v)
if err != nil {
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
return
@ -38,7 +38,7 @@ func AdminSettings(ctx *gin.Context) {
return
}
s, ok := setting.GroupsSetting[dbModel.SettingGroup(group)]
s, ok := settings.GroupSettings[dbModel.SettingGroup(group)]
if !ok {
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("group not found"))
return

4
server/handlers/room.go
Unescape Escape View File

@ -9,7 +9,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/synctv-org/synctv/internal/db"
"github.com/synctv-org/synctv/internal/op"
"github.com/synctv-org/synctv/internal/setting"
"github.com/synctv-org/synctv/internal/settings"
"github.com/synctv-org/synctv/server/middlewares"
"github.com/synctv-org/synctv/server/model"
"github.com/synctv-org/synctv/utils"
@ -32,7 +32,7 @@ func (e FormatErrNotSupportPosition) Error() string {
func CreateRoom(ctx *gin.Context) {
user := ctx.MustGet("user").(*op.User)
v, err := setting.DisableCreateRoom.Get()
v, err := settings.DisableCreateRoom.Get()
if err != nil {
ctx.AbortWithStatusJSON(http.StatusInternalServerError, model.NewApiErrorResp(err))
return

Write Preview
Loading…
Cancel
Save