Fix #747

pdfcpu · Nov 28, 2023 · d7a0231 · d7a0231
1 parent f7d021c
commit d7a0231
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 135 deletions.
diff --git a/pkg/api/annotation.go b/pkg/api/annotation.go
@@ -188,9 +188,7 @@ func AddAnnotationsFile(inFile, outFile string, selectedPages []string, ar model
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -331,9 +329,7 @@ func AddAnnotationsMapFile(inFile, outFile string, m map[int][]model.AnnotationR
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -490,9 +486,7 @@ func RemoveAnnotationsFile(inFile, outFile string, selectedPages, idsAndTypes []
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/attach.go b/pkg/api/attach.go
@@ -146,9 +146,7 @@ func AddAttachmentsFile(inFile, outFile string, files []string, coll bool, conf
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -230,9 +228,7 @@ func RemoveAttachmentsFile(inFile, outFile string, files []string, conf *model.C
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/bookmark.go b/pkg/api/bookmark.go
@@ -179,9 +179,7 @@ func ImportBookmarksFile(inFilePDF, inFileJSON, outFilePDF string, replace bool,
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFilePDF == "" || inFilePDF == outFilePDF {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -252,9 +250,7 @@ func AddBookmarksFile(inFile, outFile string, bms []pdfcpu.Bookmark, replace boo
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -321,9 +317,7 @@ func RemoveBookmarksFile(inFile, outFile string, conf *model.Configuration) (err
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/box.go b/pkg/api/box.go
@@ -67,9 +67,6 @@ func Boxes(rs io.ReadSeeker, selectedPages []string, conf *model.Configuration)
 		return nil, err
 	}
 
-	//pb := &model.PageBoundaries{}
-	//pb.SelectAll()
-
 	return ctx.PageBoundaries(pages)
 }
 
@@ -143,9 +140,7 @@ func AddBoxesFile(inFile, outFile string, selectedPages []string, pb *model.Page
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -232,9 +227,7 @@ func RemoveBoxesFile(inFile, outFile string, selectedPages []string, pb *model.P
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -321,9 +314,7 @@ func CropFile(inFile, outFile string, selectedPages []string, b *model.Box, conf
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/collect.go b/pkg/api/collect.go
@@ -91,9 +91,7 @@ func CollectFile(inFile, outFile string, selectedPages []string, conf *model.Con
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/create.go b/pkg/api/create.go
@@ -127,9 +127,7 @@ func CreateFile(inFilePDF, inFileJSON, outFilePDF string, conf *model.Configurat
 				f1.Close()
 			}
 			f0.Close()
-			if outFilePDF == "" || inFilePDF == outFilePDF {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/crypto.go b/pkg/api/crypto.go
@@ -70,9 +70,7 @@ func EncryptFile(inFile, outFile string, conf *model.Configuration) (err error)
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -135,9 +133,7 @@ func DecryptFile(inFile, outFile string, conf *model.Configuration) (err error)
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -206,9 +202,7 @@ func ChangeUserPasswordFile(inFile, outFile string, pwOld, pwNew string, conf *m
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -275,9 +269,7 @@ func ChangeOwnerPasswordFile(inFile, outFile string, pwOld, pwNew string, conf *
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/form.go b/pkg/api/form.go
@@ -127,9 +127,7 @@ func RemoveFormFieldsFile(inFile, outFile string, fieldIDsOrNames []string, conf
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -206,9 +204,7 @@ func LockFormFieldsFile(inFile, outFile string, fieldIDsOrNames []string, conf *
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -285,9 +281,7 @@ func UnlockFormFieldsFile(inFile, outFile string, fieldIDsOrNames []string, conf
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -364,9 +358,7 @@ func ResetFormFieldsFile(inFile, outFile string, fieldIDsOrNames []string, conf
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -649,9 +641,7 @@ func FillFormFile(inFilePDF, inFileJSON, outFilePDF string, conf *model.Configur
 			f2.Close()
 			f1.Close()
 			f0.Close()
-			if outFilePDF == "" || inFilePDF == outFilePDF {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/keyword.go b/pkg/api/keyword.go
@@ -109,9 +109,7 @@ func AddKeywordsFile(inFile, outFile string, files []string, conf *model.Configu
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -192,9 +190,7 @@ func RemoveKeywordsFile(inFile, outFile string, keywords []string, conf *model.C
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/optimize.go b/pkg/api/optimize.go
@@ -95,9 +95,7 @@ func OptimizeFile(inFile, outFile string, conf *model.Configuration) (err error)
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/page.go b/pkg/api/page.go
@@ -105,9 +105,7 @@ func InsertPagesFile(inFile, outFile string, selectedPages []string, before bool
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -196,9 +194,7 @@ func RemovePagesFile(inFile, outFile string, selectedPages []string, conf *model
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/pageLayout.go b/pkg/api/pageLayout.go
@@ -142,9 +142,7 @@ func SetPageLayoutFile(inFile, outFile string, val model.PageLayout, conf *model
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -209,9 +207,7 @@ func ResetPageLayoutFile(inFile, outFile string, conf *model.Configuration) (err
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/pageMode.go b/pkg/api/pageMode.go
@@ -142,9 +142,7 @@ func SetPageModeFile(inFile, outFile string, val model.PageMode, conf *model.Con
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -209,9 +207,7 @@ func ResetPageModeFile(inFile, outFile string, conf *model.Configuration) (err e
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/permission.go b/pkg/api/permission.go
@@ -109,9 +109,7 @@ func SetPermissionsFile(inFile, outFile string, conf *model.Configuration) (err
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/property.go b/pkg/api/property.go
@@ -109,9 +109,7 @@ func AddPropertiesFile(inFile, outFile string, properties map[string]string, con
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {
@@ -192,9 +190,7 @@ func RemovePropertiesFile(inFile, outFile string, properties []string, conf *mod
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {

diff --git a/pkg/api/resize.go b/pkg/api/resize.go
@@ -97,9 +97,7 @@ func ResizeFile(inFile, outFile string, selectedPages []string, resize *model.Re
 		if err != nil {
 			f2.Close()
 			f1.Close()
-			if outFile == "" || inFile == outFile {
-				os.Remove(tmpFile)
-			}
+			os.Remove(tmpFile)
 			return
 		}
 		if err = f2.Close(); err != nil {