lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-21 11:27:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化Markdown导入

Browse Source
This commit is contained in:
Minho
2018-03-24 23:17:50 +08:00
parent 3c87a12bdd
commit f0ed6dd0d3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
models/BookModel.go
View File

@@ -505,9 +505,10 @@ func (book *Book)ImportBook(zipPath string) error {
parentId := 0 parentId := 0
parentIdentify := strings.Replace(strings.Trim(strings.TrimSuffix(strings.TrimPrefix(path, tempPath), info.Name()), "/"), "/", "-", -1) parentIdentify := strings.Replace(strings.Trim(strings.TrimSuffix(strings.TrimPrefix(path, tempPath),info.Name()), "/"), "/", "-", -1)
if parentIdentify != "" { if parentIdentify != "" {
if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, parentIdentify); !ok || err != nil { if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, parentIdentify); !ok || err != nil {
parentIdentify = "import-" + parentIdentify parentIdentify = "import-" + parentIdentify
} }
@@ -515,12 +516,17 @@ func (book *Book)ImportBook(zipPath string) error {
parentId = id parentId = id
} }
} }
if strings.EqualFold(info.Name(), "README.md") {
beego.Info(path,"|",info.Name(),"|",parentIdentify,"|",parentId)
}
isInsert := false isInsert := false
//如果当前文件是README.md，则将内容更新到父级 //如果当前文件是README.md，则将内容更新到父级
if strings.EqualFold(info.Name(), "README.md") && parentId != 0{ if strings.EqualFold(info.Name(), "README.md") && parentId != 0 {
doc.DocumentId = parentId doc.DocumentId = parentId
beego.Info(path,"|",parentId) //beego.Info(path,"|",parentId)
} else { } else {
//beego.Info(path,"|",parentIdentify)
doc.ParentId = parentId doc.ParentId = parentId
isInsert = true isInsert = true
} }
@@ -539,6 +545,7 @@ func (book *Book)ImportBook(zipPath string) error {
if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, identify); !ok || err != nil { if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, identify); !ok || err != nil {
identify = "import-" + identify identify = "import-" + identify
} }
parentDoc := NewDocument() parentDoc := NewDocument()
parentDoc.MemberId = book.MemberId parentDoc.MemberId = book.MemberId
@@ -548,7 +555,8 @@ func (book *Book)ImportBook(zipPath string) error {
parentDoc.DocumentName = "空白文档" parentDoc.DocumentName = "空白文档"
parentId := 0 parentId := 0
parentIdentify := strings.TrimSuffix(identify,info.Name())
parentIdentify := strings.TrimSuffix(identify, "-" + info.Name())
if id,ok := docMap[parentIdentify];ok { if id,ok := docMap[parentIdentify];ok {
parentId = id parentId = id
@@ -562,7 +570,7 @@ func (book *Book)ImportBook(zipPath string) error {
} }
docMap[identify] = parentDoc.DocumentId docMap[identify] = parentDoc.DocumentId
beego.Info(path,"|",parentDoc.DocumentId) beego.Info(path,"|",parentDoc.DocumentId,"|",identify,"|",info.Name(),"|",parentIdentify)
} }
} }