Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Sympa
Commits
aa3d128c
Unverified
Commit
aa3d128c
authored
Aug 08, 2019
by
IKEDA Soji
Committed by
GitHub
Aug 08, 2019
Browse files
Merge pull request #722 from ikedas/issue-716_01 by ikedas
Text wrapping consumes large amount of memory.
parents
9089acbd
83f6907e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/lib/Sympa/Tools/Text.pm
View file @
aa3d128c
...
...
@@ -120,19 +120,41 @@ sub wrap_text {
my
$init
=
shift
;
my
$subs
=
shift
;
my
$cols
=
shift
;
$cols
=
78
unless
defined
$cols
;
$init
=
'
'
x
length
(
$init
//
'');
$subs
=
'
'
x
length
(
$subs
//
'');
$cols
//
=
78
;
return
$text
unless
$cols
;
my
$email_re
=
Sympa::Regexps::
email
();
$text
=
Text::
LineFold
->
new
(
Language
=>
Sympa::
Language
->
instance
->
get_lang
,
OutputCharset
=>
(
Encode::
is_utf8
(
$text
)
?
'
_UNICODE_
'
:
'
utf8
'),
Prep
=>
'
NONBREAKURI
',
prep
=>
[
$email_re
,
sub
{
shift
;
@
_
}],
ColumnsMax
=>
$cols
)
->
fold
(
$init
,
$subs
,
$text
);
return
$text
;
my
$linefold
=
Text::
LineFold
->
new
(
Language
=>
Sympa::
Language
->
instance
->
get_lang
,
Prep
=>
'
NONBREAKURI
',
prep
=>
[
$email_re
,
sub
{
shift
;
@
_
}],
ColumnsMax
=>
$cols
,
Format
=>
sub
{
shift
;
my
$event
=
shift
;
my
$str
=
shift
;
if
(
$event
=~
/^eo/
)
{
return
"
\n
";
}
if
(
$event
=~
/^so[tp]/
)
{
return
$init
.
$str
;
}
if
(
$event
eq
'
sol
')
{
return
$subs
.
$str
;
}
undef
;
},
);
my
$t
=
Encode::
is_utf8
(
$text
)
?
$text
:
Encode::
decode_utf8
(
$text
);
my
$ret
=
'';
while
(
1000
<
length
$t
)
{
my
$s
=
substr
$t
,
0
,
1000
;
$ret
.=
$linefold
->
break_partial
(
$s
);
$t
=
substr
$t
,
1000
;
}
$ret
.=
$linefold
->
break_partial
(
$t
)
if
length
$t
;
$ret
.=
$linefold
->
break_partial
(
undef
);
return
Encode::
is_utf8
(
$text
)
?
$ret
:
Encode::
encode_utf8
(
$ret
);
}
sub
decode_filesystem_safe
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment