[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request 126348: Make it possible to provide the metadata in json
From: "Alex Richardson" <arichardson.kde () gmail ! com>
Date: 2015-12-15 15:39:50
Message-ID: 20151215153950.7434.38871 () mimi ! kde ! org
[Download RAW message or body]
--===============4309493529582817314==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/126348/#review89556
-----------------------------------------------------------
src/kpackage/package.cpp (line 24)
<https://git.reviewboard.kde.org/r/126348/#comment61280>
no longer required, right?
src/kpackage/package.cpp (line 916)
<https://git.reviewboard.kde.org/r/126348/#comment61281>
`path.endsWith("/metadata.desktop") || path.endsWith("/metadata.json")`? QRegExp \
seems like overkill here.
- Alex Richardson
On Dec. 15, 2015, 3:24 p.m., Aleix Pol Gonzalez wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/126348/
> -----------------------------------------------------------
>
> (Updated Dec. 15, 2015, 3:24 p.m.)
>
>
> Review request for KDE Frameworks and Plasma.
>
>
> Repository: kpackage
>
>
> Description
> -------
>
> Due to KCoreAddons transition from using desktop files to json files, KPackage \
> ended in a weird state where desktop files were allowed to use desktop files but \
> not json.
> This patch makes sure that manifest.json files are also acceptable.
>
>
> Diffs
> -----
>
> autotests/data/testjsonmetadatapackage/contents/ui/main.qml PRE-CREATION
> autotests/data/testjsonmetadatapackage/metadata.json PRE-CREATION
> autotests/querytest.cpp 0a2f11a
> src/kpackage/package.cpp 8416054
> src/kpackage/packageloader.cpp 1e1e382
> src/kpackage/private/packagejobthread.cpp 444dacc
> src/kpackage/private/packages.cpp 2f6bbcf
>
> Diff: https://git.reviewboard.kde.org/r/126348/diff/
>
>
> Testing
> -------
>
> Tests still pass (except for \
> https://build.kde.org/job/kpackage%20master%20stable-kf5-qt5/37/PLATFORM=Linux,compiler=gcc/testReport/, \
> that is not passing in master). Adds a test plugin with a json file in it.
>
>
> Thanks,
>
> Aleix Pol Gonzalez
>
>
--===============4309493529582817314==
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/126348/">https://git.reviewboard.kde.org/r/126348/</a>
</td>
</tr>
</table>
<br />
<div>
<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/126348/diff/2/?file=422833#file422833line24" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/kpackage/package.cpp</a> <span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<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">24</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="cp">#include "private/packagejobthread_p.h"</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<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;">no \
longer required, right?</p></pre> </div>
</div>
<br />
<div>
<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/126348/diff/2/?file=422833#file422833line916" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/kpackage/package.cpp</a> <span style="font-weight: normal;">
(Diff revision 2)
</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; ">void \
PackagePrivate::updateHash(const QString &basePath, const QString &subPath, \
const QDir &dir, QCryptographicHash &hash)</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">916</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">QString</span> <span class="n">metadataPath</span> <span class="o">=</span> \
<span class="n">rx</span><span class="p">.</span><span class="n">indexIn</span><span \
class="p">(</span><span class="n">path</span><span class="p">)</span> <span \
class="o">?</span> <span class="nl">path</span> <span class="p">:</span> <span \
class="p">(</span><span class="n">path</span> <span class="o">+</span> <span \
class="s">"/metadata.desktop"</span><span class="p">);</span></pre></td> \
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<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;"><code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">path.endsWith("/metadata.desktop") || \
path.endsWith("/metadata.json")</code>? QRegExp seems like overkill here.</p></pre> \
</div> </div>
<br />
<p>- Alex Richardson</p>
<br />
<p>On December 15th, 2015, 3:24 p.m. GMT, Aleix Pol Gonzalez 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 KDE Frameworks and Plasma.</div>
<div>By Aleix Pol Gonzalez.</div>
<p style="color: grey;"><i>Updated Dec. 15, 2015, 3:24 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kpackage
</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;">Due to KCoreAddons transition from using desktop files \
to json files, KPackage ended in a weird state where desktop files were allowed to \
use desktop files but not json.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">This patch makes sure \
that manifest.json files are also acceptable.</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;">Tests still pass (except for \
https://build.kde.org/job/kpackage%20master%20stable-kf5-qt5/37/PLATFORM=Linux,compiler=gcc/testReport/, \
that is not passing in master). Adds a test plugin with a json file in it.</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>autotests/data/testjsonmetadatapackage/contents/ui/main.qml <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>autotests/data/testjsonmetadatapackage/metadata.json <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>autotests/querytest.cpp <span style="color: grey">(0a2f11a)</span></li>
<li>src/kpackage/package.cpp <span style="color: grey">(8416054)</span></li>
<li>src/kpackage/packageloader.cpp <span style="color: grey">(1e1e382)</span></li>
<li>src/kpackage/private/packagejobthread.cpp <span style="color: \
grey">(444dacc)</span></li>
<li>src/kpackage/private/packages.cpp <span style="color: \
grey">(2f6bbcf)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/126348/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============4309493529582817314==--
[Attachment #3 (text/plain)]
_______________________________________________
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