1
0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 03:23:49 +08:00

style: remove init func in main.

This commit is contained in:
wdvxdr 2021-07-28 19:21:25 +08:00
parent d705dd0617
commit 0be4c79d2c
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
2 changed files with 34 additions and 55 deletions

View File

@ -30,16 +30,16 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
if !j.Exists() { if !j.Exists() {
return defaultVal return defaultVal
} }
if j.Type == gjson.True { switch j.Type {
case gjson.True:
return true return true
} case gjson.False:
if j.Type == gjson.False {
return false return false
} case gjson.String:
if j.Type != gjson.String { str = j.Str
default:
return defaultVal return defaultVal
} }
str = j.Str
} else if s, ok := p.(string); ok { } else if s, ok := p.(string); ok {
str = s str = s
} }

77
main.go
View File

@ -39,11 +39,6 @@ import (
var ( var (
conf *config.Config conf *config.Config
isFastStart = false isFastStart = false
c string
d bool
h bool
wd string // reset work dir
// PasswordHash 存储QQ密码哈希供登录使用 // PasswordHash 存储QQ密码哈希供登录使用
PasswordHash [16]byte PasswordHash [16]byte
@ -60,44 +55,37 @@ var (
} }
) )
func init() { func main() {
var debug bool c := flag.String("c", config.DefaultConfigFile, "configuration filename default is config.hjson")
flag.StringVar(&c, "c", config.DefaultConfigFile, "configuration filename default is config.hjson") d := flag.Bool("d", false, "running as a daemon")
flag.BoolVar(&d, "d", false, "running as a daemon") h := flag.Bool("h", false, "this help")
flag.BoolVar(&debug, "D", false, "debug mode") wd := flag.String("w", "", "cover the working directory")
flag.BoolVar(&h, "h", false, "this help") debug := flag.Bool("D", false, "debug mode")
flag.StringVar(&wd, "w", "", "cover the working directory")
flag.Parse() flag.Parse()
// 通过-c 参数替换 配置文件路径 switch {
config.DefaultConfigFile = c case *h:
help()
case *d:
server.Daemon()
case *wd != "":
resetWorkDir(*wd)
}
// 通过-c 参数替换 配置文件路径
config.DefaultConfigFile = *c
conf = config.Get() conf = config.Get()
if debug { if *debug {
conf.Output.Debug = true conf.Output.Debug = true
} }
// 在debug模式下,将在标准输出中打印当前执行行数
if conf.Output.Debug { if conf.Output.Debug {
log.SetReportCaller(true) log.SetReportCaller(true)
} }
}
func main() {
if h {
help()
}
if d {
server.Daemon()
}
if wd != "" {
resetWorkDir()
}
logFormatter := &easy.Formatter{ logFormatter := &easy.Formatter{
TimestampFormat: "2006-01-02 15:04:05", TimestampFormat: "2006-01-02 15:04:05",
LogFormat: "[%time%] [%lvl%]: %msg% \n", LogFormat: "[%time%] [%lvl%]: %msg% \n",
} }
rotateOptions := []rotatelogs.Option{ rotateOptions := []rotatelogs.Option{
rotatelogs.WithRotationTime(time.Hour * 24), rotatelogs.WithRotationTime(time.Hour * 24),
} }
@ -117,26 +105,17 @@ func main() {
log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.Output.LogLevel)...)) log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.Output.LogLevel)...))
if !global.PathExists(global.ImagePath) { mkCacheDir := func(path string, _type string) {
if err := os.MkdirAll(global.ImagePath, 0o755); err != nil { if !global.PathExists(path) {
log.Fatalf("创建图片缓存文件夹失败: %v", err) if err := os.MkdirAll(path, 0o755); err != nil {
} log.Fatalf("创建%s缓存文件夹失败: %v", _type, err)
} }
if !global.PathExists(global.VoicePath) {
if err := os.MkdirAll(global.VoicePath, 0o755); err != nil {
log.Fatalf("创建语音缓存文件夹失败: %v", err)
}
}
if !global.PathExists(global.VideoPath) {
if err := os.MkdirAll(global.VideoPath, 0o755); err != nil {
log.Fatalf("创建视频缓存文件夹失败: %v", err)
}
}
if !global.PathExists(global.CachePath) {
if err := os.MkdirAll(global.CachePath, 0o755); err != nil {
log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
} }
} }
mkCacheDir(global.ImagePath, "图片")
mkCacheDir(global.VoicePath, "语音")
mkCacheDir(global.VideoPath, "视频")
mkCacheDir(global.CachePath, "发送图片")
var byteKey []byte var byteKey []byte
arg := os.Args arg := os.Args
@ -269,7 +248,7 @@ func main() {
isTokenLogin := false isTokenLogin := false
saveToken := func() { saveToken := func() {
AccountToken = cli.GenToken() AccountToken = cli.GenToken()
_ = ioutil.WriteFile("session.token", AccountToken, 0o677) _ = ioutil.WriteFile("session.token", AccountToken, 0o644)
} }
if global.PathExists("session.token") { if global.PathExists("session.token") {
token, err := ioutil.ReadFile("session.token") token, err := ioutil.ReadFile("session.token")
@ -614,7 +593,7 @@ Options:
os.Exit(0) os.Exit(0)
} }
func resetWorkDir() { func resetWorkDir(wd string) {
args := make([]string, 0, len(os.Args)) args := make([]string, 0, len(os.Args))
for i := 1; i < len(os.Args); i++ { for i := 1; i < len(os.Args); i++ {
if os.Args[i] == "-w" { if os.Args[i] == "-w" {