adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-17 12:42:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(libreoffice): accept PDF/A-1b instead of PDF/A-1a (#751)

Browse Source
This commit is contained in:
Julien Neuhart
2023-12-13 12:40:09 +01:00
committed by GitHub
parent 92e2f7f8b7
commit 4bd7cba247
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/modules/chromium/routes_test.go
View File

@@ -702,7 +702,7 @@ func TestConvertUrl(t *testing.T) {
engine: &gotenberg.PdfEngineMock{ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error { engine: &gotenberg.PdfEngineMock{ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
return nil return nil
}}, }},
pdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1a}, pdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1b},
options: DefaultOptions(), options: DefaultOptions(),
expectError: false, expectError: false,
expectHttpError: false, expectHttpError: false,

2
pkg/modules/libreoffice/api/api.go
View File

@@ -50,7 +50,7 @@ type Options struct {
// Optional. // Optional.
PageRanges string PageRanges string
// PdfFormats allows to convert the resulting PDF to PDF/A-1a, PDF/A-2b, // PdfFormats allows to convert the resulting PDF to PDF/A-1b, PDF/A-2b,
// PDF/A-3b and PDF/UA. // PDF/A-3b and PDF/UA.
// Optional. // Optional.
PdfFormats gotenberg.PdfFormats PdfFormats gotenberg.PdfFormats

2
pkg/modules/libreoffice/api/libreoffice.go
View File

@@ -275,7 +275,7 @@ func (p *libreOfficeProcess) pdf(ctx context.Context, logger *zap.Logger, inputP
switch options.PdfFormats.PdfA { switch options.PdfFormats.PdfA {
case "": case "":
case gotenberg.PdfA1a: case gotenberg.PdfA1b:
args = append(args, "--export", "SelectPdfVersion=1") args = append(args, "--export", "SelectPdfVersion=1")
case gotenberg.PdfA2b: case gotenberg.PdfA2b:
args = append(args, "--export", "SelectPdfVersion=2") args = append(args, "--export", "SelectPdfVersion=2")

4
pkg/modules/libreoffice/api/libreoffice_test.go
View File

@@ -394,7 +394,7 @@ func TestLibreOfficeProcess_pdf(t *testing.T) {
expectError: false, expectError: false,
}, },
{ {
scenario: "success (PDF/A-1a)", scenario: "success (PDF/A-1b)",
libreOffice: newLibreOfficeProcess( libreOffice: newLibreOfficeProcess(
libreOfficeArguments{ libreOfficeArguments{
binPath: os.Getenv("LIBREOFFICE_BIN_PATH"), binPath: os.Getenv("LIBREOFFICE_BIN_PATH"),
@@ -417,7 +417,7 @@ func TestLibreOfficeProcess_pdf(t *testing.T) {
return fs return fs
}(), }(),
options: Options{PdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1a}}, options: Options{PdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1b}},
cancelledCtx: false, cancelledCtx: false,
start: true, start: true,
expectError: false, expectError: false,

2
pkg/modules/libreoffice/pdfengine/pdfengine.go
View File

@@ -52,7 +52,7 @@ func (engine *LibreOfficePdfEngine) Merge(ctx context.Context, logger *zap.Logge
} }
// Convert converts the given PDF to a specific PDF format. Currently, only the // Convert converts the given PDF to a specific PDF format. Currently, only the
// PDF/A-1a, PDF/A-2b, PDF/A-3b and PDF/UA formats are available. If another // PDF/A-1b, PDF/A-2b, PDF/A-3b and PDF/UA formats are available. If another
// PDF format is requested, it returns a [gotenberg.ErrPdfFormatNotSupported] // PDF format is requested, it returns a [gotenberg.ErrPdfFormatNotSupported]
// error. // error.
func (engine *LibreOfficePdfEngine) Convert(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error { func (engine *LibreOfficePdfEngine) Convert(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {

12
pkg/modules/libreoffice/routes_test.go
View File

@@ -124,7 +124,7 @@ func TestConvertRoute(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"nativePdfFormats": { "nativePdfFormats": {
"false", "false",
@@ -223,7 +223,7 @@ func TestConvertRoute(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"pdfua": { "pdfua": {
"true", "true",
@@ -260,7 +260,7 @@ func TestConvertRoute(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"pdfua": { "pdfua": {
"true", "true",
@@ -372,7 +372,7 @@ func TestConvertRoute(t *testing.T) {
"true", "true",
}, },
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"nativePdfFormats": { "nativePdfFormats": {
"false", "false",
@@ -478,7 +478,7 @@ func TestConvertRoute(t *testing.T) {
"true", "true",
}, },
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"pdfua": { "pdfua": {
"true", "true",
@@ -522,7 +522,7 @@ func TestConvertRoute(t *testing.T) {
"true", "true",
}, },
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"pdfua": { "pdfua": {
"true", "true",

16
pkg/modules/pdfengines/routes_test.go
View File

@@ -99,7 +99,7 @@ func TestMergeHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
}) })
return ctx return ctx
@@ -127,7 +127,7 @@ func TestMergeHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
}) })
return ctx return ctx
@@ -154,7 +154,7 @@ func TestMergeHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"pdfua": { "pdfua": {
"true", "true",
@@ -256,7 +256,7 @@ func TestConvertHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
}) })
return ctx return ctx
@@ -280,7 +280,7 @@ func TestConvertHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
}) })
return ctx return ctx
@@ -303,7 +303,7 @@ func TestConvertHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
}) })
ctx.SetCancelled(true) ctx.SetCancelled(true)
@@ -327,7 +327,7 @@ func TestConvertHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"pdfua": { "pdfua": {
"true", "true",
@@ -354,7 +354,7 @@ func TestConvertHandler(t *testing.T) {
}) })
ctx.SetValues(map[string][]string{ ctx.SetValues(map[string][]string{
"pdfa": { "pdfa": {
gotenberg.PdfA1a, gotenberg.PdfA1b,
}, },
"pdfua": { "pdfua": {
"true", "true",