This commit is contained in:
Liang Ding 2022-07-15 10:52:02 +08:00
parent fafd4f8513
commit 075a6af7ad
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
5 changed files with 134 additions and 54 deletions

View file

@ -5,7 +5,7 @@
"id": "20200924100744-br924ar", "id": "20200924100744-br924ar",
"title": "Assets", "title": "Assets",
"type": "doc", "type": "doc",
"updated": "20220715092808" "updated": "20220715105117"
}, },
"Children": [ "Children": [
{ {
@ -625,7 +625,7 @@
"ListData": {}, "ListData": {},
"Properties": { "Properties": {
"id": "20220503122349-o26mvnq", "id": "20220503122349-o26mvnq",
"updated": "20220715092808" "updated": "20220715105117"
}, },
"Children": [ "Children": [
{ {
@ -650,23 +650,7 @@
"Children": [ "Children": [
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": "When deleting the notebook, in order to ensure that cross-notebook asset references work properly, the " "Data": "When deleting the notebook, in order to ensure that cross-notebook asset references work properly, the assets under the notebook will be copied to the global assets in batches"
},
{
"Type": "NodeText",
"Data": "assets"
},
{
"Type": "NodeText",
"Data": " under the notebook will be copied to the global "
},
{
"Type": "NodeText",
"Data": "assets"
},
{
"Type": "NodeText",
"Data": " in batches"
} }
] ]
} }
@ -694,19 +678,7 @@
"Children": [ "Children": [
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": "Does not support viewing notebook-level " "Data": "Does not support viewing notebook-level assets history in data history"
},
{
"Type": "NodeText",
"Data": "assets"
},
{
"Type": "NodeText",
"Data": " history in "
},
{
"Type": "NodeText",
"Data": "data history"
} }
] ]
} }
@ -721,7 +693,7 @@
}, },
"Properties": { "Properties": {
"id": "20220715092756-f5azf15", "id": "20220715092756-f5azf15",
"updated": "20220715092808" "updated": "20220715105117"
}, },
"Children": [ "Children": [
{ {
@ -729,7 +701,7 @@
"Type": "NodeParagraph", "Type": "NodeParagraph",
"Properties": { "Properties": {
"id": "20220715092756-4bzibji", "id": "20220715092756-4bzibji",
"updated": "20220715092808" "updated": "20220715105117"
}, },
"Children": [ "Children": [
{ {
@ -755,6 +727,34 @@
] ]
} }
] ]
},
{
"ID": "20220715105056-8d652vx",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220715105056-8d652vx",
"updated": "20220715105100"
},
"Children": [
{
"ID": "20220715105056-a6p3fg7",
"Type": "NodeParagraph",
"Properties": {
"id": "20220715105056-a6p3fg7",
"updated": "20220715105100"
},
"Children": [
{
"Type": "NodeText",
"Data": "Dose not support rename"
}
]
}
]
} }
] ]
} }

View file

@ -5,7 +5,7 @@
"id": "20200915214115-42b8zma", "id": "20200915214115-42b8zma",
"title": "资源文件", "title": "资源文件",
"type": "doc", "type": "doc",
"updated": "20220715092726" "updated": "20220715105016"
}, },
"Children": [ "Children": [
{ {
@ -547,7 +547,7 @@
"ListData": {}, "ListData": {},
"Properties": { "Properties": {
"id": "20220503121213-afjyt05", "id": "20220503121213-afjyt05",
"updated": "20220715092726" "updated": "20220715105016"
}, },
"Children": [ "Children": [
{ {
@ -572,7 +572,15 @@
"Children": [ "Children": [
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": "删除该笔记本时,为保证跨笔记本资源文件引用正常工作,该笔记本下的资源文件会被批量复制到全局 assets 中" "Data": "删除该笔记本时,为保证跨笔记本资源文件引用正常工作,该笔记本下的资源文件会被批量复制到全局 "
},
{
"Type": "NodeText",
"Data": "assets"
},
{
"Type": "NodeText",
"Data": " 中"
} }
] ]
} }
@ -661,6 +669,34 @@
] ]
} }
] ]
},
{
"ID": "20220715105014-5jfe0bz",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220715105014-5jfe0bz",
"updated": "20220715105016"
},
"Children": [
{
"ID": "20220715105014-3r1es71",
"Type": "NodeParagraph",
"Properties": {
"id": "20220715105014-3r1es71",
"updated": "20220715105016"
},
"Children": [
{
"Type": "NodeText",
"Data": "不支持重命名"
}
]
}
]
} }
] ]
} }

View file

@ -4,7 +4,7 @@
"Properties": { "Properties": {
"id": "20211226123038-4umgpxy", "id": "20211226123038-4umgpxy",
"title": "資料文件", "title": "資料文件",
"updated": "20220715092951" "updated": "20220715105038"
}, },
"Children": [ "Children": [
{ {
@ -554,7 +554,7 @@
"ListData": {}, "ListData": {},
"Properties": { "Properties": {
"id": "20220503122338-jmr7c2k", "id": "20220503122338-jmr7c2k",
"updated": "20220715092938" "updated": "20220715105038"
}, },
"Children": [ "Children": [
{ {
@ -579,7 +579,15 @@
"Children": [ "Children": [
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": "刪除該筆記本時,為保證跨筆記本資料文件引用正常工作,該筆記本下的資料文件會被批量複製到全局 assets 中" "Data": "刪除該筆記本時,為保證跨筆記本資料文件引用正常工作,該筆記本下的資料文件會被批量複製到全局 "
},
{
"Type": "NodeText",
"Data": "assets"
},
{
"Type": "NodeText",
"Data": " 中"
} }
] ]
} }
@ -607,7 +615,15 @@
"Children": [ "Children": [
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": "不支持在數據歷史中查看筆記本級資料文件歷史" "Data": "不支持在"
},
{
"Type": "NodeText",
"Data": "數據歷史"
},
{
"Type": "NodeText",
"Data": "中查看筆記本級資料文件歷史"
} }
] ]
} }
@ -660,6 +676,34 @@
] ]
} }
] ]
},
{
"ID": "20220715105038-bwu5wmg",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220715105038-bwu5wmg",
"updated": "20220715105038"
},
"Children": [
{
"ID": "20220715105038-mmy9v15",
"Type": "NodeParagraph",
"Properties": {
"id": "20220715105038-mmy9v15",
"updated": "20220715105038"
},
"Children": [
{
"Type": "NodeText",
"Data": "不支持重命名"
}
]
}
]
} }
] ]
} }

View file

@ -37,9 +37,9 @@ func renameAsset(c *gin.Context) {
return return
} }
oldName := arg["oldName"].(string) oldPath := arg["oldPath"].(string)
newName := arg["newName"].(string) newName := arg["newName"].(string)
model.RenameAsset(oldName, newName) model.RenameAsset(oldPath, newName)
} }
func getDocImageAssets(c *gin.Context) { func getDocImageAssets(c *gin.Context) {

View file

@ -444,7 +444,7 @@ func RemoveUnusedAsset(p string) (ret string) {
return return
} }
func RenameAsset(oldName, newName string) { func RenameAsset(oldPath, newName string) {
util.PushEndlessProgress(Conf.Language(110)) util.PushEndlessProgress(Conf.Language(110))
defer util.PushClearProgress() defer util.PushClearProgress()
@ -458,25 +458,25 @@ func RenameAsset(oldName, newName string) {
pages := pagedPaths(filepath.Join(util.DataDir, notebook.ID), 32) pages := pagedPaths(filepath.Join(util.DataDir, notebook.ID), 32)
for _, paths := range pages { for _, paths := range pages {
for _, treeAbsPath := range paths { for _, treeAbsPath := range paths {
data, err := filelock.NoLockFileRead(treeAbsPath) data, readErr := filelock.NoLockFileRead(treeAbsPath)
if nil != err { if nil != readErr {
util.LogErrorf("get data [path=%s] failed: %s", treeAbsPath, err) util.LogErrorf("get data [path=%s] failed: %s", treeAbsPath, readErr)
return return
} }
if !bytes.Contains(data, []byte(oldName)) { if !bytes.Contains(data, []byte(oldPath)) {
return return
} }
data = bytes.Replace(data, []byte(oldName), []byte(newName), -1) data = bytes.Replace(data, []byte(oldPath), []byte(newName), -1)
if err = filelock.NoLockFileWrite(treeAbsPath, data); nil != err { if writeErr := filelock.NoLockFileWrite(treeAbsPath, data); nil != writeErr {
util.LogErrorf("write data [path=%s] failed: %s", treeAbsPath, err) util.LogErrorf("write data [path=%s] failed: %s", treeAbsPath, writeErr)
return return
} }
tree, err := protyle.ParseJSONWithoutFix(luteEngine, data) tree, parseErr := protyle.ParseJSONWithoutFix(luteEngine, data)
if nil != err { if nil != parseErr {
util.LogErrorf("parse json to tree [%s] failed: %s", treeAbsPath, err) util.LogErrorf("parse json to tree [%s] failed: %s", treeAbsPath, parseErr)
return return
} }