self-hosted/CasaOS
1
0
Fork 0
mirror of https://github.com/IceWhaleTech/CasaOS.git synced 2025-07-12 23:50:14 +02:00
Code Issues Releases Activity

remove /DATA directory initialization - moved to local-storage (#578)

Browse Source
This commit is contained in:
Tiger Wang
2022-09-28 11:14:19 -04:00
parent f0448cd1b9
commit 455d226dcd
3 changed files with 26 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/migration-tool/main.go
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)
} }

30
main.go
View File

@ -28,9 +28,11 @@ const LOCALHOST = "127.0.0.1"
var sqliteDB *gorm.DB var sqliteDB *gorm.DB
var configFlag = flag.String("c", "", "config address") var (
var dbFlag = flag.String("db", "", "db path") configFlag = flag.String("c", "", "config address")
var versionFlag = flag.Bool("v", false, "version") dbFlag = flag.String("db", "", "db path")
versionFlag = flag.Bool("v", false, "version")
)
func init() { func init() {
flag.Parse() flag.Parse()
@ -39,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 {
@ -47,7 +48,7 @@ func init() {
} }
sqliteDB = sqlite.GetDb(*dbFlag) sqliteDB = sqlite.GetDb(*dbFlag)
//gredis.GetRedisConn(config.RedisInfo), // gredis.GetRedisConn(config.RedisInfo),
service.MyService = service.NewService(sqliteDB, config.CommonInfo.RuntimePath) service.MyService = service.NewService(sqliteDB, config.CommonInfo.RuntimePath)
@ -60,7 +61,6 @@ func init() {
// go service.LoopFriend() // go service.LoopFriend()
// go service.MyService.App().CheckNewImage() // go service.MyService.App().CheckNewImage()
} }
// @title casaOS API // @title casaOS API
@ -80,21 +80,21 @@ func main() {
return return
} }
go route.SocketInit(service.NotifyMsg) go route.SocketInit(service.NotifyMsg)
//model.Setup() // model.Setup()
//gredis.Setup() // gredis.Setup()
r := route.InitRouter() r := route.InitRouter()
//service.SyncTask(sqliteDB) // service.SyncTask(sqliteDB)
cron2 := cron.New() cron2 := cron.New()
//every day execution // every day execution
err := cron2.AddFunc("0/5 * * * * *", func() { err := cron2.AddFunc("0/5 * * * * *", func() {
if service.ClientCount > 0 { if service.ClientCount > 0 {
//route.SendNetINfoBySocket() // route.SendNetINfoBySocket()
//route.SendCPUBySocket() // route.SendCPUBySocket()
//route.SendMemBySocket() // route.SendMemBySocket()
// route.SendDiskBySocket() // route.SendDiskBySocket()
//route.SendUSBBySocket() // route.SendUSBBySocket()
route.SendAllHardwareStatusBySocket() route.SendAllHardwareStatusBySocket()
} }
}) })
@ -123,7 +123,7 @@ func main() {
} }
go func() { go func() {
time.Sleep(time.Second * 2) time.Sleep(time.Second * 2)
//v0.3.6 // v0.3.6
if config.ServerInfo.HttpPort != "" { if config.ServerInfo.HttpPort != "" {
changePort := common.ChangePortRequest{} changePort := common.ChangePortRequest{}
changePort.Port = config.ServerInfo.HttpPort changePort.Port = config.ServerInfo.HttpPort

32
pkg/config/update.go
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()
}