feat: use new pdf lib

lib/append.go

@@ -1,19 +1,25 @@
 package lib
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
+	"io"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
+	"time"
 
-	"github.com/pdfcpu/pdfcpu/pkg/api"
-	"github.com/pdfcpu/pdfcpu/pkg/pdfcpu/model"
+	"gitlab.com/romalor/pdflib/pkg/components/attachment"
+	"gitlab.com/romalor/pdflib/pkg/pdf"
 )
 
-func AppendToPdf(inputPdfFilePath string, inputXmlFilePath string, outputFilePath string) error {
+func AppendToPdf(
+	inputPdfFilePath string,
+	inputXmlFilePath string,
+	outputFilePath string,
+	embedName string,
+	description string,
+) error {
 	logger := GetDebugLogger()
 	logger.Log(fmt.Sprintf("enter appendToPdf(%s, %s, %s)", inputPdfFilePath, inputXmlFilePath, outputFilePath))
 	defer func() {
@@ -35,6 +41,14 @@ func AppendToPdf(inputPdfFilePath string, inputXmlFilePath string, outputFilePat
 		) + "_xml.pdf"
 	}
 
+	if description == "" {
+		description = "Rechnung"
+	}
+
+	if embedName == "" {
+		embedName = "factur-x.xml"
+	}
+
 	logger.Log(
 		fmt.Sprintf(
 			"pdfInput: '%s' xmlInput: '%s' output: '%s'",
@@ -50,48 +64,44 @@ func AppendToPdf(inputPdfFilePath string, inputXmlFilePath string, outputFilePat
 	}
 	defer inputFile.Close()
 
-	dest := bytes.Buffer{}
-
-	err = api.AddAttachments(
-		inputFile,
-		&dest,
-		[]string{inputXmlFilePath},
-		true,
-		model.NewDefaultConfiguration(),
-	)
+	var doc *pdf.Document
+	doc, err = pdf.OpenReaderWithOptions(inputFile, pdf.OpenOptions{
+		Writable: true,
+	})
 	if err != nil {
 		return err
 	}
 
-	source := bytes.NewReader(dest.Bytes())
-	dest = bytes.Buffer{}
-
-	err = api.AddProperties(source, &dest, map[string]string{
-		"DocumentFileName":           path.Base(inputXmlFilePath),
-		"DocumentType":               "INVOICE",
-		"ConformanceLevel":           "EN 16931",
-		"SchemasSchema":              "Factur-X PDFA Extension Schema",
-		"SchemasPrefix":              "fx",
-		"SchemasPropertyName":        "DocumentFileName",
-		"SchemasPropertyValueType":   "Text",
-		"SchemasPropertyCategory":    "external",
-		"SchemasPropertyDescription": "The name of the embedded XML document",
-	}, model.NewDefaultConfiguration())
+	var inputXmlFile *os.File
+	inputXmlFile, err = os.Open(inputXmlFilePath)
 	if err != nil {
 		return err
 	}
 
-	var outputFile *os.File
-	outputFile, err = os.Create(outputFilePath)
+	var inputData []byte
+	inputData, err = io.ReadAll(inputXmlFile)
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
 
-	_, err = outputFile.Write(dest.Bytes())
+	err = doc.AddAttachment(attachment.Attachment{
+		Name:         embedName,
+		Description:  description,
+		MIMEType:     "text/xml",
+		Size:         int64(len(inputData)),
+		Relationship: "Alternative",
+		ModDate:      time.Now(),
+	}, inputData)
+	if err != nil {
+		return err
+	}
+
+	logger.Log(doc.Writer().Version)
+	err = doc.Writer().SaveAs(outputFilePath)
 	if err != nil {
 		return err
 	}
 
 	return nil
+
 }

lib/extract.go

@@ -3,13 +3,12 @@ package lib
 import (
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/pdfcpu/pdfcpu/pkg/api"
-	"github.com/pdfcpu/pdfcpu/pkg/pdfcpu/model"
+	attachment2 "gitlab.com/romalor/pdflib/pkg/components/attachment"
+	"gitlab.com/romalor/pdflib/pkg/pdf"
 )
 
 func ExtractFromPdf(inputFilePath string, outputFilePath string) error {
@@ -35,43 +34,24 @@ func ExtractFromPdf(inputFilePath string, outputFilePath string) error {
 	}
 	defer inputFile.Close()
 
-	var (
-		attachments []model.Attachment
-		rawData     []byte
-		ctx         *model.Context
-		attachment  *model.Attachment
-	)
+	var attachments []attachment2.Attachment
 
-	ctx, err = api.ReadContextFile(inputFilePath)
-	if err != nil {
-		return err
-	}
-	attachments, err = api.Attachments(inputFile, model.NewDefaultConfiguration())
+	var doc *pdf.Document
+	doc, err = pdf.OpenReader(inputFile)
 	if err != nil {
 		return err
 	}
 
-	attachment, err = ctx.ExtractAttachment(attachments[0])
+	attachments, err = doc.Attachments()
 	if err != nil {
 		return err
 	}
 
-	rawData, err = io.ReadAll(attachment)
-	if err != nil {
-		return err
+	if len(attachments) == 0 {
+		return errors.New("no attachments found")
 	}
 
-	var outputFile *os.File
-	outputFile, err = os.Create(outputFilePath)
-	if err != nil {
-		return err
-	}
-	defer outputFile.Close()
+	err = doc.ExtractAttachment(attachments[0].Name, outputFilePath)
 
-	_, err = outputFile.Write(rawData)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }