This commit is contained in:
Tiger Wang 2022-09-23 12:34:14 -04:00
parent 6ba5420056
commit 730aee3591
3 changed files with 11 additions and 40 deletions

View File

@ -28,25 +28,29 @@ const (
casaosServiceName = "casaos.service" casaosServiceName = "casaos.service"
) )
var _logger *Logger var (
var sqliteDB *gorm.DB _logger *Logger
sqliteDB *gorm.DB
)
var configFlag = "" var (
var dbFlag = "" configFlag = ""
dbFlag = ""
)
func init() { func init() {
config.InitSetup(configFlag) config.InitSetup(configFlag)
config.UpdateSetup()
if len(dbFlag) == 0 { if len(dbFlag) == 0 {
dbFlag = config.AppInfo.DBPath + "/db" dbFlag = config.AppInfo.DBPath + "/db"
} }
sqliteDB = sqlite.GetDb(dbFlag) sqliteDB = sqlite.GetDb(dbFlag)
//gredis.GetRedisConn(config.RedisInfo), // gredis.GetRedisConn(config.RedisInfo),
service.MyService = service.NewService(sqliteDB, "") service.MyService = service.NewService(sqliteDB, "")
} }
func main() { func main() {
versionFlag := flag.Bool("v", false, "version") versionFlag := flag.Bool("v", false, "version")
debugFlag := flag.Bool("d", true, "debug") debugFlag := flag.Bool("d", true, "debug")
@ -113,6 +117,6 @@ func main() {
selectedMigrationTool.PostMigrate() selectedMigrationTool.PostMigrate()
_logger.Info("casaos migration ok") _logger.Info("casaos migration ok")
//panic(err) // panic(err)
} }

View File

@ -41,7 +41,6 @@ func init() {
return return
} }
config.InitSetup(*configFlag) config.InitSetup(*configFlag)
config.UpdateSetup()
loger.LogInit() loger.LogInit()
if len(*dbFlag) == 0 { if len(*dbFlag) == 0 {

View File

@ -1,32 +0,0 @@
package config
import (
"runtime"
"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
)
//检查目录是否存在
func mkdirDATAAll() {
sysType := runtime.GOOS
var dirArray []string
if sysType == "linux" {
dirArray = []string{"/DATA/AppData", "/DATA/Documents", "/DATA/Downloads", "/DATA/Gallery", "/DATA/Media/Movies", "/DATA/Media/TV Shows", "/DATA/Media/Music"}
}
if sysType == "windows" {
dirArray = []string{"C:\\CasaOS\\DATA\\AppData", "C:\\CasaOS\\DATA\\Documents", "C:\\CasaOS\\DATA\\Downloads", "C:\\CasaOS\\DATA\\Gallery", "C:\\CasaOS\\DATA\\Media/Movies", "C:\\CasaOS\\DATA\\Media\\TV Shows", "C:\\CasaOS\\DATA\\Media\\Music"}
}
if sysType == "darwin" {
dirArray = []string{"./CasaOS/DATA/AppData", "./CasaOS/DATA/Documents", "./CasaOS/DATA/Downloads", "./CasaOS/DATA/Gallery", "./CasaOS/DATA/Media/Movies", "./CasaOS/DATA/Media/TV Shows", "./CasaOS/DATA/Media/Music"}
}
for _, v := range dirArray {
file.IsNotExistMkDir(v)
}
}
func UpdateSetup() {
mkdirDATAAll()
}