Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-18 07:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ Upgrade pdfcpu to v0.9.1 https://github.com/siyuan-note/siyuan/issues/13305

Browse source
This commit is contained in:
Daniel 2024-11-28 20:49:16 +08:00
parent 734fd34a99
commit 384bec36a3
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
kernel/model/export.go
View file

@ -1022,7 +1022,7 @@ func ProcessPDF(id, p string, merge, removeAssets, watermark bool) (err error) {
processPDFWatermark(pdfCtx, watermark) processPDFWatermark(pdfCtx, watermark)
pdfcpuVer := model.VersionStr pdfcpuVer := model.VersionStr
model.VersionStr = "SiYuan v" + util.Ver + " (" + pdfcpuVer + ")" model.VersionStr = "SiYuan v" + util.Ver + " (pdfcpu " + pdfcpuVer + ")"
if writeErr := api.WriteContextFile(pdfCtx, p); nil != writeErr { if writeErr := api.WriteContextFile(pdfCtx, p); nil != writeErr {
logging.LogErrorf("write pdf context failed: %s", writeErr) logging.LogErrorf("write pdf context failed: %s", writeErr)
return return
@ -1123,7 +1123,7 @@ func processPDFBookmarks(pdfCtx *model.Context, headings []*ast.Node) {
return links[i].Page < links[j].Page return links[i].Page < links[j].Page
}) })
bms := map[string]pdfcpu.Bookmark{} bms := map[string]*pdfcpu.Bookmark{}
for _, link := range links { for _, link := range links {
linkID := link.URI[strings.LastIndex(link.URI, "/")+1:] linkID := link.URI[strings.LastIndex(link.URI, "/")+1:]
b := sql.GetBlock(linkID) b := sql.GetBlock(linkID)
@ -1133,7 +1133,7 @@ func processPDFBookmarks(pdfCtx *model.Context, headings []*ast.Node) {
} }
title := b.Content title := b.Content
title, _ = url.QueryUnescape(title) title, _ = url.QueryUnescape(title)
bm := pdfcpu.Bookmark{ bm := &pdfcpu.Bookmark{
Title: title, Title: title,
PageFrom: link.Page, PageFrom: link.Page,
AbsPos: link.Rect.UR.Y, AbsPos: link.Rect.UR.Y,
@ -1145,7 +1145,7 @@ func processPDFBookmarks(pdfCtx *model.Context, headings []*ast.Node) {
return return
} }
var topBms []pdfcpu.Bookmark var topBms []*pdfcpu.Bookmark
stack := linkedliststack.New() stack := linkedliststack.New()
for _, h := range headings { for _, h := range headings {
L: L:
@ -1162,11 +1162,11 @@ func processPDFBookmarks(pdfCtx *model.Context, headings []*ast.Node) {
break L break L
} }
tip := cur.(pdfcpu.Bookmark) tip := cur.(*pdfcpu.Bookmark)
if tip.Level < h.HeadingLevel { if tip.Level < h.HeadingLevel {
bm := bms[h.ID] bm := bms[h.ID]
bm.Level = h.HeadingLevel bm.Level = h.HeadingLevel
bm.Parent = &tip bm.Parent = tip
tip.Kids = append(tip.Kids, bm) tip.Kids = append(tip.Kids, bm)
stack.Push(bm) stack.Push(bm)
break L break L
@ -1250,7 +1250,7 @@ func processPDFLinkEmbedAssets(pdfCtx *model.Context, assetDests []string, remov
} }
fn := filepath.Base(absPath) fn := filepath.Base(absPath)
fileSpecDict, newErr := pdfCtx.XRefTable.NewFileSpecDict(fn, types.EncodeUTF16String(fn), "attached by SiYuan", *ir) fileSpecDict, newErr := pdfCtx.XRefTable.NewFileSpecDict(fn, fn, "attached by SiYuan", *ir)
if nil != newErr { if nil != newErr {
logging.LogWarnf("new file spec dict failed: %s", newErr) logging.LogWarnf("new file spec dict failed: %s", newErr)
continue continue
@ -1264,15 +1264,15 @@ func processPDFLinkEmbedAssets(pdfCtx *model.Context, assetDests []string, remov
lx := link.Rect.LL.X + link.Rect.Width() lx := link.Rect.LL.X + link.Rect.Width()
ly := link.Rect.LL.Y + link.Rect.Height()/2 ly := link.Rect.LL.Y + link.Rect.Height()/2
ux := lx + link.Rect.Height()/2 w := link.Rect.Height() / 2
uy := ly + link.Rect.Height()/2 h := link.Rect.Height() / 2
d := types.Dict( d := types.Dict(
map[string]types.Object{ map[string]types.Object{
"Type": types.Name("Annot"), "Type": types.Name("Annot"),
"Subtype": types.Name("FileAttachment"), "Subtype": types.Name("FileAttachment"),
"Contents": types.StringLiteral(""), "Contents": types.StringLiteral(""),
"Rect": types.RectForWidthAndHeight(lx, ly, ux, uy).Array(), "Rect": types.RectForWidthAndHeight(lx, ly, w, h).Array(),
"P": link.P, "P": link.P,
"M": now, "M": now,
"F": types.Integer(0), "F": types.Integer(0),