OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-04-29 13:48:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address style guidelines

Browse Source
This commit is contained in:
Gunnsteinn Hall 2019-01-23 10:10:35 +00:00
parent fe1f107ee2
commit b097f8b98a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pdf/internal/e2etest/passthrough_test.go
View File

@ -158,16 +158,16 @@ func passthroughSinglePdf(params passthroughParams) error {
// GS validation of input, output pdfs.
if params.gsValidation {
common.Log.Debug("Validating input file")
err, inputWarnings := validatePdf(params.inputPath, "")
inputWarnings, err := validatePdf(params.inputPath, "")
if err != nil {
return err
}
common.Log.Debug("Validating output file")
err, warnings := validatePdf(params.outPath, "")
warnings, err := validatePdf(params.outPath, "")
if err != nil && warnings > inputWarnings {
common.Log.Error("Input warnings %d vs output %d", inputWarnings, warnings)
common.Log.Debug("Input warnings %d vs output %d", inputWarnings, warnings)
return fmt.Errorf("Invalid PDF input %d/ output %d warnings", inputWarnings, warnings)
}
common.Log.Debug("Valid PDF!")

10
pdf/internal/e2etest/validate.go
View File

@ -26,9 +26,9 @@ var (
// validatePdf a pdf file using Ghostscript, returns an error if unable to execute.
// Also returns the number of output warnings, which can be used as some sort of measure
// of validity, especially when comparing with a transformed version of same file.
func validatePdf(path string, password string) (error, int) {
func validatePdf(path string, password string) (int, error) {
if len(ghostscriptBinPath) == 0 {
return errors.New("UNIDOC_GS_BIN_PATH not set"), 0
return 0, errors.New("UNIDOC_GS_BIN_PATH not set")
}
common.Log.Debug("Validating: %s", path)
@ -50,7 +50,7 @@ func validatePdf(path string, password string) (error, int) {
common.Log.Debug("%s", out.String())
common.Log.Debug("%s", errOut.String())
common.Log.Error("GS failed with error %s", err)
return fmt.Errorf("GS failed with error (%s)", err), 0
return 0, fmt.Errorf("GS failed with error (%s)", err)
}
outputErr := errOut.String()
@ -62,9 +62,9 @@ func validatePdf(path string, password string) (error, int) {
outputErr = outputErr[:80] // Trim the output.
}
common.Log.Debug("ERROR: Invalid - %d warnings %s", warnings, outputErr)
return nil, warnings
return warnings, nil
}
// Valid if no error.
return nil, 0
return 0, nil
}