github-mirror/alist
2
0
Fork 0
mirror of https://github.com/AlistGo/alist.git synced 2025-06-07 02:54:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

chore: go fmt

Browse Source
This commit is contained in:
Noah Hsu
2022-08-03 14:26:59 +08:00
parent 721f18a7f4
commit b51e664543
41 changed files with 100 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
internal/bootstrap/config.go
View File

@ -1,12 +1,12 @@
package bootstrap
import (
conf2 "github.com/alist-org/alist/v3/internal/conf"
"io/ioutil"
"os"
"path/filepath"
"github.com/alist-org/alist/v3/cmd/args"
"github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/pkg/utils"
"github.com/caarlos0/env/v6"
log "github.com/sirupsen/logrus"
@ -20,8 +20,8 @@ func InitConfig() {
if err != nil {
log.Fatalf("failed to create config file: %+v", err)
}
conf2.Conf = conf2.DefaultConfig()
if !utils.WriteToJson(args.Config, conf2.Conf) {
conf.Conf = conf.DefaultConfig()
if !utils.WriteToJson(args.Config, conf.Conf) {
log.Fatalf("failed to create default config file")
}
} else {
@ -29,14 +29,14 @@ func InitConfig() {
if err != nil {
log.Fatalf("reading config file error:%s", err.Error())
}
conf2.Conf = conf2.DefaultConfig()
err = utils.Json.Unmarshal(configBytes, conf2.Conf)
conf.Conf = conf.DefaultConfig()
err = utils.Json.Unmarshal(configBytes, conf.Conf)
if err != nil {
log.Fatalf("load config error: %s", err.Error())
}
log.Debugf("config:%+v", conf2.Conf)
log.Debugf("config:%+v", conf.Conf)
// update config.json struct
confBody, err := utils.Json.MarshalIndent(conf2.Conf, "", " ")
confBody, err := utils.Json.MarshalIndent(conf.Conf, "", " ")
if err != nil {
log.Fatalf("marshal config error:%s", err.Error())
}
@ -45,28 +45,28 @@ func InitConfig() {
log.Fatalf("update config struct error: %s", err.Error())
}
}
if !conf2.Conf.Force {
if !conf.Conf.Force {
confFromEnv()
}
// convert abs path
var absPath string
var err error
if !filepath.IsAbs(conf2.Conf.TempDir) {
absPath, err = filepath.Abs(conf2.Conf.TempDir)
if !filepath.IsAbs(conf.Conf.TempDir) {
absPath, err = filepath.Abs(conf.Conf.TempDir)
if err != nil {
log.Fatalf("get abs path error: %s", err.Error())
}
}
conf2.Conf.TempDir = absPath
err = os.RemoveAll(filepath.Join(conf2.Conf.TempDir))
conf.Conf.TempDir = absPath
err = os.RemoveAll(filepath.Join(conf.Conf.TempDir))
if err != nil {
log.Errorln("failed delete temp file:", err)
}
err = os.MkdirAll(conf2.Conf.TempDir, 0700)
err = os.MkdirAll(conf.Conf.TempDir, 0700)
if err != nil {
log.Fatalf("create temp dir error: %s", err.Error())
}
log.Debugf("config: %+v", conf2.Conf)
log.Debugf("config: %+v", conf.Conf)
}
func confFromEnv() {
@ -75,7 +75,7 @@ func confFromEnv() {
prefix = ""
}
log.Infof("load config from env with prefix: %s", prefix)
if err := env.Parse(conf2.Conf, env.Options{
if err := env.Parse(conf.Conf, env.Options{
Prefix: prefix,
}); err != nil {
log.Fatalf("load config from env error: %s", err.Error())

1
internal/bootstrap/data/dev.go
View File

@ -2,6 +2,7 @@ package data
import (
"context"
"github.com/alist-org/alist/v3/cmd/args"
"github.com/alist-org/alist/v3/internal/db"
"github.com/alist-org/alist/v3/internal/message"

7
internal/bootstrap/db.go
View File

@ -2,6 +2,10 @@ package bootstrap
import (
"fmt"
stdlog "log"
"strings"
"time"
"github.com/alist-org/alist/v3/cmd/args"
"github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/internal/db"
@ -12,9 +16,6 @@ import (
"gorm.io/gorm"
"gorm.io/gorm/logger"
"gorm.io/gorm/schema"
stdlog "log"
"strings"
"time"
)
func InitDB() {

2
internal/bootstrap/log.go
View File

@ -1,11 +1,11 @@
package bootstrap
import (
"github.com/alist-org/alist/v3/internal/conf"
"log"
"time"
"github.com/alist-org/alist/v3/cmd/args"
"github.com/alist-org/alist/v3/internal/conf"
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
"github.com/sirupsen/logrus"
)