文档转换问题处理

Author: TruthHun88

.gitignore

@@ -55,4 +55,5 @@ DocHub
 sitemap
 sitemap.xml
 *_test.go
-store
+store
+*.sh

TODO.md

@@ -27,7 +27,9 @@
 
 
 ## DocHub v2.3
-- [ ] `文档管理`文档删除的错误
+- [ ] 用户注册和登录成功之后的跳转优化
+- [ ] 图片裁剪质量优化
+- [x] `文档管理`文档删除的错误
 - [x] 移除对zoneinfo.zip的依赖
 - [x] calibre 文档转换优化
 - [x] 解决程序不支持utf8mb4数据库字符编码问题（ERROR 1071 (42000): Specified key was too long; max key length is 767 bytes），索引字段太长导致

controllers/AdminControllers/DocController.go

@@ -111,7 +111,6 @@ func (this *DocController) Recycle() {
 	p = helper.NumberRange(p, 1, 10000)
 	listRows := this.Sys.ListRows
 	this.Data["Lists"], _, _ = models.NewDocumentRecycle().RecycleList(p, listRows)
-	fmt.Println(this.Data["Lists"])
 	this.Data["Tab"] = "recycle"
 	this.TplName = "recycle.html"
 }

helper/convert.go

@@ -70,7 +70,7 @@ func OfficeToPDF(file string) (err error) {
 //非office文档(.txt,.mobi,.epub)转pdf文档
 func ConvertByCalibre(file string, ext ...string) (resFile string, err error) {
 	//calibre := beego.AppConfig.DefaultString("calibre", "ebook-convert")
-	e := ".pdf"
+	e := ExtPDF
 	if len(ext) > 0 {
 		e = ext[0]
 	}
@@ -81,20 +81,24 @@ func ConvertByCalibre(file string, ext ...string) (resFile string, err error) {
 	args := []string{
 		file,
 		resFile,
-		"--paper-size", "a4",
-		"--pdf-default-font-size", "16",
-		"--pdf-page-margin-bottom", "36",
-		"--pdf-page-margin-left", "36",
-		"--pdf-page-margin-right", "36",
-		"--pdf-page-margin-top", "36",
+	}
+	if e == ExtPDF {
+		args = append(args,
+			"--paper-size", "a4",
+			"--pdf-default-font-size", "16",
+			"--pdf-page-margin-bottom", "36",
+			"--pdf-page-margin-left", "36",
+			"--pdf-page-margin-right", "36",
+			"--pdf-page-margin-top", "36",
+		)
 	}
 	cmd := exec.Command(calibre, args...)
 	if strings.HasPrefix(calibre, "sudo") {
 		calibre = strings.TrimPrefix(calibre, "sudo")
 		args = append([]string{calibre}, args...)
 		cmd = exec.Command("sudo", args...)
 	}
-	Logger.Debug("calibre文档转换：%v", args)
+	Logger.Debug("calibre文档转换：%v %v", calibre, strings.Join(args, " "))
 	time.AfterFunc(60*time.Minute, func() {
 		if cmd.Process != nil {
 			cmd.Process.Kill()

models/UserModel.go

@@ -295,7 +295,7 @@ func (this *User) CanDownloadFile(uid, docId int) (urlStr string, err error) {
 			return
 		}
 	} else {
-		logDown.Log = fmt.Sprintf("在免费期限内，下载同一篇文档(%v)免费", doc.Title)
+		logDown.Log = fmt.Sprintf("在免费期限内，下载同一篇文档《%v》免费", doc.Title)
 	}
 
 	if _, err = o.Insert(&logDown); err != nil {

models/Utils.go

@@ -371,13 +371,13 @@ func DocumentConvert(tmpFile string, fileMD5 string, page ...int) (err error) {
 			beego.Debug("存储svg文件", svg, "==>", save)
 		}
 
-		errCompress := helper.CompressBySVGO(svg, svg)
-		if errCompress != nil {
-			helper.Logger.Error("SVGO压缩SVG失败：%v", errCompress.Error())
+		err = helper.CompressBySVGO(svg, svg)
+		if err != nil {
+			helper.Logger.Error("SVGO压缩SVG失败：%v", err.Error())
 		}
 		if clientPublic.CanGZIP {
-			if errCompress = helper.CompressByGzip(svg); err != nil {
-				helper.Logger.Error("GZIP压缩SVG失败：%v", errCompress.Error())
+			if err = helper.CompressByGzip(svg); err != nil {
+				helper.Logger.Error("GZIP压缩SVG失败：%v", err.Error())
 			} else {
 				headers = append(headers, helper.HeaderGzip)
 			}