update to 1.6.0 #4

Merged
paulbsd merged 4 commits from develop into master 2023-11-10 23:34:38 +01:00
Showing only changes of commit 8deaf69baf - Show all commits

View File

@ -44,27 +44,29 @@ func Initialize(ctx *context.Context, cfg *config.Config) (err error) {
log.Println("Syncing tables") log.Println("Syncing tables")
err = models.NewEngine(ctx, cfg) err = models.NewEngine(ctx, cfg)
migrate(cfg) if cfg.Switchs.Migrate {
migrate(cfg)
}
return return
} }
func migrate(cfg *config.Config) (err error) { func migrate(cfg *config.Config) (err error) {
var a []models.CfgSet var cfgsets []models.CfgSet
num, err := cfg.Db.FindAndCount(&a) num, err := cfg.Db.FindAndCount(&cfgsets)
fmt.Printf("%d sets found\n", num) fmt.Printf("%d sets found\n", num)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
} }
for _, i := range a { for _, cfgset := range cfgsets {
var r = i.Regex var reg = cfgset.Regex
r = strings.Trim(r, "()") reg = strings.Trim(reg, "()")
rs := strings.Split(r, "|") rs := strings.Split(reg, "|")
for _, v := range rs { for _, v := range rs {
if v != "" { if v != "" {
n := models.CfgExpr{ n := models.CfgExpr{
Expr: v, Expr: v,
Set: &i, Set: &cfgset,
} }
cfg.Db.Insert(&n) cfg.Db.Insert(&n)
} }