From 3a1bec6f42252dc6c7e498d1de7cfda5f6949c13 Mon Sep 17 00:00:00 2001 From: truthhun <1272881215@qq.com> Date: Sun, 19 Nov 2023 15:00:59 +0800 Subject: [PATCH] =?UTF-8?q?svg=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/util.go | 18 +++++++++++++++++- util/converter/converter.go | 11 +++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/model/util.go b/model/util.go index a4371a4..c9d36d0 100644 --- a/model/util.go +++ b/model/util.go @@ -410,7 +410,23 @@ func (m *DBModel) reconvertDocument(doc *Document, ext string) { // 2. 转换文档预览文件 convertedTargetFile := filepath.Join(cacheDir, fmt.Sprintf("%d%s", i, ext)) - err = converter.ConvertByImageMagick(dstFile, convertedTargetFile) + if strings.HasSuffix(oldExt, ".svg") { + // 如果是svg文件,则需要使用inkscape预先转为png + tmpFile := filepath.Join(cacheDir, fmt.Sprintf("tmp-%d.png", i)) + err = converter.ConvertByInkscape(dstFile, tmpFile) + if err == nil { + if strings.HasSuffix(convertedTargetFile, ".png") { + // 如果目标文件是png,则直接使用inkscape转换后的文件 + convertedTargetFile = tmpFile + } else { + // 如果目标文件不是png,则需要使用ImageMagick转换 + err = converter.ConvertByImageMagick(tmpFile, convertedTargetFile) + os.RemoveAll(tmpFile) + } + } + } else { + err = converter.ConvertByImageMagick(dstFile, convertedTargetFile) + } if err != nil { m.logger.Error("reconvertDocument", zap.String("msg", "转换文档预览文件失败"), zap.String("document", doc.Title+doc.Ext), zap.Error(err)) return diff --git a/util/converter/converter.go b/util/converter/converter.go index 4c0c5bb..63a0db4 100644 --- a/util/converter/converter.go +++ b/util/converter/converter.go @@ -546,3 +546,14 @@ func ConvertByImageMagick(src, dst string, moreArgs ...string) (err error) { _, err = command.ExecCommand(imageMagick, args) return } + +// 通过Inksacpe进行转换,如将svg转为png +func ConvertByInkscape(src, dst string, moreArgs ...string) (err error) { + args := []string{ + "-o", dst, + } + args = append(args, moreArgs...) + args = append(args, src) + _, err = command.ExecCommand(inkscape, args) + return +}