Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-01 06:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 记录操作系统平台

Browse source
This commit is contained in:
Liang Ding 2023-02-10 21:45:21 +08:00
parent 2a4fc32e50
commit 08641595ae
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/conf.go
View file

@ -236,7 +236,7 @@ func InitConf() {
logging.LogInfof("using Microsoft Store edition")
}
Conf.System.OS = runtime.GOOS
Conf.System.OSPlatform = util.GetOSPlatform()
Conf.System.OSPlatform, _ = util.GetOSPlatform()
Conf.Newbie = util.IsNewbie
if "" != Conf.UserData {

6
kernel/util/os.go
View file

@ -23,11 +23,11 @@ import (
"github.com/siyuan-note/logging"
)
func GetOSPlatform() (ret string) {
ret, _, _, err := host.PlatformInformation()
func GetOSPlatform() (plat, ver string) {
plat, _, ver, err := host.PlatformInformation()
if nil != err {
logging.LogWarnf("get os platform failed: %s", err)
return "Unknown"
return "Unknown", ""
}
return
}

8
kernel/util/os_mobile.go
View file

@ -18,12 +18,12 @@
package util
func GetOSPlatform() (ret string) {
func GetOSPlatform() (plat, ver string) {
if ContainerIOS == Container {
return "iOS"
return "iOS", ""
}
if ContainerAndroid == Container {
return "Android"
return "Android", ""
}
return "Unknown"
return "Unknown", ""
}

7
kernel/util/runtime.go
View file

@ -46,6 +46,11 @@ const (
var IsExiting = false
func logBootInfo() {
plat, platVer := GetOSPlatform()
osInfo := plat
if "" != platVer {
osInfo += "/" + platVer
}
logging.LogInfof("kernel is booting:\n"+
" * ver [%s]\n"+
" * arch [%s]\n"+
@ -57,7 +62,7 @@ func logBootInfo() {
" * container [%s]\n"+
" * database [ver=%s]\n"+
" * workspace directory [%s]",
Ver, runtime.GOARCH, GetOSPlatform(), os.Getpid(), Mode, WorkingDir, ReadOnly, Container, DatabaseVer, WorkspaceDir)
Ver, runtime.GOARCH, osInfo, os.Getpid(), Mode, WorkingDir, ReadOnly, Container, DatabaseVer, WorkspaceDir)
}
func IsMutexLocked(m *sync.Mutex) bool {