[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request 122314: Sanitize whitespace in notification popups
From: "Martin Klapetek" <martin.klapetek () gmail ! com>
Date: 2015-01-29 23:02:40
Message-ID: 20150129230240.13679.45950 () probe ! kde ! org
[Download RAW message or body]
--===============5698804061246373231==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
> On Jan. 29, 2015, 10:31 p.m., David Edmundson wrote:
> > dataengines/notifications/notificationsengine.cpp, line 229
> > <https://git.reviewboard.kde.org/r/122314/diff/1/?file=345703#file345703line229>
> >
> > what about if you had
> >
> > \n \n \n
> >
> > I think this will still leave one.
> >
> > Maybe
> > <br/>(\s*|<br/>)*
>
> David Edmundson wrote:
> oh FFS. Reviewboard removed my asterixes.
>
> https://paste.kde.org/plf9yky4o
Ah right, yeah. Actually the asterisk just outside the parenthesis will do. (though \
that will replace also all single <br/>, not sure how expensive this can be; \
additionally could be like ```<br/>\s*<br/>(\s|<br/>)*``` ...)
- Martin
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/122314/#review75004
-----------------------------------------------------------
On Jan. 29, 2015, 8:14 p.m., Martin Klapetek wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/122314/
> -----------------------------------------------------------
>
> (Updated Jan. 29, 2015, 8:14 p.m.)
>
>
> Review request for Plasma.
>
>
> Bugs: 343532
> https://bugs.kde.org/show_bug.cgi?id=343532
>
>
> Repository: plasma-workspace
>
>
> Description
> -------
>
> While looking into https://bugs.kde.org/show_bug.cgi?id=343532 I noticed that wall \
> sends message always starting with \n, but with our limited space, that makes no \
> sense.
> With this patch the text is first trimmed from whitespace at the beginning and end, \
> then all \ns are converted to <br/> (as before), then the text replaces all \
> remaining inner whitespace with single space and finally, if there are two new \
> lines in succession, it turns it into just one.
> The bug itself, which is about messages from wall not appearing in the popup, will \
> only partially get solved by this as the popup is limited in max height, so it \
> displays at most 3 lines of text and with wall first two lines are already taken, \
> that leaves just one line for the actual message.
> However these are persistant so they get saved in the notification history anyway.
>
>
> Diffs
> -----
>
> dataengines/notifications/notificationsengine.cpp 6e566b4
>
> Diff: https://git.reviewboard.kde.org/r/122314/diff/
>
>
> Testing
> -------
>
> Now I'm able to see the message sent with wall.
>
>
> Thanks,
>
> Martin Klapetek
>
>
--===============5698804061246373231==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/122314/">https://git.reviewboard.kde.org/r/122314/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On January 29th, 2015, 10:31 p.m. CET, <b>David \
Edmundson</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/122314/diff/1/?file=345703#file345703line229" \
style="color: black; font-weight: bold; text-decoration: \
underline;">dataengines/notifications/notificationsengine.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">uint \
NotificationsEngine::Notify(const QString &app_name, uint replaces_id,</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">229</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">bodyFinal</span><span class="p">.</span><span class="n">replace</span><span \
class="p">(</span><span class="n">QRegularExpression</span><span \
class="p">(</span><span class="s">"<br/></span><span \
class="se">\\</span><span class="s">s*<br/>"</span><span \
class="p">),</span> <span class="n">QLatin1String</span><span class="p">(</span><span \
class="s">"<br/>"</span><span class="p">));</span></pre></td> </tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">what \
about if you had</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">\n \n \n</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I \
think this will still leave one.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">Maybe <br/>(\s<em \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;">|<br/>)</em></p></pre> </blockquote>
<p>On January 29th, 2015, 10:32 p.m. CET, <b>David Edmundson</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">oh \
FFS. Reviewboard removed my asterixes.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: \
inherit;">https://paste.kde.org/plf9yky4o</p></pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Ah right, yeah. Actually the asterisk just outside the parenthesis will do. \
(though that will replace also all single <br/>, not sure how expensive this \
can be; additionally could be like <code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;"><br/>\\s*<br/>(\\s|<br/>)*</code> ...)</p></pre> <br />
<p>- Martin</p>
<br />
<p>On January 29th, 2015, 8:14 p.m. CET, Martin Klapetek wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Plasma.</div>
<div>By Martin Klapetek.</div>
<p style="color: grey;"><i>Updated Jan. 29, 2015, 8:14 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://bugs.kde.org/show_bug.cgi?id=343532">343532</a>
</div>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-workspace
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">While looking into \
https://bugs.kde.org/show_bug.cgi?id=343532 I noticed that wall sends message always \
starting with \n, but with our limited space, that makes no sense.</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">With this patch the text is first trimmed from whitespace at the beginning \
and end, then all \ns are converted to <br/> (as before), then the text \
replaces all remaining inner whitespace with single space and finally, if there are \
two new lines in succession, it turns it into just one.</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">The \
bug itself, which is about messages from wall not appearing in the popup, will only \
partially get solved by this as the popup is limited in max height, so it displays at \
most 3 lines of text and with wall first two lines are already taken, that leaves \
just one line for the actual message.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">However these are \
persistant so they get saved in the notification history anyway.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Now I'm able to see the message sent with \
wall.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>dataengines/notifications/notificationsengine.cpp <span style="color: \
grey">(6e566b4)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/122314/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============5698804061246373231==--
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic