Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2024-05-23 23:00:21 +08:00
commit 59469337a9
9 changed files with 82 additions and 0 deletions

View file

@ -1,4 +1,7 @@
{
"copyMirror": "Copy mirror",
"duplicateMirror": "Duplicate mirror",
"duplicateCompletely": "Duplicate completely",
"isMsStoreVerTip": "The currently used version is the Microsoft Store version, please check for updates in the Microsoft Store",
"andSubFile": "Are you sure you want to delete <b>${x}</b> and its ${y} subdocs?",
"confirmDeleteTip": "Are you sure to delete <b>${x}</b>?",

View file

@ -1,4 +1,7 @@
{
"copyMirror": "Copiar espejo",
"duplicateMirror": "Espejo duplicado",
"duplicateCompletely": "Duplicar completamente",
"isMsStoreVerTip": "La versión utilizada actualmente es la versión de Microsoft Store, verifique si hay actualizaciones en Microsoft Store",
"andSubFile": "¿Está seguro de que desea eliminar <b>${x}</b> y sus subdocumentos ${y}?",
"confirmDeleteTip": "¿Está seguro de eliminar <b>${x}</b>?",

View file

@ -1,4 +1,7 @@
{
"copyMirror": "Copier le miroir",
"duplicateMirror": "Miroir en double",
"duplicateCompletely": "Dupliquer complètement",
"isMsStoreVerTip": "La version actuellement utilisée est la version du Microsoft Store, veuillez vérifier les mises à jour dans le Microsoft Store",
"andSubFile": "Êtes-vous sûr de vouloir supprimer <b>${x}</b> et ses sous-documents ${y} ?",
"confirmDeleteTip": "Êtes-vous sûr de supprimer <b>${x}</b> ?",

View file

@ -1,4 +1,7 @@
{
"copyMirror": "ミラーをコピー",
"duplicateMirror": "ミラーの複製",
"duplicateCompletely": "完全に複製します",
"isMsStoreVerTip": "現在使用されているバージョンは Microsoft Store バージョンです。Microsoft Store で更新プログラムを確認してください",
"andSubFile": "<b>${x}</b> とそのサブドキュメント ${y} を削除してもよろしいですか?",
"confirmDeleteTip": "<b>${x}</b> を削除してもよろしいですか?",

View file

@ -1,4 +1,7 @@
{
"copyMirror": "複製鏡像",
"duplicateMirror": "複製為鏡像副本",
"duplicateCompletely": "複製為完整副本",
"isMsStoreVerTip": "目前使用的版本為 Microsoft Store 版本,請在 Microsoft Store 中檢查更新",
"andSubFile": "決定刪除 <b>${x}</b> 及其 ${y} 個子文件嗎?",
"confirmDeleteTip": "確定刪除<b>${x}</b> 嗎?",

View file

@ -1,4 +1,7 @@
{
"copyMirror": "复制镜像",
"duplicateMirror": "复制为镜像副本",
"duplicateCompletely": "复制为完整副本",
"isMsStoreVerTip": "当前使用的版本为微软商店版,请在微软商店中检查更新",
"andSubFile": "确定删除 <b>${x}</b> 及其 ${y} 个子文档吗?",
"confirmDeleteTip": "确定删除 <b>${x}</b> 吗?",

View file

@ -27,6 +27,29 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func duplicateAttributeViewBlock(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
avID := arg["avID"].(string)
newAvID, newBlockID, err := model.DuplicateDatabaseBlock(avID)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
ret.Data = map[string]interface{}{
"avID": newAvID,
"blockID": newBlockID,
}
}
func getAttributeViewKeysByAvID(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)

View file

@ -425,6 +425,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/av/setDatabaseBlockView", model.CheckAuth, model.CheckReadonly, setDatabaseBlockView)
ginServer.Handle("POST", "/api/av/getMirrorDatabaseBlocks", model.CheckAuth, model.CheckReadonly, getMirrorDatabaseBlocks)
ginServer.Handle("POST", "/api/av/getAttributeViewKeysByAvID", model.CheckAuth, model.CheckReadonly, getAttributeViewKeysByAvID)
ginServer.Handle("POST", "/api/av/duplicateAttributeViewBlock", model.CheckAuth, model.CheckReadonly, duplicateAttributeViewBlock)
ginServer.Handle("POST", "/api/ai/chatGPT", model.CheckAuth, chatGPT)
ginServer.Handle("POST", "/api/ai/chatGPTWithAction", model.CheckAuth, chatGPTWithAction)

View file

@ -41,6 +41,46 @@ import (
"github.com/xrash/smetrics"
)
func DuplicateDatabaseBlock(avID string) (newAvID, newBlockID string, err error) {
storageAvDir := filepath.Join(util.DataDir, "storage", "av")
oldAvPath := filepath.Join(storageAvDir, avID+".json")
newAvID, newBlockID = ast.NewNodeID(), ast.NewNodeID()
oldAv, err := av.ParseAttributeView(avID)
if nil != err {
return
}
data, err := filelock.ReadFile(oldAvPath)
if nil != err {
logging.LogErrorf("read attribute view [%s] failed: %s", avID, err)
return
}
data = bytes.ReplaceAll(data, []byte(avID), []byte(newAvID))
av.UpsertBlockRel(newAvID, newBlockID)
newAv := &av.AttributeView{}
if err = gulu.JSON.UnmarshalJSON(data, newAv); nil != err {
logging.LogErrorf("unmarshal attribute view [%s] failed: %s", newAvID, err)
return
}
newAv.Name = oldAv.Name + " (Duplicated " + time.Now().Format("2006-01-02 15:04:05") + ")"
data, err = gulu.JSON.MarshalJSON(newAv)
if nil != err {
logging.LogErrorf("marshal attribute view [%s] failed: %s", newAvID, err)
return
}
newAvPath := filepath.Join(storageAvDir, newAvID+".json")
if err = filelock.WriteFile(newAvPath, data); nil != err {
logging.LogErrorf("write attribute view [%s] failed: %s", newAvID, err)
return
}
return
}
func GetAttributeViewKeysByAvID(avID string) (ret []*av.Key) {
ret = []*av.Key{}