Skip to content

Commit 4d4296a

Browse files
committed
1 parent 5b4caaf commit 4d4296a

31 files changed

+1653
-738
lines changed

_scripts/stampImageDir.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ do
4343
cp $pdf $out/$f
4444

4545
out1=$out/$f1$new.pdf
46-
pdfcpu stamp -verbose "resources/GC2018.png, r:0" $out/$f $out1 &> $out/$f1.log
46+
pdfcpu stamp add -verbose "resources/GC2018.png, rot:0" $out/$f $out1 &> $out/$f1.log
4747
if [ $? -eq 1 ]; then
4848
echo "stamp error: $pdf -> $out1"
4949
echo

_scripts/stampImageFile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ out=$2
3535
cp $1 $out/$f
3636

3737
out1=$out/$f1$new.pdf
38-
pdfcpu stamp -verbose "resources/GC2018.png:1" $out/$f $out1 &> $out/$f1.log
38+
pdfcpu stamp add -verbose "resources/GC2018.png:1" $out/$f $out1 &> $out/$f1.log
3939
if [ $? -eq 1 ]; then
4040
echo "stamp error: $1 -> $out1"
4141
exit $?

_scripts/stampPDFDir.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ do
4343
cp $pdf $out/$f
4444

4545
out1=$out/$f1$new.pdf
46-
pdfcpu stamp -verbose "$out/$f, o:.9" $out/$f $out1 &> $out/$f1.log
46+
pdfcpu stamp add -verbose "$out/$f, op:.9" $out/$f $out1 &> $out/$f1.log
4747
if [ $? -eq 1 ]; then
4848
echo "stamp error: $pdf -> $out1"
4949
echo

_scripts/stampPDFFile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ out=$2
3535
cp $1 $out/$f
3636

3737
out1=$out/$f1$new.pdf
38-
pdfcpu stamp -verbose "$out/$f" $out/$f $out1 &> $out/$f1.log
38+
pdfcpu stamp add -verbose "$out/$f" $out/$f $out1 &> $out/$f1.log
3939
if [ $? -eq 1 ]; then
4040
echo "stamp error: $1 -> $out1"
4141
exit $?

_scripts/stampTextDir.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ do
4343
cp $pdf $out/$f
4444

4545
out1=$out/$f1$new.pdf
46-
pdfcpu stamp -verbose "Draft, o:.9" $out/$f $out1 &> $out/$f1.log
46+
pdfcpu stamp add -verbose "Draft, op:.9" $out/$f $out1 &> $out/$f1.log
4747
if [ $? -eq 1 ]; then
4848
echo "stamp error: $pdf -> $out1"
4949
echo

_scripts/stampTextFile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ out=$2
3535
cp $1 $out/$f
3636

3737
out1=$out/$f1$new.pdf
38-
pdfcpu stamp -verbose "Draft" $out/$f $out1 &> $out/$f1.log
38+
pdfcpu stamp add -verbose "Draft" $out/$f $out1 &> $out/$f1.log
3939
if [ $? -eq 1 ]; then
4040
echo "stamp error: $1 -> $out1"
4141
exit $?

_scripts/watermarkTextDir.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ do
4343
cp $pdf $out/$f
4444

4545
out1=$out/$f1$new.pdf
46-
pdfcpu watermark -verbose "Draft,m:1" $out/$f $out1 &> $out/$f1.log
46+
pdfcpu watermark add -verbose "Draft, mode:1" $out/$f $out1 &> $out/$f1.log
4747
if [ $? -eq 1 ]; then
4848
echo "watermark error: $pdf -> $out1"
4949
echo

_scripts/watermarkTextFile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ out=$2
3535
cp $1 $out/$f
3636

3737
out1=$out/$f1$new.pdf
38-
pdfcpu watermark -verbose "Draft" $out/$f $out1 &> $out/$f1.log
38+
pdfcpu watermark add -verbose "Draft" $out/$f $out1 &> $out/$f1.log
3939
if [ $? -eq 1 ]; then
4040
echo "watermark error: $1 -> $out1"
4141
exit $?

cmd/pdfcpu/init.go

+164
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
/*
2+
Copyright 2019 The pdfcpu Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package main
18+
19+
import (
20+
"flag"
21+
22+
PDFCPULog "github.com/pdfcpu/pdfcpu/pkg/log"
23+
)
24+
25+
func initCommandMap() {
26+
27+
attachCmdMap := NewCommandMap()
28+
for k, v := range map[string]Command{
29+
"list": {handleListAttachmentsCommand, nil, "", ""},
30+
"add": {handleAddAttachmentsCommand, nil, "", ""},
31+
"remove": {handleRemoveAttachmentsCommand, nil, "", ""},
32+
"extract": {handleExtractAttachmentsCommand, nil, "", ""},
33+
} {
34+
attachCmdMap.Register(k, v)
35+
}
36+
37+
permissionsCmdMap := NewCommandMap()
38+
for k, v := range map[string]Command{
39+
"list": {handleListPermissionsCommand, nil, "", ""},
40+
"set": {handleSetPermissionsCommand, nil, "", ""},
41+
} {
42+
permissionsCmdMap.Register(k, v)
43+
}
44+
45+
pagesCmdMap := NewCommandMap()
46+
for k, v := range map[string]Command{
47+
"insert": {handleInsertPagesCommand, nil, "", ""},
48+
"remove": {handleRemovePagesCommand, nil, "", ""},
49+
} {
50+
pagesCmdMap.Register(k, v)
51+
}
52+
53+
stampCmdMap := NewCommandMap()
54+
for k, v := range map[string]Command{
55+
"add": {handleAddStampsCommand, nil, "", ""},
56+
"remove": {handleRemoveStampsCommand, nil, "", ""},
57+
"update": {handleUpdateStampsCommand, nil, "", ""},
58+
} {
59+
stampCmdMap.Register(k, v)
60+
}
61+
62+
watermarkCmdMap := NewCommandMap()
63+
for k, v := range map[string]Command{
64+
"add": {handleAddWatermarksCommand, nil, "", ""},
65+
"remove": {handleRemoveWatermarksCommand, nil, "", ""},
66+
"update": {handleUpdateWatermarksCommand, nil, "", ""},
67+
} {
68+
watermarkCmdMap.Register(k, v)
69+
}
70+
71+
cmdMap = NewCommandMap()
72+
73+
for k, v := range map[string]Command{
74+
"attachments": {nil, attachCmdMap, usageAttach, usageLongAttach},
75+
"changeopw": {handleChangeOwnerPasswordCommand, nil, usageChangeOwnerPW, usageLongChangeUserPW},
76+
"changeupw": {handleChangeUserPasswordCommand, nil, usageChangeUserPW, usageLongChangeUserPW},
77+
"decrypt": {handleDecryptCommand, nil, usageDecrypt, usageLongDecrypt},
78+
"encrypt": {handleEncryptCommand, nil, usageEncrypt, usageLongEncrypt},
79+
"extract": {handleExtractCommand, nil, usageExtract, usageLongExtract},
80+
"grid": {handleGridCommand, nil, usageGrid, usageLongGrid},
81+
"help": {printHelp, nil, "", ""},
82+
"info": {handleInfoCommand, nil, usageInfo, usageLongInfo},
83+
"import": {handleImportImagesCommand, nil, usageImportImages, usageLongImportImages},
84+
"merge": {handleMergeCommand, nil, usageMerge, usageLongMerge},
85+
"nup": {handleNUpCommand, nil, usageNUp, usageLongNUp},
86+
"n-up": {handleNUpCommand, nil, usageNUp, usageLongNUp},
87+
"optimize": {handleOptimizeCommand, nil, usageOptimize, usageLongOptimize},
88+
"pages": {nil, pagesCmdMap, usagePages, usageLongPages},
89+
"paper": {printPaperSizes, nil, usagePaper, usageLongPaper},
90+
"permissions": {nil, permissionsCmdMap, usagePerm, usageLongPerm},
91+
"rotate": {handleRotateCommand, nil, usageRotate, usageLongRotate},
92+
"split": {handleSplitCommand, nil, usageSplit, usageLongSplit},
93+
"stamp": {nil, stampCmdMap, usageStamp, usageLongStamp},
94+
"trim": {handleTrimCommand, nil, usageTrim, usageLongTrim},
95+
"validate": {handleValidateCommand, nil, usageValidate, usageLongValidate},
96+
"watermark": {nil, watermarkCmdMap, usageWatermark, usageLongWatermark},
97+
"version": {printVersion, nil, usageVersion, usageLongVersion},
98+
} {
99+
cmdMap.Register(k, v)
100+
}
101+
}
102+
103+
func initFlags() {
104+
105+
statsUsage := "optimize: a csv file for stats appending"
106+
flag.StringVar(&fileStats, "stats", "", statsUsage)
107+
flag.StringVar(&fileStats, "s", "", statsUsage)
108+
109+
modeUsage := "validate: strict|relaxed; extract: image|font|content|page|meta; encrypt: rc4|aes"
110+
flag.StringVar(&mode, "mode", "", modeUsage)
111+
flag.StringVar(&mode, "m", "", modeUsage)
112+
113+
keyUsage := "encrypt: 40|128|256"
114+
flag.StringVar(&key, "key", "256", keyUsage)
115+
flag.StringVar(&key, "k", "256", keyUsage)
116+
117+
permUsage := "encrypt, perm set: none|all"
118+
flag.StringVar(&perm, "perm", "none", permUsage)
119+
120+
unitsUsage := "info: po|in|cm|mm"
121+
flag.StringVar(&units, "units", "po", unitsUsage)
122+
flag.StringVar(&units, "u", "po", unitsUsage)
123+
124+
selectedPagesUsage := "a comma separated list of pages or page ranges, see pdfcpu help split/extract"
125+
flag.StringVar(&selectedPages, "pages", "", selectedPagesUsage)
126+
flag.StringVar(&selectedPages, "p", "", selectedPagesUsage)
127+
128+
flag.BoolVar(&quiet, "quiet", false, "")
129+
flag.BoolVar(&quiet, "q", false, "")
130+
131+
flag.BoolVar(&verbose, "verbose", false, "")
132+
flag.BoolVar(&verbose, "v", false, "")
133+
flag.BoolVar(&veryVerbose, "vv", false, "")
134+
135+
flag.StringVar(&upw, "upw", "", "user password")
136+
flag.StringVar(&opw, "opw", "", "owner password")
137+
}
138+
139+
func initLogging(verbose, veryVerbose bool) {
140+
141+
needStackTrace = verbose || veryVerbose
142+
143+
if quiet {
144+
return
145+
}
146+
147+
PDFCPULog.SetDefaultCLILogger()
148+
149+
if verbose || veryVerbose {
150+
PDFCPULog.SetDefaultDebugLogger()
151+
PDFCPULog.SetDefaultInfoLogger()
152+
PDFCPULog.SetDefaultStatsLogger()
153+
}
154+
155+
if veryVerbose {
156+
PDFCPULog.SetDefaultTraceLogger()
157+
//PDFCPULog.SetDefaultParseLogger()
158+
PDFCPULog.SetDefaultReadLogger()
159+
PDFCPULog.SetDefaultValidateLogger()
160+
PDFCPULog.SetDefaultOptimizeLogger()
161+
PDFCPULog.SetDefaultWriteLogger()
162+
}
163+
164+
}

cmd/pdfcpu/main.go

+1-125
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"os"
2424

2525
"github.com/pdfcpu/pdfcpu/pkg/cli"
26-
PDFCPULog "github.com/pdfcpu/pdfcpu/pkg/log"
2726
"github.com/pdfcpu/pdfcpu/pkg/pdfcpu"
2827
)
2928

@@ -36,135 +35,12 @@ var (
3635
cmdMap CommandMap
3736
)
3837

39-
// These will be set by Goreleaser.
38+
// Set by Goreleaser.
4039
var (
4140
commit = "?"
4241
date = "?"
4342
)
4443

45-
func initFlags() {
46-
47-
statsUsage := "optimize: a csv file for stats appending"
48-
flag.StringVar(&fileStats, "stats", "", statsUsage)
49-
flag.StringVar(&fileStats, "s", "", statsUsage)
50-
51-
modeUsage := "validate: strict|relaxed; extract: image|font|content|page|meta; encrypt: rc4|aes"
52-
flag.StringVar(&mode, "mode", "", modeUsage)
53-
flag.StringVar(&mode, "m", "", modeUsage)
54-
55-
keyUsage := "encrypt: 40|128|256"
56-
flag.StringVar(&key, "key", "256", keyUsage)
57-
flag.StringVar(&key, "k", "256", keyUsage)
58-
59-
permUsage := "encrypt, perm set: none|all"
60-
flag.StringVar(&perm, "perm", "none", permUsage)
61-
62-
unitsUsage := "info: po|in|cm|mm"
63-
flag.StringVar(&units, "units", "po", unitsUsage)
64-
flag.StringVar(&units, "u", "po", unitsUsage)
65-
66-
selectedPagesUsage := "a comma separated list of pages or page ranges, see pdfcpu help split/extract"
67-
flag.StringVar(&selectedPages, "pages", "", selectedPagesUsage)
68-
flag.StringVar(&selectedPages, "p", "", selectedPagesUsage)
69-
70-
flag.BoolVar(&quiet, "quiet", false, "")
71-
flag.BoolVar(&quiet, "q", false, "")
72-
73-
flag.BoolVar(&verbose, "verbose", false, "")
74-
flag.BoolVar(&verbose, "v", false, "")
75-
flag.BoolVar(&veryVerbose, "vv", false, "")
76-
77-
flag.StringVar(&upw, "upw", "", "user password")
78-
flag.StringVar(&opw, "opw", "", "owner password")
79-
}
80-
81-
func initCommandMap() {
82-
83-
attachCmdMap := NewCommandMap()
84-
for k, v := range map[string]Command{
85-
"list": {handleListAttachmentsCommand, nil, "", ""},
86-
"add": {handleAddAttachmentsCommand, nil, "", ""},
87-
"remove": {handleRemoveAttachmentsCommand, nil, "", ""},
88-
"extract": {handleExtractAttachmentsCommand, nil, "", ""},
89-
} {
90-
attachCmdMap.Register(k, v)
91-
}
92-
93-
permissionsCmdMap := NewCommandMap()
94-
for k, v := range map[string]Command{
95-
"list": {handleListPermissionsCommand, nil, "", ""},
96-
"set": {handleSetPermissionsCommand, nil, "", ""},
97-
} {
98-
permissionsCmdMap.Register(k, v)
99-
}
100-
101-
pagesCmdMap := NewCommandMap()
102-
for k, v := range map[string]Command{
103-
"insert": {handleInsertPagesCommand, nil, "", ""},
104-
"remove": {handleRemovePagesCommand, nil, "", ""},
105-
} {
106-
pagesCmdMap.Register(k, v)
107-
}
108-
109-
cmdMap = NewCommandMap()
110-
111-
for k, v := range map[string]Command{
112-
"attachments": {nil, attachCmdMap, usageAttach, usageLongAttach},
113-
"changeopw": {handleChangeOwnerPasswordCommand, nil, usageChangeOwnerPW, usageLongChangeUserPW},
114-
"changeupw": {handleChangeUserPasswordCommand, nil, usageChangeUserPW, usageLongChangeUserPW},
115-
"decrypt": {handleDecryptCommand, nil, usageDecrypt, usageLongDecrypt},
116-
"encrypt": {handleEncryptCommand, nil, usageEncrypt, usageLongEncrypt},
117-
"extract": {handleExtractCommand, nil, usageExtract, usageLongExtract},
118-
"grid": {handleGridCommand, nil, usageGrid, usageLongGrid},
119-
"help": {printHelp, nil, "", ""},
120-
"info": {handleInfoCommand, nil, usageInfo, usageLongInfo},
121-
"import": {handleImportImagesCommand, nil, usageImportImages, usageLongImportImages},
122-
"merge": {handleMergeCommand, nil, usageMerge, usageLongMerge},
123-
"nup": {handleNUpCommand, nil, usageNUp, usageLongNUp},
124-
"n-up": {handleNUpCommand, nil, usageNUp, usageLongNUp},
125-
"optimize": {handleOptimizeCommand, nil, usageOptimize, usageLongOptimize},
126-
"pages": {nil, pagesCmdMap, usagePages, usageLongPages},
127-
"paper": {printPaperSizes, nil, usagePaper, usageLongPaper},
128-
"permissions": {nil, permissionsCmdMap, usagePerm, usageLongPerm},
129-
"rotate": {handleRotateCommand, nil, usageRotate, usageLongRotate},
130-
"split": {handleSplitCommand, nil, usageSplit, usageLongSplit},
131-
"stamp": {handleAddStampsCommand, nil, usageStamp, usageLongStamp},
132-
"trim": {handleTrimCommand, nil, usageTrim, usageLongTrim},
133-
"validate": {handleValidateCommand, nil, usageValidate, usageLongValidate},
134-
"watermark": {handleAddWatermarksCommand, nil, usageWatermark, usageLongWatermark},
135-
"version": {printVersion, nil, usageVersion, usageLongVersion},
136-
} {
137-
cmdMap.Register(k, v)
138-
}
139-
}
140-
141-
func initLogging(verbose, veryVerbose bool) {
142-
143-
needStackTrace = verbose || veryVerbose
144-
145-
if quiet {
146-
return
147-
}
148-
149-
PDFCPULog.SetDefaultCLILogger()
150-
151-
if verbose || veryVerbose {
152-
PDFCPULog.SetDefaultDebugLogger()
153-
PDFCPULog.SetDefaultInfoLogger()
154-
PDFCPULog.SetDefaultStatsLogger()
155-
}
156-
157-
if veryVerbose {
158-
PDFCPULog.SetDefaultTraceLogger()
159-
//PDFCPULog.SetDefaultParseLogger()
160-
PDFCPULog.SetDefaultReadLogger()
161-
PDFCPULog.SetDefaultValidateLogger()
162-
PDFCPULog.SetDefaultOptimizeLogger()
163-
PDFCPULog.SetDefaultWriteLogger()
164-
}
165-
166-
}
167-
16844
func init() {
16945
initFlags()
17046
initCommandMap()

0 commit comments

Comments
 (0)