mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-19 18:41:00 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
1c9594be8e
@ -24,6 +24,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/siyuan-note/filelock"
|
"github.com/siyuan-note/filelock"
|
||||||
|
"github.com/siyuan-note/logging"
|
||||||
"github.com/siyuan-note/siyuan/kernel/cache"
|
"github.com/siyuan-note/siyuan/kernel/cache"
|
||||||
"github.com/siyuan-note/siyuan/kernel/job"
|
"github.com/siyuan-note/siyuan/kernel/job"
|
||||||
"github.com/siyuan-note/siyuan/kernel/model"
|
"github.com/siyuan-note/siyuan/kernel/model"
|
||||||
@ -89,6 +90,15 @@ func GetCurrentWorkspacePath() string {
|
|||||||
return util.WorkspaceDir
|
return util.WorkspaceDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetAssetAbsPath(asset string) (ret string) {
|
||||||
|
ret, err := model.GetAssetAbsPath(asset)
|
||||||
|
if nil != err {
|
||||||
|
logging.LogErrorf("get asset [%s] abs path failed: %s", asset, err)
|
||||||
|
ret = asset
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func SetTimezone(container, appDir, timezoneID string) {
|
func SetTimezone(container, appDir, timezoneID string) {
|
||||||
if "ios" == container {
|
if "ios" == container {
|
||||||
os.Setenv("ZONEINFO", filepath.Join(appDir, "app", "zoneinfo.zip"))
|
os.Setenv("ZONEINFO", filepath.Join(appDir, "app", "zoneinfo.zip"))
|
||||||
|
Loading…
Reference in New Issue
Block a user