Skip to content

Commit 6ae50c4

Browse files
authored
Merge pull request #546 from unidoc-build/prep-rc-v2.6.0
Release v2.6.0
2 parents 6d90d35 + 256a861 commit 6ae50c4

66 files changed

Lines changed: 65335 additions & 65230 deletions

File tree

Some content is hidden

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

algo/algo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
// Use of this source code is governed by the UniDoc End User License Agreement
1010
// terms that can be accessed at https://unidoc.io/eula/
1111

12-
package algo ;func RepeatString (s string ,cnt int )string {if cnt <=0{return "";};_fd :=make ([]byte ,len (s )*cnt );_c :=[]byte (s );for _g :=0;_g < cnt ;_g ++{copy (_fd [_g :],_c );};return string (_fd );};
12+
package algo ;func RepeatString (s string ,cnt int )string {if cnt <=0{return "";};_d :=make ([]byte ,len (s )*cnt );_e :=[]byte (s );for _ea :=0;_ea < cnt ;_ea ++{copy (_d [_ea :],_e );};return string (_d );};

chart/chart.go

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

color/color.go

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

common/axcontrol/axcontrol.go

Lines changed: 358 additions & 356 deletions
Large diffs are not rendered by default.

common/common.go

Lines changed: 362 additions & 358 deletions
Large diffs are not rendered by default.

common/license/license.go

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,40 @@
1111

1212
// Package license helps manage commercial licenses and check if they
1313
// are valid for the version of UniOffice used.
14-
package license ;import _c "github.com/unidoc/unioffice/v2/internal/license";
14+
package license ;import _ga "github.com/unidoc/unioffice/v2/internal/license";
1515

16-
// GetMeteredState checks the currently used metered document usage status,
17-
// documents used and credits available.
18-
func GetMeteredState ()(_c .MeteredStatus ,error ){return _c .GetMeteredState ()};
16+
// GetLicenseKey returns the currently loaded license key.
17+
func GetLicenseKey ()*LicenseKey {return _ga .GetLicenseKey ()};
1918

20-
// SetMeteredKey sets the metered License API key required for SaaS operation.
21-
// Document usage is reported periodically for the product to function correctly.
22-
func SetMeteredKey (apiKey string )error {return _c .SetMeteredKey (apiKey )};
19+
// MakeUnlicensedKey returns a default key.
20+
func MakeUnlicensedKey ()*LicenseKey {return _ga .MakeUnlicensedKey ()};
2321

24-
// LegacyLicense holds the old-style unioffice license information.
25-
type LegacyLicense =_c .LegacyLicense ;const (LicenseTierUnlicensed =_c .LicenseTierUnlicensed ;LicenseTierCommunity =_c .LicenseTierCommunity ;LicenseTierIndividual =_c .LicenseTierIndividual ;LicenseTierBusiness =_c .LicenseTierBusiness ;);
22+
// LegacyLicenseType is the type of license
23+
type LegacyLicenseType =_ga .LegacyLicenseType ;
2624

27-
// LicenseKey represents a loaded license key.
28-
type LicenseKey =_c .LicenseKey ;
25+
// LegacyLicense holds the old-style unioffice license information.
26+
type LegacyLicense =_ga .LegacyLicense ;
2927

3028
// SetLicenseKey sets and validates the license key.
31-
func SetLicenseKey (content string ,customerName string )error {return _c .SetLicenseKey (content ,customerName );};
29+
func SetLicenseKey (content string ,customerName string )error {return _ga .SetLicenseKey (content ,customerName );};
3230

33-
// GetLicenseKey returns the currently loaded license key.
34-
func GetLicenseKey ()*LicenseKey {return _c .GetLicenseKey ()};
35-
36-
// LegacyLicenseType is the type of license
37-
type LegacyLicenseType =_c .LegacyLicenseType ;
31+
// GetMeteredState checks the currently used metered document usage status,
32+
// documents used and credits available.
33+
func GetMeteredState ()(_ga .MeteredStatus ,error ){return _ga .GetMeteredState ()};
3834

3935
// SetMeteredKeyUsageLogVerboseMode sets the metered License API Key usage log verbose mode.
4036
// Default value `false`, set to `true` will log the credit usages and print out to console with log level INFO.
41-
func SetMeteredKeyUsageLogVerboseMode (val bool ){_c .SetMeteredKeyUsageLogVerboseMode (val )};
37+
func SetMeteredKeyUsageLogVerboseMode (val bool ){_ga .SetMeteredKeyUsageLogVerboseMode (val )};const (LicenseTierUnlicensed =_ga .LicenseTierUnlicensed ;LicenseTierCommunity =_ga .LicenseTierCommunity ;LicenseTierIndividual =_ga .LicenseTierIndividual ;
38+
LicenseTierBusiness =_ga .LicenseTierBusiness ;);
4239

43-
// MakeUnlicensedKey returns a default key.
44-
func MakeUnlicensedKey ()*LicenseKey {return _c .MakeUnlicensedKey ()};
40+
// SetMeteredKey sets the metered License API key required for SaaS operation.
41+
// Document usage is reported periodically for the product to function correctly.
42+
func SetMeteredKey (apiKey string )error {return _ga .SetMeteredKey (apiKey )};
4543

4644
// SetMeteredKeyPersistentCache sets the metered License API Key persistent cache.
4745
// Default value `true`, set to `false` will report the usage immediately to license server,
4846
// this can be used when there's no access to persistent data storage.
49-
func SetMeteredKeyPersistentCache (val bool ){_c .SetMeteredKeyPersistentCache (val )};
47+
func SetMeteredKeyPersistentCache (val bool ){_ga .SetMeteredKeyPersistentCache (val )};
48+
49+
// LicenseKey represents a loaded license key.
50+
type LicenseKey =_ga .LicenseKey ;

common/logger/logger.go

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -9,96 +9,95 @@
99
// Use of this source code is governed by the UniDoc End User License Agreement
1010
// terms that can be accessed at https://unidoc.io/eula/
1111

12-
package logger ;import (_c "fmt";_db "io";_af "os";_a "path/filepath";_d "runtime";);
12+
package logger ;import (_f "fmt";_a "io";_e "os";_bf "path/filepath";_b "runtime";);func _fac (_cdb _a .Writer ,_cbg string ,_dfd string ,_bfc ...interface{}){_ ,_de ,_fgd ,_agf :=_b .Caller (3);if !_agf {_de ="\u003f\u003f\u003f";_fgd =0;}else {_de =_bf .Base (_de );
13+
};_bgg :=_f .Sprintf ("\u0025s\u0020\u0025\u0073\u003a\u0025\u0064 ",_cbg ,_de ,_fgd )+_dfd +"\u000a";_f .Fprintf (_cdb ,_bgg ,_bfc ...);};
1314

14-
// Warning logs warning message.
15-
func (_ece ConsoleLogger )Warning (format string ,args ...interface{}){if _ece .LogLevel >=LogLevelWarning {_bc :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_ece .output (_af .Stdout ,_bc ,format ,args ...);};};
15+
// Debug does nothing for dummy logger.
16+
func (DummyLogger )Debug (format string ,args ...interface{}){};
1617

1718
// NewConsoleLogger creates new console logger.
1819
func NewConsoleLogger (logLevel LogLevel )*ConsoleLogger {return &ConsoleLogger {LogLevel :logLevel }};
1920

20-
// Info does nothing for dummy logger.
21-
func (DummyLogger )Info (format string ,args ...interface{}){};
22-
23-
// Notice does nothing for dummy logger.
24-
func (DummyLogger )Notice (format string ,args ...interface{}){};func (_dcb WriterLogger )logToWriter (_eb _db .Writer ,_dge string ,_aa string ,_ebf ...interface{}){_bb (_eb ,_dge ,_aa ,_ebf );};
25-
26-
// DummyLogger does nothing.
27-
type DummyLogger struct{};
28-
29-
// Notice logs notice message.
30-
func (_f ConsoleLogger )Notice (format string ,args ...interface{}){if _f .LogLevel >=LogLevelNotice {_cc :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_f .output (_af .Stdout ,_cc ,format ,args ...);};};
21+
// Warning does nothing for dummy logger.
22+
func (DummyLogger )Warning (format string ,args ...interface{}){};
3123

32-
// LogLevel is the verbosity level for logging.
33-
type LogLevel int ;
24+
// IsLogLevel returns true if log level is greater or equal than `level`.
25+
// Can be used to avoid resource intensive calls to loggers.
26+
func (_caf ConsoleLogger )IsLogLevel (level LogLevel )bool {return _caf .LogLevel >=level };
3427

35-
// Trace logs trace message.
36-
func (_gcg WriterLogger )Trace (format string ,args ...interface{}){if _gcg .LogLevel >=LogLevelTrace {_cd :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_gcg .logToWriter (_gcg .Output ,_cd ,format ,args ...);};};
28+
// ConsoleLogger is a logger that writes logs to the 'os.Stdout'
29+
type ConsoleLogger struct{LogLevel LogLevel ;};const (LogLevelTrace LogLevel =5;LogLevelDebug LogLevel =4;LogLevelInfo LogLevel =3;LogLevelNotice LogLevel =2;LogLevelWarning LogLevel =1;LogLevelError LogLevel =0;);
3730

38-
// Logger is the interface used for logging in the unipdf package.
39-
type Logger interface{Error (_cf string ,_g ...interface{});Warning (_gd string ,_ef ...interface{});Notice (_b string ,_ge ...interface{});Info (_bd string ,_dg ...interface{});Debug (_df string ,_gg ...interface{});Trace (_ad string ,_dbe ...interface{});
40-
IsLogLevel (_gdb LogLevel )bool ;};var Log Logger =DummyLogger {};
31+
// Info does nothing for dummy logger.
32+
func (DummyLogger )Info (format string ,args ...interface{}){};func (_ac WriterLogger )logToWriter (_df _a .Writer ,_fbc string ,_bff string ,_gg ...interface{}){_fac (_df ,_fbc ,_bff ,_gg );};
4133

42-
// Error does nothing for dummy logger.
43-
func (DummyLogger )Error (format string ,args ...interface{}){};
34+
// Notice does nothing for dummy logger.
35+
func (DummyLogger )Notice (format string ,args ...interface{}){};
4436

45-
// IsLogLevel returns true from dummy logger.
46-
func (DummyLogger )IsLogLevel (level LogLevel )bool {return true };
37+
// Info logs info message.
38+
func (_aba ConsoleLogger )Info (format string ,args ...interface{}){if _aba .LogLevel >=LogLevelInfo {_fg :="\u005bI\u004e\u0046\u004f\u005d\u0020";_aba .output (_e .Stdout ,_fg ,format ,args ...);};};
4739

4840
// Trace does nothing for dummy logger.
4941
func (DummyLogger )Trace (format string ,args ...interface{}){};
5042

51-
// IsLogLevel returns true if log level is greater or equal than `level`.
52-
// Can be used to avoid resource intensive calls to loggers.
53-
func (_da WriterLogger )IsLogLevel (level LogLevel )bool {return _da .LogLevel >=level };
43+
// Debug logs debug message.
44+
func (_aa WriterLogger )Debug (format string ,args ...interface{}){if _aa .LogLevel >=LogLevelDebug {_faa :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_aa .logToWriter (_aa .Output ,_faa ,format ,args ...);};};
5445

55-
// Trace logs trace message.
56-
func (_cg ConsoleLogger )Trace (format string ,args ...interface{}){if _cg .LogLevel >=LogLevelTrace {_dc :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_cg .output (_af .Stdout ,_dc ,format ,args ...);};};
46+
// SetLogger sets 'logger' to be used by the unidoc unipdf library.
47+
func SetLogger (logger Logger ){Log =logger };
5748

58-
// Debug does nothing for dummy logger.
59-
func (DummyLogger )Debug (format string ,args ...interface{}){};const (LogLevelTrace LogLevel =5;LogLevelDebug LogLevel =4;LogLevelInfo LogLevel =3;LogLevelNotice LogLevel =2;LogLevelWarning LogLevel =1;LogLevelError LogLevel =0;);
49+
// Warning logs warning message.
50+
func (_gaa WriterLogger )Warning (format string ,args ...interface{}){if _gaa .LogLevel >=LogLevelWarning {_fbb :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_gaa .logToWriter (_gaa .Output ,_fbb ,format ,args ...);};};
6051

61-
// NewWriterLogger creates new 'writer' logger.
62-
func NewWriterLogger (logLevel LogLevel ,writer _db .Writer )*WriterLogger {logger :=WriterLogger {Output :writer ,LogLevel :logLevel };return &logger ;};
52+
// Warning logs warning message.
53+
func (_ag ConsoleLogger )Warning (format string ,args ...interface{}){if _ag .LogLevel >=LogLevelWarning {_fd :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_ag .output (_e .Stdout ,_fd ,format ,args ...);};};
54+
55+
// LogLevel is the verbosity level for logging.
56+
type LogLevel int ;var Log Logger =DummyLogger {};func (_cc ConsoleLogger )output (_bee _a .Writer ,_da string ,_cf string ,_dad ...interface{}){_fac (_bee ,_da ,_cf ,_dad ...);};
57+
58+
// Error logs error message.
59+
func (_bg WriterLogger )Error (format string ,args ...interface{}){if _bg .LogLevel >=LogLevelError {_bcg :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_bg .logToWriter (_bg .Output ,_bcg ,format ,args ...);};};
6360

6461
// Info logs info message.
65-
func (_gc WriterLogger )Info (format string ,args ...interface{}){if _gc .LogLevel >=LogLevelInfo {_aca :="\u005bI\u004e\u0046\u004f\u005d\u0020";_gc .logToWriter (_gc .Output ,_aca ,format ,args ...);};};
62+
func (_ec WriterLogger )Info (format string ,args ...interface{}){if _ec .LogLevel >=LogLevelInfo {_ddc :="\u005bI\u004e\u0046\u004f\u005d\u0020";_ec .logToWriter (_ec .Output ,_ddc ,format ,args ...);};};
6663

6764
// Notice logs notice message.
68-
func (_ea WriterLogger )Notice (format string ,args ...interface{}){if _ea .LogLevel >=LogLevelNotice {_fae :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_ea .logToWriter (_ea .Output ,_fae ,format ,args ...);};};
65+
func (_dg WriterLogger )Notice (format string ,args ...interface{}){if _dg .LogLevel >=LogLevelNotice {_bd :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_dg .logToWriter (_dg .Output ,_bd ,format ,args ...);};};
6966

7067
// Error logs error message.
71-
func (_ee ConsoleLogger )Error (format string ,args ...interface{}){if _ee .LogLevel >=LogLevelError {_bf :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_ee .output (_af .Stdout ,_bf ,format ,args ...);};};
68+
func (_af ConsoleLogger )Error (format string ,args ...interface{}){if _af .LogLevel >=LogLevelError {_gb :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_af .output (_e .Stdout ,_gb ,format ,args ...);};};
7269

73-
// ConsoleLogger is a logger that writes logs to the 'os.Stdout'
74-
type ConsoleLogger struct{LogLevel LogLevel ;};
70+
// Trace logs trace message.
71+
func (_bcge WriterLogger )Trace (format string ,args ...interface{}){if _bcge .LogLevel >=LogLevelTrace {_fab :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_bcge .logToWriter (_bcge .Output ,_fab ,format ,args ...);};};
7572

76-
// Debug logs debug message.
77-
func (_ca ConsoleLogger )Debug (format string ,args ...interface{}){if _ca .LogLevel >=LogLevelDebug {_ed :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_ca .output (_af .Stdout ,_ed ,format ,args ...);};};func _bb (_dab _db .Writer ,_eac string ,_bba string ,_bbd ...interface{}){_ ,_geg ,_eeb ,_cdg :=_d .Caller (3);
78-
if !_cdg {_geg ="\u003f\u003f\u003f";_eeb =0;}else {_geg =_a .Base (_geg );};_dfa :=_c .Sprintf ("\u0025s\u0020\u0025\u0073\u003a\u0025\u0064 ",_eac ,_geg ,_eeb )+_bba +"\u000a";_c .Fprintf (_dab ,_dfa ,_bbd ...);};
73+
// Trace logs trace message.
74+
func (_gc ConsoleLogger )Trace (format string ,args ...interface{}){if _gc .LogLevel >=LogLevelTrace {_be :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_gc .output (_e .Stdout ,_be ,format ,args ...);};};
7975

80-
// Error logs error message.
81-
func (_cb WriterLogger )Error (format string ,args ...interface{}){if _cb .LogLevel >=LogLevelError {_ba :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_cb .logToWriter (_cb .Output ,_ba ,format ,args ...);};};
76+
// Logger is the interface used for logging in the unipdf package.
77+
type Logger interface{Error (_d string ,_fc ...interface{});Warning (_ca string ,_cb ...interface{});Notice (_dc string ,_g ...interface{});Info (_ef string ,_fa ...interface{});Debug (_ab string ,_gf ...interface{});Trace (_fb string ,_eb ...interface{});
78+
IsLogLevel (_bb LogLevel )bool ;};
8279

83-
// Warning does nothing for dummy logger.
84-
func (DummyLogger )Warning (format string ,args ...interface{}){};
80+
// Error does nothing for dummy logger.
81+
func (DummyLogger )Error (format string ,args ...interface{}){};
8582

86-
// Debug logs debug message.
87-
func (_fd WriterLogger )Debug (format string ,args ...interface{}){if _fd .LogLevel >=LogLevelDebug {_eee :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_fd .logToWriter (_fd .Output ,_eee ,format ,args ...);};};func (_dcd ConsoleLogger )output (_ecg _db .Writer ,_fa string ,_gf string ,_ac ...interface{}){_bb (_ecg ,_fa ,_gf ,_ac ...);
88-
};
83+
// NewWriterLogger creates new 'writer' logger.
84+
func NewWriterLogger (logLevel LogLevel ,writer _a .Writer )*WriterLogger {logger :=WriterLogger {Output :writer ,LogLevel :logLevel };return &logger ;};
8985

90-
// Warning logs warning message.
91-
func (_dad WriterLogger )Warning (format string ,args ...interface{}){if _dad .LogLevel >=LogLevelWarning {_feg :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_dad .logToWriter (_dad .Output ,_feg ,format ,args ...);};};
86+
// Notice logs notice message.
87+
func (_ff ConsoleLogger )Notice (format string ,args ...interface{}){if _ff .LogLevel >=LogLevelNotice {_ad :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_ff .output (_e .Stdout ,_ad ,format ,args ...);};};
88+
89+
// IsLogLevel returns true from dummy logger.
90+
func (DummyLogger )IsLogLevel (level LogLevel )bool {return true };
9291

9392
// WriterLogger is the logger that writes data to the Output writer
94-
type WriterLogger struct{LogLevel LogLevel ;Output _db .Writer ;};
93+
type WriterLogger struct{LogLevel LogLevel ;Output _a .Writer ;};
94+
95+
// DummyLogger does nothing.
96+
type DummyLogger struct{};
9597

9698
// IsLogLevel returns true if log level is greater or equal than `level`.
9799
// Can be used to avoid resource intensive calls to loggers.
98-
func (_ec ConsoleLogger )IsLogLevel (level LogLevel )bool {return _ec .LogLevel >=level };
99-
100-
// SetLogger sets 'logger' to be used by the unidoc unipdf library.
101-
func SetLogger (logger Logger ){Log =logger };
100+
func (_dd WriterLogger )IsLogLevel (level LogLevel )bool {return _dd .LogLevel >=level };
102101

103-
// Info logs info message.
104-
func (_fe ConsoleLogger )Info (format string ,args ...interface{}){if _fe .LogLevel >=LogLevelInfo {_gea :="\u005bI\u004e\u0046\u004f\u005d\u0020";_fe .output (_af .Stdout ,_gea ,format ,args ...);};};
102+
// Debug logs debug message.
103+
func (_cd ConsoleLogger )Debug (format string ,args ...interface{}){if _cd .LogLevel >=LogLevelDebug {_ga :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_cd .output (_e .Stdout ,_ga ,format ,args ...);};};

common/tempstorage/diskstore/diskstore.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111

1212
// Package diskstore implements tempStorage interface
1313
// by using disk as a storage
14-
package diskstore ;import (_ab "github.com/unidoc/unioffice/v2/common/tempstorage";_ad "io/ioutil";_d "os";_af "strings";);
14+
package diskstore ;import (_gc "github.com/unidoc/unioffice/v2/common/tempstorage";_ga "io/ioutil";_a "os";_d "strings";);
1515

16-
// SetAsStorage sets temp storage as a disk storage
17-
func SetAsStorage (){_f :=diskStorage {};_ab .SetAsStorage (&_f )};type diskStorage struct{};
18-
19-
// TempFile creates a new temp directory by calling ioutil TempDir
20-
func (_b diskStorage )TempDir (pattern string )(string ,error ){return _ad .TempDir ("",pattern )};
16+
// Open opens file from disk according to a path
17+
func (_f diskStorage )Open (path string )(_gc .File ,error ){return _a .OpenFile (path ,_a .O_RDWR ,0644)};
2118

2219
// TempFile creates a new temp file by calling ioutil TempFile
23-
func (_dc diskStorage )TempFile (dir ,pattern string )(_ab .File ,error ){return _ad .TempFile (dir ,pattern );};
20+
func (_c diskStorage )TempFile (dir ,pattern string )(_gc .File ,error ){return _ga .TempFile (dir ,pattern );};
2421

25-
// Open opens file from disk according to a path
26-
func (_c diskStorage )Open (path string )(_ab .File ,error ){return _d .OpenFile (path ,_d .O_RDWR ,0644)};
22+
// TempFile creates a new temp directory by calling ioutil TempDir
23+
func (_ad diskStorage )TempDir (pattern string )(string ,error ){return _ga .TempDir ("",pattern )};
2724

28-
// RemoveAll removes all files in the directory
29-
func (_g diskStorage )RemoveAll (dir string )error {if _af .HasPrefix (dir ,_d .TempDir ()){return _d .RemoveAll (dir );};return nil ;};
25+
// SetAsStorage sets temp storage as a disk storage
26+
func SetAsStorage (){_b :=diskStorage {};_gc .SetAsStorage (&_b )};
3027

3128
// Add is not applicable in the diskstore implementation
32-
func (_fd diskStorage )Add (path string )error {return nil };
29+
func (_ag diskStorage )Add (path string )error {return nil };type diskStorage struct{};
30+
31+
// RemoveAll removes all files in the directory
32+
func (_ba diskStorage )RemoveAll (dir string )error {if _d .HasPrefix (dir ,_a .TempDir ()){return _a .RemoveAll (dir );};return nil ;};

0 commit comments

Comments
 (0)