Skip to content

Commit

Permalink
fix: version doesn't update
Browse files Browse the repository at this point in the history
  • Loading branch information
xhofe committed Dec 29, 2022
1 parent dad3012 commit f777a2f
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions internal/bootstrap/data/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/internal/model"
"github.com/alist-org/alist/v3/internal/op"
"github.com/alist-org/alist/v3/pkg/utils"
"github.com/alist-org/alist/v3/pkg/utils/random"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"gorm.io/gorm"
)

Expand All @@ -18,15 +18,15 @@ func initSettings() {
// check deprecated
settings, err := op.GetSettingItems()
if err != nil {
log.Fatalf("failed get settings: %+v", err)
utils.Log.Fatalf("failed get settings: %+v", err)
}

for i := range settings {
if !isActive(settings[i].Key) && settings[i].Flag != model.DEPRECATED {
settings[i].Flag = model.DEPRECATED
err = op.SaveSettingItem(&settings[i])
if err != nil {
log.Fatalf("failed save setting: %+v", err)
utils.Log.Fatalf("failed save setting: %+v", err)
}
}
}
Expand All @@ -37,24 +37,25 @@ func initSettings() {
// err
stored, err := op.GetSettingItemByKey(item.Key)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
log.Fatalf("failed get setting: %+v", err)
utils.Log.Fatalf("failed get setting: %+v", err)
continue
}

// save
if stored != nil {
if stored != nil && item.Key != conf.VERSION {
item.Value = stored.Value
}
if stored == nil || *item != *stored {
err = op.SaveSettingItem(item)
if err != nil {
log.Fatalf("failed save setting: %+v", err)
utils.Log.Fatalf("failed save setting: %+v", err)
}
} else {
// Not save so needs to execute hook
_, err = op.HandleSettingItemHook(item)
if err != nil {
utils.Log.Errorf("failed to execute hook on %s: %+v", item.Key, err)
}
continue
}

// Not save so needs to execute hook
op.HandleSettingItemHook(item)
}
}

Expand Down

0 comments on commit f777a2f

Please sign in to comment.