Skip to content

Commit 9d2b1cf

Browse files
authored
Merge pull request #588 from unidoc-build/prep-rc-v4.2.0
Release v4.2.0
2 parents 45d7351 + dcf1306 commit 9d2b1cf

File tree

66 files changed

+17294
-16982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+17294
-16982
lines changed

ACKNOWLEDGEMENTS.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,4 +286,39 @@ Copyright 2012 Mozilla Foundation
286286
See the License for the specific language governing permissions and
287287
limitations under the License.
288288
289+
```
290+
291+
* [PKCS#12 implementation](https://github.com/SSLMate/go-pkcs12), BSD 3-Clause "New" or "Revised" License:
292+
293+
```
294+
295+
Copyright (c) 2015, 2018, 2019 Opsmate, Inc. All rights reserved.
296+
Copyright (c) 2009 The Go Authors. All rights reserved.
297+
298+
Redistribution and use in source and binary forms, with or without
299+
modification, are permitted provided that the following conditions are
300+
met:
301+
302+
* Redistributions of source code must retain the above copyright
303+
notice, this list of conditions and the following disclaimer.
304+
* Redistributions in binary form must reproduce the above
305+
copyright notice, this list of conditions and the following disclaimer
306+
in the documentation and/or other materials provided with the
307+
distribution.
308+
* Neither the name of Google Inc. nor the names of its
309+
contributors may be used to endorse or promote products derived from
310+
this software without specific prior written permission.
311+
312+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
313+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
314+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
315+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
316+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
317+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
318+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
319+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
320+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
321+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
322+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
323+
289324
```

annotator/annotator.go

Lines changed: 459 additions & 453 deletions
Large diffs are not rendered by default.

common/common.go

Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,101 +10,103 @@
1010
// terms that can be accessed at https://unidoc.io/eula/
1111

1212
// Package common contains common properties used by the subpackages.
13-
package common ;import (_e "fmt";_dd "io";_c "os";_d "path/filepath";_b "runtime";_ab "time";);
13+
package common ;import (_f "fmt";_d "io";_ee "os";_e "path/filepath";_bb "runtime";_b "time";);
1414

15-
// IsLogLevel returns true from dummy logger.
16-
func (DummyLogger )IsLogLevel (level LogLevel )bool {return true };func (_gdb WriterLogger )logToWriter (_da _dd .Writer ,_fg string ,_gf string ,_dfd ...interface{}){_ee (_da ,_fg ,_gf ,_dfd );};
15+
// Logger is the interface used for logging in the unipdf package.
16+
type Logger interface{Error (_a string ,_da ...interface{});Warning (_ac string ,_eg ...interface{});Notice (_c string ,_ea ...interface{});Info (_dd string ,_ag ...interface{});Debug (_cf string ,_fc ...interface{});Trace (_ca string ,_dc ...interface{});
17+
IsLogLevel (_af LogLevel )bool ;};func _dec (_gb _d .Writer ,_fae string ,_gde string ,_bad ...interface{}){_ ,_aeb ,_ega ,_cgc :=_bb .Caller (3);if !_cgc {_aeb ="\u003f\u003f\u003f";_ega =0;}else {_aeb =_e .Base (_aeb );};_cae :=_f .Sprintf ("\u0025s\u0020\u0025\u0073\u003a\u0025\u0064 ",_fae ,_aeb ,_ega )+_gde +"\u000a";
18+
_f .Fprintf (_gb ,_cae ,_bad ...);};
1719

18-
// Error logs error message.
19-
func (_bcb WriterLogger )Error (format string ,args ...interface{}){if _bcb .LogLevel >=LogLevelError {_gc :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_bcb .logToWriter (_bcb .Output ,_gc ,format ,args ...);};};const _egd ="\u0032\u0020\u004aan\u0075\u0061\u0072\u0079\u0020\u0032\u0030\u0030\u0036\u0020\u0061\u0074\u0020\u0031\u0035\u003a\u0030\u0034";
20+
// UtcTimeFormat returns a formatted string describing a UTC timestamp.
21+
func UtcTimeFormat (t _b .Time )string {return t .Format (_bec )+"\u0020\u0055\u0054\u0043"};
2022

23+
// NewWriterLogger creates new 'writer' logger.
24+
func NewWriterLogger (logLevel LogLevel ,writer _d .Writer )*WriterLogger {_fde :=WriterLogger {Output :writer ,LogLevel :logLevel };return &_fde ;};
2125

22-
// DummyLogger does nothing.
23-
type DummyLogger struct{};
26+
// WriterLogger is the logger that writes data to the Output writer
27+
type WriterLogger struct{LogLevel LogLevel ;Output _d .Writer ;};const _gg =2025;
2428

25-
// Trace does nothing for dummy logger.
26-
func (DummyLogger )Trace (format string ,args ...interface{}){};
29+
// NewConsoleLogger creates new console logger.
30+
func NewConsoleLogger (logLevel LogLevel )*ConsoleLogger {return &ConsoleLogger {LogLevel :logLevel }};
31+
32+
// Warning logs warning message.
33+
func (_bd ConsoleLogger )Warning (format string ,args ...interface{}){if _bd .LogLevel >=LogLevelWarning {_bbf :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_bd .output (_ee .Stdout ,_bbf ,format ,args ...);};};const _bcg =30;var ReleasedAt =_b .Date (_gg ,_cc ,_ead ,_ccc ,_bcg ,0,0,_b .UTC );
2734

28-
// LogLevel is the verbosity level for logging.
29-
type LogLevel int ;const _gbe =2025;
3035

3136
// Debug logs debug message.
32-
func (_dce ConsoleLogger )Debug (format string ,args ...interface{}){if _dce .LogLevel >=LogLevelDebug {_f :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_dce .output (_c .Stdout ,_f ,format ,args ...);};};
37+
func (_ba ConsoleLogger )Debug (format string ,args ...interface{}){if _ba .LogLevel >=LogLevelDebug {_df :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_ba .output (_ee .Stdout ,_df ,format ,args ...);};};
38+
39+
// IsLogLevel returns true if log level is greater or equal than `level`.
40+
// Can be used to avoid resource intensive calls to loggers.
41+
func (_bc WriterLogger )IsLogLevel (level LogLevel )bool {return _bc .LogLevel >=level };
42+
43+
// Error logs error message.
44+
func (_eae ConsoleLogger )Error (format string ,args ...interface{}){if _eae .LogLevel >=LogLevelError {_ef :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_eae .output (_ee .Stdout ,_ef ,format ,args ...);};};
3345

3446
// ConsoleLogger is a logger that writes logs to the 'os.Stdout'
3547
type ConsoleLogger struct{LogLevel LogLevel ;};
3648

3749
// Notice logs notice message.
38-
func (_df WriterLogger )Notice (format string ,args ...interface{}){if _df .LogLevel >=LogLevelNotice {_de :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_df .logToWriter (_df .Output ,_de ,format ,args ...);};};
50+
func (_ce ConsoleLogger )Notice (format string ,args ...interface{}){if _ce .LogLevel >=LogLevelNotice {_ec :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_ce .output (_ee .Stdout ,_ec ,format ,args ...);};};
3951

40-
// Error does nothing for dummy logger.
41-
func (DummyLogger )Error (format string ,args ...interface{}){};
52+
// DummyLogger does nothing.
53+
type DummyLogger struct{};
4254

4355
// Info logs info message.
44-
func (_def WriterLogger )Info (format string ,args ...interface{}){if _def .LogLevel >=LogLevelInfo {_fc :="\u005bI\u004e\u0046\u004f\u005d\u0020";_def .logToWriter (_def .Output ,_fc ,format ,args ...);};};
45-
46-
// Logger is the interface used for logging in the unipdf package.
47-
type Logger interface{Error (_g string ,_ge ...interface{});Warning (_bd string ,_ae ...interface{});Notice (_gg string ,_bc ...interface{});Info (_ea string ,_ac ...interface{});Debug (_cf string ,_ce ...interface{});Trace (_acf string ,_dc ...interface{});
48-
IsLogLevel (_eg LogLevel )bool ;};
56+
func (_efd WriterLogger )Info (format string ,args ...interface{}){if _efd .LogLevel >=LogLevelInfo {_ebc :="\u005bI\u004e\u0046\u004f\u005d\u0020";_efd .logToWriter (_efd .Output ,_ebc ,format ,args ...);};};func (_dg WriterLogger )logToWriter (_fca _d .Writer ,_ace string ,_fad string ,_ece ...interface{}){_dec (_fca ,_ace ,_fad ,_ece );
57+
};
4958

50-
// Notice logs notice message.
51-
func (_bdd ConsoleLogger )Notice (format string ,args ...interface{}){if _bdd .LogLevel >=LogLevelNotice {_cc :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_bdd .output (_c .Stdout ,_cc ,format ,args ...);};};
59+
// SetLogger sets 'logger' to be used by the unidoc unipdf library.
60+
func SetLogger (logger Logger ){Log =logger };
5261

53-
// Trace logs trace message.
54-
func (_dge WriterLogger )Trace (format string ,args ...interface{}){if _dge .LogLevel >=LogLevelTrace {_fe :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_dge .logToWriter (_dge .Output ,_fe ,format ,args ...);};};func (_ceb ConsoleLogger )output (_af _dd .Writer ,_eae string ,_ccd string ,_fb ...interface{}){_ee (_af ,_eae ,_ccd ,_fb ...);
55-
};var Log Logger =DummyLogger {};
62+
// Error logs error message.
63+
func (_cb WriterLogger )Error (format string ,args ...interface{}){if _cb .LogLevel >=LogLevelError {_eb :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_cb .logToWriter (_cb .Output ,_eb ,format ,args ...);};};const Version ="\u0034\u002e\u0032.\u0030";
5664

57-
// WriterLogger is the logger that writes data to the Output writer
58-
type WriterLogger struct{LogLevel LogLevel ;Output _dd .Writer ;};
5965

60-
// IsLogLevel returns true if log level is greater or equal than `level`.
61-
// Can be used to avoid resource intensive calls to loggers.
62-
func (_ag ConsoleLogger )IsLogLevel (level LogLevel )bool {return _ag .LogLevel >=level };
66+
// Notice does nothing for dummy logger.
67+
func (DummyLogger )Notice (format string ,args ...interface{}){};
6368

64-
// Info logs info message.
65-
func (_cd ConsoleLogger )Info (format string ,args ...interface{}){if _cd .LogLevel >=LogLevelInfo {_gd :="\u005bI\u004e\u0046\u004f\u005d\u0020";_cd .output (_c .Stdout ,_gd ,format ,args ...);};};
69+
// Trace logs trace message.
70+
func (_fce ConsoleLogger )Trace (format string ,args ...interface{}){if _fce .LogLevel >=LogLevelTrace {_cd :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_fce .output (_ee .Stdout ,_cd ,format ,args ...);};};
6671

67-
// UtcTimeFormat returns a formatted string describing a UTC timestamp.
68-
func UtcTimeFormat (t _ab .Time )string {return t .Format (_egd )+"\u0020\u0055\u0054\u0043"};const _aae =6;
72+
// Trace does nothing for dummy logger.
73+
func (DummyLogger )Trace (format string ,args ...interface{}){};
6974

70-
// Info does nothing for dummy logger.
71-
func (DummyLogger )Info (format string ,args ...interface{}){};
75+
// Trace logs trace message.
76+
func (_gd WriterLogger )Trace (format string ,args ...interface{}){if _gd .LogLevel >=LogLevelTrace {_fcg :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_gd .logToWriter (_gd .Output ,_fcg ,format ,args ...);};};
7277

73-
// Warning logs warning message.
74-
func (_ba ConsoleLogger )Warning (format string ,args ...interface{}){if _ba .LogLevel >=LogLevelWarning {_aa :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_ba .output (_c .Stdout ,_aa ,format ,args ...);};};
78+
// Debug does nothing for dummy logger.
79+
func (DummyLogger )Debug (format string ,args ...interface{}){};
7580

7681
// Debug logs debug message.
77-
func (_fbe WriterLogger )Debug (format string ,args ...interface{}){if _fbe .LogLevel >=LogLevelDebug {_abg :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_fbe .logToWriter (_fbe .Output ,_abg ,format ,args ...);};};
78-
79-
// NewConsoleLogger creates new console logger.
80-
func NewConsoleLogger (logLevel LogLevel )*ConsoleLogger {return &ConsoleLogger {LogLevel :logLevel }};const _fdg =23;const _ad =30;var ReleasedAt =_ab .Date (_gbe ,_aae ,_fdg ,_feb ,_ad ,0,0,_ab .UTC );
81-
82-
// Trace logs trace message.
83-
func (_dg ConsoleLogger )Trace (format string ,args ...interface{}){if _dg .LogLevel >=LogLevelTrace {_fd :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_dg .output (_c .Stdout ,_fd ,format ,args ...);};};
82+
func (_afb WriterLogger )Debug (format string ,args ...interface{}){if _afb .LogLevel >=LogLevelDebug {_ege :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_afb .logToWriter (_afb .Output ,_ege ,format ,args ...);};};const _bec ="\u0032\u0020\u004aan\u0075\u0061\u0072\u0079\u0020\u0032\u0030\u0030\u0036\u0020\u0061\u0074\u0020\u0031\u0035\u003a\u0030\u0034";
8483

85-
// Notice does nothing for dummy logger.
86-
func (DummyLogger )Notice (format string ,args ...interface{}){};
8784

88-
// Debug does nothing for dummy logger.
89-
func (DummyLogger )Debug (format string ,args ...interface{}){};const Version ="\u0034\u002e\u0031.\u0030";const _feb =15;
85+
// Info does nothing for dummy logger.
86+
func (DummyLogger )Info (format string ,args ...interface{}){};
9087

91-
// Warning logs warning message.
92-
func (_fda WriterLogger )Warning (format string ,args ...interface{}){if _fda .LogLevel >=LogLevelWarning {_ged :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_fda .logToWriter (_fda .Output ,_ged ,format ,args ...);};};
88+
// Notice logs notice message.
89+
func (_ge WriterLogger )Notice (format string ,args ...interface{}){if _ge .LogLevel >=LogLevelNotice {_cg :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_ge .logToWriter (_ge .Output ,_cg ,format ,args ...);};};
9390

94-
// Error logs error message.
95-
func (_agc ConsoleLogger )Error (format string ,args ...interface{}){if _agc .LogLevel >=LogLevelError {_cfb :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_agc .output (_c .Stdout ,_cfb ,format ,args ...);};};
91+
// Info logs info message.
92+
func (_de ConsoleLogger )Info (format string ,args ...interface{}){if _de .LogLevel >=LogLevelInfo {_fd :="\u005bI\u004e\u0046\u004f\u005d\u0020";_de .output (_ee .Stdout ,_fd ,format ,args ...);};};
9693

9794
// IsLogLevel returns true if log level is greater or equal than `level`.
9895
// Can be used to avoid resource intensive calls to loggers.
99-
func (_gb WriterLogger )IsLogLevel (level LogLevel )bool {return _gb .LogLevel >=level };
96+
func (_bbc ConsoleLogger )IsLogLevel (level LogLevel )bool {return _bbc .LogLevel >=level };const _cc =7;const (LogLevelTrace LogLevel =5;LogLevelDebug LogLevel =4;LogLevelInfo LogLevel =3;LogLevelNotice LogLevel =2;LogLevelWarning LogLevel =1;LogLevelError LogLevel =0;
97+
);const _ead =26;
10098

101-
// NewWriterLogger creates new 'writer' logger.
102-
func NewWriterLogger (logLevel LogLevel ,writer _dd .Writer )*WriterLogger {_eb :=WriterLogger {Output :writer ,LogLevel :logLevel };return &_eb ;};const (LogLevelTrace LogLevel =5;LogLevelDebug LogLevel =4;LogLevelInfo LogLevel =3;LogLevelNotice LogLevel =2;
103-
LogLevelWarning LogLevel =1;LogLevelError LogLevel =0;);func _ee (_cce _dd .Writer ,_dgg string ,_gfc string ,_ef ...interface{}){_ ,_aga ,_be ,_ec :=_b .Caller (3);if !_ec {_aga ="\u003f\u003f\u003f";_be =0;}else {_aga =_d .Base (_aga );};_aag :=_e .Sprintf ("\u0025s\u0020\u0025\u0073\u003a\u0025\u0064 ",_dgg ,_aga ,_be )+_gfc +"\u000a";
104-
_e .Fprintf (_cce ,_aag ,_ef ...);};
99+
// Error does nothing for dummy logger.
100+
func (DummyLogger )Error (format string ,args ...interface{}){};func (_aff ConsoleLogger )output (_ab _d .Writer ,_afd string ,_bda string ,_fa ...interface{}){_dec (_ab ,_afd ,_bda ,_fa ...);};
101+
102+
// IsLogLevel returns true from dummy logger.
103+
func (DummyLogger )IsLogLevel (level LogLevel )bool {return true };
104+
105+
// Warning logs warning message.
106+
func (_bdf WriterLogger )Warning (format string ,args ...interface{}){if _bdf .LogLevel >=LogLevelWarning {_be :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_bdf .logToWriter (_bdf .Output ,_be ,format ,args ...);};};
105107

106108
// Warning does nothing for dummy logger.
107-
func (DummyLogger )Warning (format string ,args ...interface{}){};
109+
func (DummyLogger )Warning (format string ,args ...interface{}){};const _ccc =15;
108110

109-
// SetLogger sets 'logger' to be used by the unidoc unipdf library.
110-
func SetLogger (logger Logger ){Log =logger };
111+
// LogLevel is the verbosity level for logging.
112+
type LogLevel int ;var Log Logger =DummyLogger {};

common/license/license.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
// terms that can be accessed at https://unidoc.io/eula/
1111

1212
// Package license helps manage commercial licenses and check if they are valid for the version of unipdf used.
13-
package license ;import _c "github.com/unidoc/unipdf/v4/internal/license";const (LicenseTierUnlicensed =_c .LicenseTierUnlicensed ;LicenseTierCommunity =_c .LicenseTierCommunity ;LicenseTierIndividual =_c .LicenseTierIndividual ;LicenseTierBusiness =_c .LicenseTierBusiness ;
14-
);func SetMeteredKeyUsageLogVerboseMode (val bool ){_c .SetMeteredKeyUsageLogVerboseMode (val )};
13+
package license ;import _e "github.com/unidoc/unipdf/v4/internal/license";
14+
15+
// LicenseKey represents a loaded license key.
16+
type LicenseKey =_e .LicenseKey ;
17+
18+
// GetLicenseKey returns the currently loaded license key.
19+
func GetLicenseKey ()*LicenseKey {return _e .GetLicenseKey ()};
20+
21+
// SetLicenseKey sets and validates the license key.
22+
func SetLicenseKey (content string ,customerName string )error {return _e .SetLicenseKey (content ,customerName );};func SetMeteredKeyUsageLogVerboseMode (val bool ){_e .SetMeteredKeyUsageLogVerboseMode (val )};
1523

1624
// GetMeteredState checks the currently used metered document usage status,
1725
// documents used and credits available.
18-
func GetMeteredState ()(_c .MeteredStatus ,error ){return _c .GetMeteredState ()};
26+
func GetMeteredState ()(_e .MeteredStatus ,error ){return _e .GetMeteredState ()};const (LicenseTierUnlicensed =_e .LicenseTierUnlicensed ;LicenseTierCommunity =_e .LicenseTierCommunity ;LicenseTierIndividual =_e .LicenseTierIndividual ;LicenseTierBusiness =_e .LicenseTierBusiness ;
27+
);
1928

2029
// MakeUnlicensedKey returns a default key.
21-
func MakeUnlicensedKey ()*LicenseKey {return _c .MakeUnlicensedKey ()};
30+
func MakeUnlicensedKey ()*LicenseKey {return _e .MakeUnlicensedKey ()};
2231

23-
// SetLicenseKey sets and validates the license key.
24-
func SetLicenseKey (content string ,customerName string )error {return _c .SetLicenseKey (content ,customerName );};
32+
// SetMeteredKey sets the metered API key required for SaaS operation.
33+
// Document usage is reported periodically for the product to function correctly.
34+
func SetMeteredKey (apiKey string )error {return _e .SetMeteredKey (apiKey )};
2535

2636
// SetMeteredKeyPersistentCache sets the metered License API Key persistent cache.
2737
// Default value 'true', set to `false` will report the usage immediately to license server,
2838
// this can be used when there's no access to persistent data storage.
29-
func SetMeteredKeyPersistentCache (val bool ){_c .SetMeteredKeyPersistentCache (val )};
30-
31-
// SetMeteredKey sets the metered API key required for SaaS operation.
32-
// Document usage is reported periodically for the product to function correctly.
33-
func SetMeteredKey (apiKey string )error {return _c .SetMeteredKey (apiKey )};
34-
35-
// GetLicenseKey returns the currently loaded license key.
36-
func GetLicenseKey ()*LicenseKey {return _c .GetLicenseKey ()};
37-
38-
// LicenseKey represents a loaded license key.
39-
type LicenseKey =_c .LicenseKey ;
39+
func SetMeteredKeyPersistentCache (val bool ){_e .SetMeteredKeyPersistentCache (val )};

0 commit comments

Comments
 (0)