make pdfinfo format optional

stustanet · Feb 22, 2020 · ca388fb · ca388fb
1 parent cc05f43
commit ca388fb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/print/calc.go b/src/print/calc.go
@@ -68,7 +68,7 @@ var (
 	ErrInvalidFormat    = errors.New("invalid format")
 	ErrPasswordRequired = errors.New("password required")
 	ErrInvalidPdfinfo   = errors.New("invalid pdf info output")
-	pageSizeRegex       = regexp.MustCompile(`^Page size:\s+(?P<width>\d+\.?\d*) x (?P<height>\d+\.?\d*) pts \((?P<format>\w+)\).*$`)
+	pageSizeRegex       = regexp.MustCompile(`^Page size:\s+(?P<width>\d+\.?\d*) x (?P<height>\d+\.?\d*) pts( \((?P<format>\w+)\))?.*$`)
 )
 
 func pdfInfo(j *Job) {
@@ -138,7 +138,9 @@ func pdfInfo(j *Job) {
 					j.Rotated = true
 				}
 
-				j.Format = match[3]
+				if len(match) > 3 {
+					j.Format = match[3]
+				}
 			}
 			/*case 'E':
 			  if bytes.Compare(line[:10], []byte("Encrypted:")) == 0 {