invisi/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-07-02 08:27:41 +08: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
pkg/modules/chromium/routes_test.go
+1 -1
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 {
return nil
}},
pdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1a},
pdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1b},
options: DefaultOptions(),
expectError: false,
expectHttpError: false,
pkg/modules/libreoffice/api/api.go
+1 -1
View File
@@ -50,7 +50,7 @@ type Options struct {
// Optional.
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.
// Optional.
PdfFormats gotenberg.PdfFormats
pkg/modules/libreoffice/api/libreoffice.go
+1 -1
View File
@@ -275,7 +275,7 @@ func (p *libreOfficeProcess) pdf(ctx context.Context, logger *zap.Logger, inputP
switch options.PdfFormats.PdfA {
case "":
case gotenberg.PdfA1a:
case gotenberg.PdfA1b:
args = append(args, "--export", "SelectPdfVersion=1")
case gotenberg.PdfA2b:
args = append(args, "--export", "SelectPdfVersion=2")
pkg/modules/libreoffice/api/libreoffice_test.go
+2 -2
View File
@@ -394,7 +394,7 @@ func TestLibreOfficeProcess_pdf(t *testing.T) {
expectError: false,
},
{
scenario: "success (PDF/A-1a)",
scenario: "success (PDF/A-1b)",
libreOffice: newLibreOfficeProcess(
libreOfficeArguments{
binPath: os.Getenv("LIBREOFFICE_BIN_PATH"),
@@ -417,7 +417,7 @@ func TestLibreOfficeProcess_pdf(t *testing.T) {
return fs
}(),
options: Options{PdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1a}},
options: Options{PdfFormats: gotenberg.PdfFormats{PdfA: gotenberg.PdfA1b}},
cancelledCtx: false,
start: true,
expectError: false,
pkg/modules/libreoffice/pdfengine/pdfengine.go
+1 -1
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
// 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]
// error.
func (engine *LibreOfficePdfEngine) Convert(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
pkg/modules/libreoffice/routes_test.go
+6 -6
View File
@@ -124,7 +124,7 @@ func TestConvertRoute(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"nativePdfFormats": {
"false",
@@ -223,7 +223,7 @@ func TestConvertRoute(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"pdfua": {
"true",
@@ -260,7 +260,7 @@ func TestConvertRoute(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"pdfua": {
"true",
@@ -372,7 +372,7 @@ func TestConvertRoute(t *testing.T) {
"true",
},
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"nativePdfFormats": {
"false",
@@ -478,7 +478,7 @@ func TestConvertRoute(t *testing.T) {
"true",
},
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"pdfua": {
"true",
@@ -522,7 +522,7 @@ func TestConvertRoute(t *testing.T) {
"true",
},
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"pdfua": {
"true",
pkg/modules/pdfengines/routes_test.go
+8 -8
View File
@@ -99,7 +99,7 @@ func TestMergeHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
})
return ctx
@@ -127,7 +127,7 @@ func TestMergeHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
})
return ctx
@@ -154,7 +154,7 @@ func TestMergeHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"pdfua": {
"true",
@@ -256,7 +256,7 @@ func TestConvertHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
})
return ctx
@@ -280,7 +280,7 @@ func TestConvertHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
})
return ctx
@@ -303,7 +303,7 @@ func TestConvertHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
})
ctx.SetCancelled(true)
@@ -327,7 +327,7 @@ func TestConvertHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"pdfua": {
"true",
@@ -354,7 +354,7 @@ func TestConvertHandler(t *testing.T) {
})
ctx.SetValues(map[string][]string{
"pdfa": {
gotenberg.PdfA1a,
gotenberg.PdfA1b,
},
"pdfua": {
"true",