mindoc-org
/
mindoc
mirror of https://github.com/mindoc-org/mindoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1、实现压缩包的Markdown文件导入 

2、重命名文件
pull/244/head
Minho 2018-03-24 22:36:35 +08:00
parent 4d1a03998a
commit 3c87a12bdd
15 changed files with 187 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
controllers/account.go → controllers/AccountController.go
View File

0
controllers/base.go → controllers/BaseController.go
View File

25
controllers/book.go → controllers/BookController.go
View File

@ -518,6 +518,8 @@ func (c *BookController) Import() {
bookName := strings.TrimSpace(c.GetString("book_name")) bookName := strings.TrimSpace(c.GetString("book_name"))
identify := strings.TrimSpace(c.GetString("identify")) identify := strings.TrimSpace(c.GetString("identify"))
description := strings.TrimSpace(c.GetString("description", ""))
privatelyOwned, _ := strconv.Atoi(c.GetString("privately_owned"))
if bookName == "" { if bookName == "" {
c.JsonResult(6001, "项目名称不能为空") c.JsonResult(6001, "项目名称不能为空")
@ -535,8 +537,6 @@ func (c *BookController) Import() {
c.JsonResult(6004, "文档标识不能超过50字") c.JsonResult(6004, "文档标识不能超过50字")
} }
beego.Info(moreFile.Filename)
ext := filepath.Ext(moreFile.Filename) ext := filepath.Ext(moreFile.Filename)
if !strings.EqualFold(ext, ".zip") { if !strings.EqualFold(ext, ".zip") {
@ -551,7 +551,26 @@ func (c *BookController) Import() {
err = c.SaveToFile("import-file", tempPath) err = c.SaveToFile("import-file", tempPath)
go models.NewBook().ImportBook(tempPath) book := models.NewBook()
book.MemberId = c.Member.MemberId
book.Cover = conf.GetDefaultCover()
book.BookName = bookName
book.Description = description
book.CommentCount = 0
book.PrivatelyOwned = privatelyOwned
book.CommentStatus = "closed"
book.Identify = identify
book.DocCount = 0
book.MemberId = c.Member.MemberId
book.CommentCount = 0
book.Version = time.Now().Unix()
book.Editor = "markdown"
book.Theme = "default"
go book.ImportBook(tempPath)
c.JsonResult(0, "项目正在后台转换中，请稍后查看") c.JsonResult(0, "项目正在后台转换中，请稍后查看")
} }

0
controllers/book_member.go → controllers/BookMemberController.go
View File

0
controllers/document.go → controllers/DocumentController.go
View File

0
controllers/error.go → controllers/ErrorController.go
View File

0
controllers/home.go → controllers/HomeController.go
View File

0
controllers/label.go → controllers/LabelController.go
View File

0
controllers/manager.go → controllers/ManagerController.go
View File

14
controllers/search.go → controllers/SearchController.go
View File

@ -32,14 +32,14 @@ func (c *SearchController) Index() {
if keyword != "" { if keyword != "" {
c.Data["Keyword"] = keyword c.Data["Keyword"] = keyword
member_id := 0 memberId := 0
if c.Member != nil { if c.Member != nil {
member_id = c.Member.MemberId memberId = c.Member.MemberId
} }
search_result, totalCount, err := models.NewDocumentSearchResult().FindToPager(keyword, pageIndex, conf.PageSize, member_id) searchResult, totalCount, err := models.NewDocumentSearchResult().FindToPager(keyword, pageIndex, conf.PageSize, memberId)
if err != nil { if err != nil {
beego.Error(err) beego.Error("查询搜索结果失败 => ",err)
return return
} }
if totalCount > 0 { if totalCount > 0 {
@ -48,8 +48,8 @@ func (c *SearchController) Index() {
} else { } else {
c.Data["PageHtml"] = "" c.Data["PageHtml"] = ""
} }
if len(search_result) > 0 { if len(searchResult) > 0 {
for _, item := range search_result { for _, item := range searchResult {
item.DocumentName = strings.Replace(item.DocumentName, keyword, "<em>"+keyword+"</em>", -1) item.DocumentName = strings.Replace(item.DocumentName, keyword, "<em>"+keyword+"</em>", -1)
if item.Description != "" { if item.Description != "" {
@ -73,7 +73,7 @@ func (c *SearchController) Index() {
} }
} }
} }
c.Data["Lists"] = search_result c.Data["Lists"] = searchResult
} }
} }

0
controllers/setting.go → controllers/SettingController.go
View File

0
models/attachment.go → models/AttachmentModel.go
View File

218
models/book.go → models/BookModel.go
View File

@ -72,16 +72,16 @@ type Book struct {
} }
// TableName 获取对应数据库表名. // TableName 获取对应数据库表名.
func (m *Book) TableName() string { func (book *Book) TableName() string {
return "books" return "books"
} }
// TableEngine 获取数据使用的引擎. // TableEngine 获取数据使用的引擎.
func (m *Book) TableEngine() string { func (book *Book) TableEngine() string {
return "INNODB" return "INNODB"
} }
func (m *Book) TableNameWithPrefix() string { func (book *Book) TableNameWithPrefix() string {
return conf.GetDatabasePrefix() + m.TableName() return conf.GetDatabasePrefix() + book.TableName()
} }
func NewBook() *Book { func NewBook() *Book {
@ -89,21 +89,21 @@ func NewBook() *Book {
} }
//添加一个项目 //添加一个项目
func (m *Book) Insert() error { func (book *Book) Insert() error {
o := orm.NewOrm() o := orm.NewOrm()
// o.Begin() // o.Begin()
_, err := o.Insert(m) _, err := o.Insert(book)
if err == nil { if err == nil {
if m.Label != "" { if book.Label != "" {
NewLabel().InsertOrUpdateMulti(m.Label) NewLabel().InsertOrUpdateMulti(book.Label)
} }
relationship := NewRelationship() relationship := NewRelationship()
relationship.BookId = m.BookId relationship.BookId = book.BookId
relationship.RoleId = 0 relationship.RoleId = 0
relationship.MemberId = m.MemberId relationship.MemberId = book.MemberId
err = relationship.Insert() err = relationship.Insert()
if err != nil { if err != nil {
logs.Error("插入项目与用户关联 => ", err) logs.Error("插入项目与用户关联 => ", err)
@ -111,9 +111,9 @@ func (m *Book) Insert() error {
return err return err
} }
document := NewDocument() document := NewDocument()
document.BookId = m.BookId document.BookId = book.BookId
document.DocumentName = "空白文档" document.DocumentName = "空白文档"
document.MemberId = m.MemberId document.MemberId = book.MemberId
err = document.InsertOrUpdate() err = document.InsertOrUpdate()
if err != nil { if err != nil {
//o.Rollback() //o.Rollback()
@ -126,73 +126,73 @@ func (m *Book) Insert() error {
return err return err
} }
func (m *Book) Find(id int) (*Book, error) { func (book *Book) Find(id int) (*Book, error) {
if id <= 0 { if id <= 0 {
return m, ErrInvalidParameter return book, ErrInvalidParameter
} }
o := orm.NewOrm() o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", id).One(m) err := o.QueryTable(book.TableNameWithPrefix()).Filter("book_id", id).One(book)
return m, err return book, err
} }
//更新一个项目 //更新一个项目
func (m *Book) Update(cols ...string) error { func (book *Book) Update(cols ...string) error {
o := orm.NewOrm() o := orm.NewOrm()
temp := NewBook() temp := NewBook()
temp.BookId = m.BookId temp.BookId = book.BookId
if err := o.Read(temp); err != nil { if err := o.Read(temp); err != nil {
return err return err
} }
if m.Label != "" || temp.Label != ""{ if book.Label != "" || temp.Label != ""{
go NewLabel().InsertOrUpdateMulti(m.Label + "," + temp.Label) go NewLabel().InsertOrUpdateMulti(book.Label + "," + temp.Label)
} }
_, err := o.Update(m, cols...) _, err := o.Update(book, cols...)
return err return err
} }
//根据指定字段查询结果集. //根据指定字段查询结果集.
func (m *Book) FindByField(field string, value interface{}) ([]*Book, error) { func (book *Book) FindByField(field string, value interface{}) ([]*Book, error) {
o := orm.NewOrm() o := orm.NewOrm()
var books []*Book var books []*Book
_, err := o.QueryTable(m.TableNameWithPrefix()).Filter(field, value).All(&books) _, err := o.QueryTable(book.TableNameWithPrefix()).Filter(field, value).All(&books)
return books, err return books, err
} }
//根据指定字段查询一个结果. //根据指定字段查询一个结果.
func (m *Book) FindByFieldFirst(field string, value interface{}) (*Book, error) { func (book *Book) FindByFieldFirst(field string, value interface{}) (*Book, error) {
o := orm.NewOrm() o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter(field, value).One(m) err := o.QueryTable(book.TableNameWithPrefix()).Filter(field, value).One(book)
return m, err return book, err
} }
//根据项目标识查询项目 //根据项目标识查询项目
func (m *Book) FindByIdentify(identify string) (*Book, error) { func (book *Book) FindByIdentify(identify string) (*Book, error) {
o := orm.NewOrm() o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter("identify", identify).One(m) err := o.QueryTable(book.TableNameWithPrefix()).Filter("identify", identify).One(book)
return m, err return book, err
} }
//分页查询指定用户的项目 //分页查询指定用户的项目
func (m *Book) FindToPager(pageIndex, pageSize, memberId int) (books []*BookResult, totalCount int, err error) { func (book *Book) FindToPager(pageIndex, pageSize, memberId int) (books []*BookResult, totalCount int, err error) {
relationship := NewRelationship() relationship := NewRelationship()
o := orm.NewOrm() o := orm.NewOrm()
sql1 := "SELECT COUNT(book.book_id) AS total_count FROM " + m.TableNameWithPrefix() + " AS book LEFT JOIN " + sql1 := "SELECT COUNT(book.book_id) AS total_count FROM " + book.TableNameWithPrefix() + " AS book LEFT JOIN " +
relationship.TableNameWithPrefix() + " AS rel ON book.book_id=rel.book_id AND rel.member_id = ? WHERE rel.relationship_id > 0 " relationship.TableNameWithPrefix() + " AS rel ON book.book_id=rel.book_id AND rel.member_id = ? WHERE rel.relationship_id > 0 "
err = o.Raw(sql1, memberId).QueryRow(&totalCount) err = o.Raw(sql1, memberId).QueryRow(&totalCount)
@ -203,7 +203,7 @@ func (m *Book) FindToPager(pageIndex, pageSize, memberId int) (books []*BookResu
offset := (pageIndex - 1) * pageSize offset := (pageIndex - 1) * pageSize
sql2 := "SELECT book.*,rel.member_id,rel.role_id,m.account as create_name FROM " + m.TableNameWithPrefix() + " AS book" + sql2 := "SELECT book.*,rel.member_id,rel.role_id,m.account as create_name FROM " + book.TableNameWithPrefix() + " AS book" +
" LEFT JOIN " + relationship.TableNameWithPrefix() + " AS rel ON book.book_id=rel.book_id AND rel.member_id = ?" + " LEFT JOIN " + relationship.TableNameWithPrefix() + " AS rel ON book.book_id=rel.book_id AND rel.member_id = ?" +
" LEFT JOIN " + relationship.TableNameWithPrefix() + " AS rel1 ON book.book_id=rel1.book_id AND rel1.role_id=0" + " LEFT JOIN " + relationship.TableNameWithPrefix() + " AS rel1 ON book.book_id=rel1.book_id AND rel1.role_id=0" +
" LEFT JOIN " + NewMember().TableNameWithPrefix() + " AS m ON rel1.member_id=m.member_id " + " LEFT JOIN " + NewMember().TableNameWithPrefix() + " AS m ON rel1.member_id=m.member_id " +
@ -242,13 +242,13 @@ func (m *Book) FindToPager(pageIndex, pageSize, memberId int) (books []*BookResu
} }
// 彻底删除项目. // 彻底删除项目.
func (m *Book) ThoroughDeleteBook(id int) error { func (book *Book) ThoroughDeleteBook(id int) error {
if id <= 0 { if id <= 0 {
return ErrInvalidParameter return ErrInvalidParameter
} }
o := orm.NewOrm() o := orm.NewOrm()
m,err := m.Find(id); book,err := book.Find(id);
if err != nil { if err != nil {
return err return err
} }
@ -256,15 +256,15 @@ func (m *Book) ThoroughDeleteBook(id int) error {
sql2 := "DELETE FROM " + NewDocument().TableNameWithPrefix() + " WHERE book_id = ?" sql2 := "DELETE FROM " + NewDocument().TableNameWithPrefix() + " WHERE book_id = ?"
_, err = o.Raw(sql2, m.BookId).Exec() _, err = o.Raw(sql2, book.BookId).Exec()
if err != nil { if err != nil {
o.Rollback() o.Rollback()
return err return err
} }
sql3 := "DELETE FROM " + m.TableNameWithPrefix() + " WHERE book_id = ?" sql3 := "DELETE FROM " + book.TableNameWithPrefix() + " WHERE book_id = ?"
_, err = o.Raw(sql3, m.BookId).Exec() _, err = o.Raw(sql3, book.BookId).Exec()
if err != nil { if err != nil {
o.Rollback() o.Rollback()
@ -272,15 +272,15 @@ func (m *Book) ThoroughDeleteBook(id int) error {
} }
sql4 := "DELETE FROM " + NewRelationship().TableNameWithPrefix() + " WHERE book_id = ?" sql4 := "DELETE FROM " + NewRelationship().TableNameWithPrefix() + " WHERE book_id = ?"
_, err = o.Raw(sql4, m.BookId).Exec() _, err = o.Raw(sql4, book.BookId).Exec()
if err != nil { if err != nil {
o.Rollback() o.Rollback()
return err return err
} }
if m.Label != "" { if book.Label != "" {
NewLabel().InsertOrUpdateMulti(m.Label) NewLabel().InsertOrUpdateMulti(book.Label)
} }
os.RemoveAll(filepath.Join(conf.WorkingDirectory,"uploads","books",strconv.Itoa(id))) os.RemoveAll(filepath.Join(conf.WorkingDirectory,"uploads","books",strconv.Itoa(id)))
@ -290,7 +290,7 @@ func (m *Book) ThoroughDeleteBook(id int) error {
} }
//分页查找系统首页数据. //分页查找系统首页数据.
func (m *Book) FindForHomeToPager(pageIndex, pageSize, member_id int) (books []*BookResult, totalCount int, err error) { func (book *Book) FindForHomeToPager(pageIndex, pageSize, member_id int) (books []*BookResult, totalCount int, err error) {
o := orm.NewOrm() o := orm.NewOrm()
offset := (pageIndex - 1) * pageSize offset := (pageIndex - 1) * pageSize
@ -311,7 +311,7 @@ func (m *Book) FindForHomeToPager(pageIndex, pageSize, member_id int) (books []*
_, err = o.Raw(sql2, member_id, offset, pageSize).QueryRows(&books) _, err = o.Raw(sql2, member_id, offset, pageSize).QueryRows(&books)
} else { } else {
count, err1 := o.QueryTable(m.TableNameWithPrefix()).Filter("privately_owned", 0).Count() count, err1 := o.QueryTable(book.TableNameWithPrefix()).Filter("privately_owned", 0).Count()
if err1 != nil { if err1 != nil {
err = err1 err = err1
@ -333,7 +333,7 @@ func (m *Book) FindForHomeToPager(pageIndex, pageSize, member_id int) (books []*
} }
//分页全局搜索. //分页全局搜索.
func (m *Book) FindForLabelToPager(keyword string, pageIndex, pageSize, memberId int) (books []*BookResult, totalCount int, err error) { func (book *Book) FindForLabelToPager(keyword string, pageIndex, pageSize, memberId int) (books []*BookResult, totalCount int, err error) {
o := orm.NewOrm() o := orm.NewOrm()
keyword = "%" + keyword + "%" keyword = "%" + keyword + "%"
@ -378,7 +378,7 @@ func (m *Book) FindForLabelToPager(keyword string, pageIndex, pageSize, memberId
} }
//重置文档数量 //重置文档数量
func (m *Book) ResetDocumentNumber(bookId int) { func (book *Book) ResetDocumentNumber(bookId int) {
o := orm.NewOrm() o := orm.NewOrm()
totalCount, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).Count() totalCount, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).Count()
@ -398,7 +398,7 @@ func (book *Book)ImportBook(zipPath string) error {
w := md5.New() w := md5.New()
io.WriteString(w, zipPath) //将str写入到w中 io.WriteString(w, zipPath) //将str写入到w中
io.WriteString(w, time.Now().String()) io.WriteString(w, time.Now().String())
io.WriteString(w,book.BookName) io.WriteString(w, book.BookName)
md5str := fmt.Sprintf("%x", w.Sum(nil)) //w.Sum(nil)将w的hash转成[]byte格式 md5str := fmt.Sprintf("%x", w.Sum(nil)) //w.Sum(nil)将w的hash转成[]byte格式
tempPath := strings.Replace(filepath.Join(os.TempDir(), md5str),"\\","/",-1) tempPath := strings.Replace(filepath.Join(os.TempDir(), md5str),"\\","/",-1)
@ -409,6 +409,9 @@ func (book *Book)ImportBook(zipPath string) error {
return err return err
} }
docMap := make(map[string]int,0)
book.Insert()
err := filepath.Walk(tempPath, func(path string, info os.FileInfo, err error) error { err := filepath.Walk(tempPath, func(path string, info os.FileInfo, err error) error {
path = strings.Replace(path,"\\","/",-1) path = strings.Replace(path,"\\","/",-1)
@ -417,9 +420,11 @@ func (book *Book)ImportBook(zipPath string) error {
} }
if !info.IsDir() { if !info.IsDir() {
ext := filepath.Ext(info.Name()) ext := filepath.Ext(info.Name())
//如果是Markdown文件
if strings.EqualFold(ext ,".md") || strings.EqualFold(ext , ".markdown" ) { if strings.EqualFold(ext ,".md") || strings.EqualFold(ext , ".markdown" ) {
doc := NewDocument() doc := NewDocument()
doc.BookId = book.BookId doc.BookId = book.BookId
doc.MemberId = book.MemberId
docIdentify := strings.Replace(strings.TrimPrefix(path, tempPath+"/"), "/", "-", -1) docIdentify := strings.Replace(strings.TrimPrefix(path, tempPath+"/"), "/", "-", -1)
if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, docIdentify); !ok || err != nil { if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, docIdentify); !ok || err != nil {
@ -427,7 +432,7 @@ func (book *Book)ImportBook(zipPath string) error {
} }
doc.Identify = docIdentify doc.Identify = docIdentify
//匹配图片，如果图片语法是在代码块中，这里同样会处理
re := regexp.MustCompile(`!\[(.*?)\]\((.*?)\)`) re := regexp.MustCompile(`!\[(.*?)\]\((.*?)\)`)
markdown, err := ioutil.ReadFile(path); markdown, err := ioutil.ReadFile(path);
if err != nil { if err != nil {
@ -439,8 +444,8 @@ func (book *Book)ImportBook(zipPath string) error {
if len(images) <= 0 || len(images[0]) < 3 { if len(images) <= 0 || len(images[0]) < 3 {
return image return image
} }
originalImageUrl := string(images[0][2]) originalImageUrl := string(images[0][2])
imageUrl := strings.Replace(string(originalImageUrl),"\\","/",-1) imageUrl := strings.Replace(string(originalImageUrl), "\\", "/", -1)
//如果是本地路径，则需要将图片复制到项目目录 //如果是本地路径，则需要将图片复制到项目目录
if !strings.HasPrefix(imageUrl, "http://") && !strings.HasPrefix(imageUrl, "https://") { if !strings.HasPrefix(imageUrl, "http://") && !strings.HasPrefix(imageUrl, "https://") {
@ -453,60 +458,111 @@ func (book *Book)ImportBook(zipPath string) error {
} else { } else {
imageUrl = filepath.Join(filepath.Dir(path), imageUrl) imageUrl = filepath.Join(filepath.Dir(path), imageUrl)
} }
imageUrl = strings.Replace(imageUrl,"\\","/",-1) imageUrl = strings.Replace(imageUrl, "\\", "/", -1)
dstFile := filepath.Join(conf.WorkingDirectory,"uploads",time.Now().Format("200601"),strings.TrimPrefix(imageUrl,tempPath)) dstFile := filepath.Join(conf.WorkingDirectory, "uploads", time.Now().Format("200601"), strings.TrimPrefix(imageUrl, tempPath))
if filetil.FileExists(imageUrl) { if filetil.FileExists(imageUrl) {
filetil.CopyFile(imageUrl,dstFile) filetil.CopyFile(imageUrl, dstFile)
imageUrl = strings.TrimPrefix(dstFile,conf.WorkingDirectory) imageUrl = strings.TrimPrefix(dstFile, conf.WorkingDirectory)
if !strings.HasPrefix(imageUrl,"/") && !strings.HasPrefix(imageUrl,"\\"){ if !strings.HasPrefix(imageUrl, "/") && !strings.HasPrefix(imageUrl, "\\") {
imageUrl = "/" + imageUrl imageUrl = "/" + imageUrl
} }
} }
}else{ } else {
imageExt := cryptil.Md5Crypt(imageUrl) + filepath.Ext(imageUrl) imageExt := cryptil.Md5Crypt(imageUrl) + filepath.Ext(imageUrl)
dstFile := filepath.Join(conf.WorkingDirectory,"uploads",time.Now().Format("200601"),imageExt) dstFile := filepath.Join(conf.WorkingDirectory, "uploads", time.Now().Format("200601"), imageExt)
if err := requests.DownloadAndSaveFile(imageUrl,dstFile) ;err == nil { if err := requests.DownloadAndSaveFile(imageUrl, dstFile); err == nil {
imageUrl = strings.TrimPrefix(strings.Replace(dstFile,"\\","/",-1),strings.Replace(conf.WorkingDirectory,"\\","/",-1)) imageUrl = strings.TrimPrefix(strings.Replace(dstFile, "\\", "/", -1), strings.Replace(conf.WorkingDirectory, "\\", "/", -1))
if !strings.HasPrefix(imageUrl,"/") && !strings.HasPrefix(imageUrl,"\\"){ if !strings.HasPrefix(imageUrl, "/") && !strings.HasPrefix(imageUrl, "\\") {
imageUrl = "/" + imageUrl imageUrl = "/" + imageUrl
} }
} }
} }
imageUrl = strings.Replace(strings.TrimSuffix(image,originalImageUrl + ")") + imageUrl + ")","\\","/",-1) imageUrl = strings.Replace(strings.TrimSuffix(image, originalImageUrl+")")+imageUrl+")", "\\", "/", -1)
beego.Info(imageUrl)
return imageUrl return imageUrl
}) })
doc.Content = string(blackfriday.Run([]byte(doc.Markdown))) doc.Content = string(blackfriday.Run([]byte(doc.Markdown)))
doc.Release = doc.Content doc.Release = doc.Content
doc.Version = time.Now().Unix()
//beego.Info(content) //解析文档名称，默认使用第一个h标签为标题
//images := re.FindAllSubmatch(markdown,-1); docName := strings.TrimSuffix(info.Name(), ext)
//
//for _,image := range images { for _, line := range strings.Split(doc.Markdown, "\n") {
// originalImageUrl := string(image[1]) if strings.HasPrefix(line, "#") {
// imageUrl := string(originalImageUrl) docName = strings.TrimLeft(line, "#")
// break
// if !strings.HasPrefix(imageUrl,"http://") && !strings.HasPrefix(imageUrl,"https://") { }
// if strings.HasPrefix(imageUrl, "/") { }
// imageUrl = filepath.Join(tempPath, imageUrl)
// } else if strings.HasPrefix(imageUrl, "./") { doc.DocumentName = docName
// imageUrl = filepath.Join(filepath.Dir(path), strings.TrimPrefix(imageUrl, "./"))
// } else if strings.HasPrefix(imageUrl, "../") { parentId := 0
// imageUrl = filepath.Join(filepath.Dir(path), imageUrl)
// }else{ parentIdentify := strings.Replace(strings.Trim(strings.TrimSuffix(strings.TrimPrefix(path, tempPath), info.Name()), "/"), "/", "-", -1)
// imageUrl = filepath.Join(filepath.Dir(path), imageUrl)
// } if parentIdentify != "" {
// if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, parentIdentify); !ok || err != nil {
// } parentIdentify = "import-" + parentIdentify
// beego.Info(imageUrl) }
//} if id, ok := docMap[parentIdentify]; ok {
parentId = id
}
}
isInsert := false
//如果当前文件是README.md，则将内容更新到父级
if strings.EqualFold(info.Name(), "README.md") && parentId != 0{
doc.DocumentId = parentId
beego.Info(path,"|",parentId)
} else {
doc.ParentId = parentId
isInsert = true
}
if err := doc.InsertOrUpdate("document_name","markdown","release","content");err != nil {
beego.Error(doc.DocumentId,err)
}
if isInsert {
docMap[docIdentify] = doc.DocumentId
}
}
}else{
//如果当前目录下存在Markdown文件，则需要创建此节点
if filetil.HasFileOfExt(path,[]string{".md",".markdown"}) {
identify := strings.Replace(strings.Trim(strings.TrimPrefix(path,tempPath),"/"),"/","-",-1)
if ok, err := regexp.MatchString(`[a-z]+[a-zA-Z0-9_.\-]*$`, identify); !ok || err != nil {
identify = "import-" + identify
}
parentDoc := NewDocument()
parentDoc.MemberId = book.MemberId
parentDoc.BookId = book.BookId
parentDoc.Identify = identify
parentDoc.Version = time.Now().Unix()
parentDoc.DocumentName = "空白文档"
parentId := 0
parentIdentify := strings.TrimSuffix(identify,info.Name())
if id,ok := docMap[parentIdentify];ok {
parentId = id
}
parentDoc.ParentId = parentId
if err := parentDoc.InsertOrUpdate();err != nil {
beego.Error(err)
}
docMap[identify] = parentDoc.DocumentId
beego.Info(path,"|",parentDoc.DocumentId)
} }
} }

2
models/document.go
View File

@ -87,7 +87,7 @@ func (m *Document) InsertOrUpdate(cols ...string) error {
o := orm.NewOrm() o := orm.NewOrm()
var err error var err error
if m.DocumentId > 0 { if m.DocumentId > 0 {
_, err = o.Update(m) _, err = o.Update(m,cols...)
} else { } else {
_, err = o.Insert(m) _, err = o.Insert(m)
NewBook().ResetDocumentNumber(m.BookId) NewBook().ResetDocumentNumber(m.BookId)

20
utils/filetil/filetil.go
View File

@ -198,4 +198,24 @@ func Round(val float64, places int) float64 {
} }
return t return t
}
//判断指定目录下是否存在指定后缀的文件
func HasFileOfExt(path string,exts []string) bool {
err := filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
if !info.IsDir() {
ext := filepath.Ext(info.Name())
for _,item := range exts {
if strings.EqualFold(ext,item) {
return os.ErrExist
}
}
}
return nil
})
return err == os.ErrExist
} }