lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-25 02:44:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
wangbin8909
2021-04-11 17:19:54 +08:00
parent 27dea7b8bd ededbbe713
commit b21035bbfd
62 changed files with 1226 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
models/BookResult.go
View File

@@ -14,9 +14,9 @@ import (
"regexp"
"github.com/PuerkitoBio/goquery"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/client/orm"
"github.com/beego/beego/v2/core/logs"
"github.com/beego/beego/v2/server/web"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/converter"
"github.com/mindoc-org/mindoc/utils/cryptil"
@@ -24,7 +24,7 @@ import (
"github.com/mindoc-org/mindoc/utils/gopool"
"github.com/mindoc-org/mindoc/utils/requests"
"github.com/mindoc-org/mindoc/utils/ziptil"
"gopkg.in/russross/blackfriday.v2"
"github.com/russross/blackfriday/v2"
)
var (
@@ -97,7 +97,7 @@ func (m *BookResult) FindByIdentify(identify string, memberId int) (*BookResult,
err := NewBook().QueryTable().Filter("identify", identify).One(&book)
if err != nil {
beego.Error("获取项目失败 ->", err)
logs.Error("获取项目失败 ->", err)
return m, err
}
@@ -229,7 +229,7 @@ func (m *BookResult) ToBookResult(book Book) *BookResult {
}
if m.ItemId > 0 {
if item,err := NewItemsets().First(m.ItemId); err == nil {
if item, err := NewItemsets().First(m.ItemId); err == nil {
m.ItemName = item.ItemName
}
}
@@ -251,7 +251,7 @@ func (m *BookResult) ToBookResult(book Book) *BookResult {
func BackgroundConvert(sessionId string, bookResult *BookResult) error {
if err := converter.CheckConvertCommand(); err != nil {
beego.Error("检查转换程序失败 -> ", err)
logs.Error("检查转换程序失败 -> ", err)
return err
}
err := exportLimitWorkerChannel.LoadOrStore(bookResult.Identify, func() {
@@ -260,7 +260,7 @@ func BackgroundConvert(sessionId string, bookResult *BookResult) error {
if err != nil {
beego.Error("将导出任务加入任务队列失败 -> ", err)
logs.Error("将导出任务加入任务队列失败 -> ", err)
return err
}
exportLimitWorkerChannel.Start()
@@ -273,7 +273,7 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
convertBookResult := ConvertBookResult{}
outputPath := filepath.Join(conf.GetExportOutputPath(), strconv.Itoa(m.BookId))
viewPath := beego.BConfig.WebConfig.ViewsPath
viewPath := web.BConfig.WebConfig.ViewsPath
pdfpath := filepath.Join(outputPath, "book.pdf")
epubpath := filepath.Join(outputPath, "book.epub")
@@ -286,15 +286,15 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
sourceDir := strings.TrimSuffix(tempOutputPath, "source")
if filetil.FileExists(sourceDir) {
if err := os.RemoveAll(sourceDir); err != nil {
beego.Error("删除临时目录失败 ->", sourceDir, err)
logs.Error("删除临时目录失败 ->", sourceDir, err)
}
}
if err := os.MkdirAll(outputPath, 0766); err != nil {
beego.Error("创建目录失败 -> ", outputPath, err)
logs.Error("创建目录失败 -> ", outputPath, err)
}
if err := os.MkdirAll(tempOutputPath, 0766); err != nil {
beego.Error("创建目录失败 -> ", tempOutputPath, err)
logs.Error("创建目录失败 -> ", tempOutputPath, err)
}
os.MkdirAll(filepath.Join(tempOutputPath, "Images"), 0755)
@@ -370,7 +370,7 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
}
if tempOutputPath, err = filepath.Abs(tempOutputPath); err != nil {
beego.Error("导出目录配置错误：" + err.Error())
logs.Error("导出目录配置错误：" + err.Error())
return convertBookResult, err
}
@@ -384,7 +384,7 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
}
var buf bytes.Buffer
if err := beego.ExecuteViewPathTemplate(&buf, "document/export.tpl", viewPath, map[string]interface{}{"Model": m, "Lists": item, "BaseUrl": conf.BaseUrl}); err != nil {
if err := web.ExecuteViewPathTemplate(&buf, "document/export.tpl", viewPath, map[string]interface{}{"Model": m, "Lists": item, "BaseUrl": conf.BaseUrl}); err != nil {
return convertBookResult, err
}
html := buf.String()
@@ -407,7 +407,7 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
if strings.HasPrefix(src, "/") {
spath := filepath.Join(conf.WorkingDirectory, src)
if filetil.CopyFile(spath, filepath.Join(tempOutputPath, dstSrcString)); err != nil {
beego.Error("复制图片失败 -> ", err, src)
logs.Error("复制图片失败 -> ", err, src)
return
}
@@ -426,15 +426,15 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
if body, err := ioutil.ReadAll(resp.Body); err == nil {
//encodeString = base64.StdEncoding.EncodeToString(body)
if err := ioutil.WriteFile(filepath.Join(tempOutputPath, dstSrcString), body, 0755); err != nil {
beego.Error("下载图片失败 -> ", err, src)
logs.Error("下载图片失败 -> ", err, src)
return
}
} else {
beego.Error("下载图片失败 -> ", err, src)
logs.Error("下载图片失败 -> ", err, src)
return
}
} else {
beego.Error("下载图片失败 -> ", err, src)
logs.Error("下载图片失败 -> ", err, src)
return
}
}
@@ -457,27 +457,27 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
}
if err := filetil.CopyFile(filepath.Join(conf.WorkingDirectory, "static", "css", "kancloud.css"), filepath.Join(tempOutputPath, "styles", "css", "kancloud.css")); err != nil {
beego.Error("复制CSS样式出错 -> static/css/kancloud.css", err)
logs.Error("复制CSS样式出错 -> static/css/kancloud.css", err)
}
if err := filetil.CopyFile(filepath.Join(conf.WorkingDirectory, "static", "css", "export.css"), filepath.Join(tempOutputPath, "styles", "css", "export.css")); err != nil {
beego.Error("复制CSS样式出错 -> static/css/export.css", err)
logs.Error("复制CSS样式出错 -> static/css/export.css", err)
}
if err := filetil.CopyFile(filepath.Join(conf.WorkingDirectory, "static", "editor.md", "css", "editormd.preview.css"), filepath.Join(tempOutputPath, "styles", "editor.md", "css", "editormd.preview.css")); err != nil {
beego.Error("复制CSS样式出错 -> static/editor.md/css/editormd.preview.css", err)
logs.Error("复制CSS样式出错 -> static/editor.md/css/editormd.preview.css", err)
}
if err := filetil.CopyFile(filepath.Join(conf.WorkingDirectory, "static", "css", "markdown.preview.css"), filepath.Join(tempOutputPath, "styles", "css", "markdown.preview.css")); err != nil {
beego.Error("复制CSS样式出错 -> static/css/markdown.preview.css", err)
logs.Error("复制CSS样式出错 -> static/css/markdown.preview.css", err)
}
if err := filetil.CopyFile(filepath.Join(conf.WorkingDirectory, "static", "editor.md", "lib", "highlight", "styles", "github.css"), filepath.Join(tempOutputPath, "styles", "css", "github.css")); err != nil {
beego.Error("复制CSS样式出错 -> static/editor.md/lib/highlight/styles/github.css", err)
logs.Error("复制CSS样式出错 -> static/editor.md/lib/highlight/styles/github.css", err)
}
if err := filetil.CopyDir(filepath.Join(conf.WorkingDirectory, "static", "font-awesome"), filepath.Join(tempOutputPath, "styles", "font-awesome")); err != nil {
beego.Error("复制CSS样式出错 -> static/font-awesome", err)
logs.Error("复制CSS样式出错 -> static/font-awesome", err)
}
if err := filetil.CopyFile(filepath.Join(conf.WorkingDirectory, "static", "editor.md", "lib", "mermaid", "mermaid.css"), filepath.Join(tempOutputPath, "styles", "css", "mermaid.css")); err != nil {
beego.Error("复制CSS样式出错 -> static/editor.md/lib/mermaid/mermaid.css", err)
logs.Error("复制CSS样式出错 -> static/editor.md/lib/mermaid/mermaid.css", err)
}
eBookConverter := &converter.Converter{
@@ -491,22 +491,22 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
os.MkdirAll(eBookConverter.OutputPath, 0766)
if err := eBookConverter.Convert(); err != nil {
beego.Error("转换文件错误：" + m.BookName + " -> " + err.Error())
logs.Error("转换文件错误：" + m.BookName + " -> " + err.Error())
return convertBookResult, err
}
beego.Info("文档转换完成：" + m.BookName)
logs.Info("文档转换完成：" + m.BookName)
if err := filetil.CopyFile(filepath.Join(eBookConverter.OutputPath, "output", "book.mobi"), mobipath); err != nil {
beego.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.mobi"), err)
logs.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.mobi"), err)
}
if err := filetil.CopyFile(filepath.Join(eBookConverter.OutputPath, "output", "book.pdf"), pdfpath); err != nil {
beego.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.pdf"), err)
logs.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.pdf"), err)
}
if err := filetil.CopyFile(filepath.Join(eBookConverter.OutputPath, "output", "book.epub"), epubpath); err != nil {
beego.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.epub"), err)
logs.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.epub"), err)
}
if err := filetil.CopyFile(filepath.Join(eBookConverter.OutputPath, "output", "book.docx"), docxpath); err != nil {
beego.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.docx"), err)
logs.Error("复制文档失败 -> ", filepath.Join(eBookConverter.OutputPath, "output", "book.docx"), err)
}
convertBookResult.MobiPath = mobipath
@@ -536,7 +536,7 @@ func (m *BookResult) ExportMarkdown(sessionId string) (string, error) {
}
if err := ziptil.Compress(outputPath, tempOutputPath); err != nil {
beego.Error("导出Markdown失败->", err)
logs.Error("导出Markdown失败->", err)
return "", err
}
return outputPath, nil
@@ -551,7 +551,7 @@ func exportMarkdown(p string, parentId int, bookId int, baseDir string, bookUrl
_, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).Filter("parent_id", parentId).All(&docs)
if err != nil {
beego.Error("导出Markdown失败->", err)
logs.Error("导出Markdown失败->", err)
return err
}
for _, doc := range docs {
@@ -559,7 +559,7 @@ func exportMarkdown(p string, parentId int, bookId int, baseDir string, bookUrl
subDocCount, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("parent_id", doc.DocumentId).Count()
if err != nil {
beego.Error("导出Markdown失败->", err)
logs.Error("导出Markdown失败->", err)
return err
}
@@ -634,13 +634,13 @@ func exportMarkdown(p string, parentId int, bookId int, baseDir string, bookUrl
if id, err := strconv.Atoi(docIdentify); err == nil && id > 0 {
err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("document_id", id).One(tempDoc, "identify", "parent_id", "document_id")
if err != nil {
beego.Error(err)
logs.Error(err)
return link
}
} else {
err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("identify", docIdentify).One(tempDoc, "identify", "parent_id", "document_id")
if err != nil {
beego.Error(err)
logs.Error(err)
return link
}
}
@@ -655,7 +655,7 @@ func exportMarkdown(p string, parentId int, bookId int, baseDir string, bookUrl
relative = strings.TrimSuffix(strings.TrimPrefix(relative, "/"), "/")
repeat = strings.Count(relative, "/") + 1
}
beego.Info(repeat, "|", relative, "|", p, "|", baseDir)
logs.Info(repeat, "|", relative, "|", p, "|", baseDir)
tempLink = strings.Repeat("../", repeat) + tempLink
link = strings.TrimSuffix(link, originalLink+")") + tempLink + ")"
@@ -669,7 +669,7 @@ func exportMarkdown(p string, parentId int, bookId int, baseDir string, bookUrl
markdown = "# " + doc.DocumentName + "\n"
}
if err := ioutil.WriteFile(docPath, []byte(markdown), 0644); err != nil {
beego.Error("导出Markdown失败->", err)
logs.Error("导出Markdown失败->", err)
return err
}
@@ -690,7 +690,7 @@ func recursiveJoinDocumentIdentify(parentDocId int, identify string) string {
err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("document_id", parentDocId).One(doc, "identify", "parent_id", "document_id")
if err != nil {
beego.Error(err)
logs.Error(err)
return identify
}