Fix #663

hhrutter · hhrutter · commit a9afcfe68388 · 2023-07-31T09:27:39.000+02:00
diff --git a/pkg/api/merge.go b/pkg/api/merge.go
@@ -116,7 +116,7 @@ func Merge(destFile string, inFiles []string, w io.Writer, conf *model.Configura
 	}
 
 	if conf.CreateBookmarks {
-		if err := pdfcpu.EnsureOutlines(ctxDest, filepath.Base(destFile)); err != nil {
+		if err := pdfcpu.EnsureOutlines(ctxDest, filepath.Base(destFile), conf.Cmd == model.MERGEAPPEND); err != nil {
 			return err
 		}
 	}
@@ -190,11 +190,11 @@ func MergeAppendFile(inFiles []string, outFile string, conf *model.Configuration
 
 	defer func() {
 		if err != nil {
-			if err = f.Close(); err != nil {
+			if err1 := f.Close(); err1 != nil {
 				return
 			}
 			if overWrite {
-				err = os.Remove(tmpFile)
+				os.Remove(tmpFile)
 			}
 			return
 		}
@@ -206,5 +206,6 @@ func MergeAppendFile(inFiles []string, outFile string, conf *model.Configuration
 		}
 	}()
 
-	return Merge(destFile, inFiles, f, conf)
+	err = Merge(destFile, inFiles, f, conf)
+	return err
 }
diff --git a/pkg/api/test/merge_test.go b/pkg/api/test/merge_test.go
@@ -63,6 +63,12 @@ func TestMergeAppendNew(t *testing.T) {
 	if err := api.MergeAppendFile(inFiles, outFile, nil); err != nil {
 		t.Fatalf("%s: %v\n", msg, err)
 	}
+
+	anotherFile := filepath.Join(inDir, "testRot.pdf")
+	err := api.MergeAppendFile([]string{anotherFile}, outFile, nil)
+	if err != nil {
+		t.Fatalf("%s: %v\n", msg, err)
+	}
 }
 
 func TestMergeToBufNew(t *testing.T) {
@@ -92,6 +98,7 @@ func TestMergeRaw(t *testing.T) {
 		filepath.Join(inDir, "Acroforms2.pdf"),
 		filepath.Join(inDir, "adobe_errata.pdf"),
 	}
+	outFile := filepath.Join(outDir, "test.pdf")
 
 	var rsc []io.ReadSeeker = make([]io.ReadSeeker, 2)
 
@@ -104,15 +111,12 @@ func TestMergeRaw(t *testing.T) {
 
 	f1, err := os.Open(inFiles[1])
 	if err != nil {
-		t.Fatalf("%s: open file1: %v\n", msg, err)
+		t.Fatalf("%s: open file2: %v\n", msg, err)
 	}
 	defer f1.Close()
 	rsc[1] = f1
 
-	outFile := filepath.Join(outDir, "test.pdf")
-
 	buf := &bytes.Buffer{}
-
 	if err := api.MergeRaw(rsc, buf, nil); err != nil {
 		t.Fatalf("%s: merge: %v\n", msg, err)
 	}
diff --git a/pkg/pdfcpu/merge.go b/pkg/pdfcpu/merge.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pdfcpu/pdfcpu/pkg/pdfcpu/types"
 )
 
-func EnsureOutlines(ctx *model.Context, fName string) error {
+func EnsureOutlines(ctx *model.Context, fName string, append bool) error {
 
 	rootDict, err := ctx.Catalog()
 	if err != nil {
@@ -51,6 +51,9 @@ func EnsureOutlines(ctx *model.Context, fName string) error {
 	outlinesDict["Count"] = types.Integer(total + visible)
 
 	if obj, ok := rootDict.Find("Outlines"); ok {
+		if append {
+			return nil
+		}
 		d, err := ctx.DereferenceDict(obj)
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ func Merge(destFile string, inFiles []string, w io.Writer, conf *model.Configura`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if conf.CreateBookmarks {`
`119`		`- if err := pdfcpu.EnsureOutlines(ctxDest, filepath.Base(destFile)); err != nil {`
	`119`	`+ if err := pdfcpu.EnsureOutlines(ctxDest, filepath.Base(destFile), conf.Cmd == model.MERGEAPPEND); err != nil {`
`120`	`120`	`return err`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -190,11 +190,11 @@ func MergeAppendFile(inFiles []string, outFile string, conf *model.Configuration`
`190`	`190`
`191`	`191`	`defer func() {`
`192`	`192`	`if err != nil {`
`193`		`- if err = f.Close(); err != nil {`
	`193`	`+ if err1 := f.Close(); err1 != nil {`
`194`	`194`	`return`
`195`	`195`	`}`
`196`	`196`	`if overWrite {`
`197`		`- err = os.Remove(tmpFile)`
	`197`	`+ os.Remove(tmpFile)`
`198`	`198`	`}`
`199`	`199`	`return`
`200`	`200`	`}`
`@@ -206,5 +206,6 @@ func MergeAppendFile(inFiles []string, outFile string, conf *model.Configuration`
`206`	`206`	`}`
`207`	`207`	`}()`
`208`	`208`
`209`		`- return Merge(destFile, inFiles, f, conf)`
	`209`	`+ err = Merge(destFile, inFiles, f, conf)`
	`210`	`+ return err`
`210`	`211`	`}`