Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 操作系统平台版本信息

Browse source
This commit is contained in:
Liang Ding 2023-03-25 17:23:22 +08:00
parent 5caf532fd6
commit 7b87dcf0f6
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/conf.go
View file

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

6
kernel/util/os.go
View file

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

2
kernel/util/os_mobile.go
View file

@ -18,7 +18,7 @@
package util package util
func GetOSPlatform() (plat, ver string) { func GetOSPlatform() (plat string) {
if ContainerIOS == Container { if ContainerIOS == Container {
return "iOS " + MobileOSVer return "iOS " + MobileOSVer
} }

8
kernel/util/runtime.go
View file

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