<table><tr><td style="">dfaure requested changes to this revision.<br />dfaure added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D10543" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>Thanks for the fix!</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10543#inline-49962" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">karchive.cpp:471</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #74777d"><span class="bright">//</span>qCWarning(KArchiveLog) << "Found" << path << "but it's not a directory";</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCWarning</span><span class="p">(</span><span class="n">KArchiveLog</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"Found"</span> <span style="color: #aa2211"><<</span> <span class="n">path</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"but it's not a directory"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">ent</span><span style="color: #aa2211">-></span><span class="n">isFile</span><span class="p">())</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Please remove this warning, it's ambiguous at this point what the problem is; better have only one clear warning once we know which case we're in.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10543#inline-49966" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">karchive.cpp:472</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #74777d"><span class="bright">//</span>qCWarning(KArchiveLog) << "Found" << path << "but it's not a directory";</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCWarning</span><span class="p">(</span><span class="n">KArchiveLog</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"Found"</span> <span style="color: #aa2211"><<</span> <span class="n">path</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"but it's not a directory"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">ent</span><span style="color: #aa2211">-></span><span class="n">isFile</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">const</span> <span class="n">KArchiveFile</span> <span style="color: #aa2211">*</span><span class="n">file</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">static_cast</span><span style="color: #aa2211"><</span><span style="color: #aa4000">const</span> <span class="n">KArchiveFile</span> <span style="color: #aa2211">*></span><span class="p">(</span><span class="n">ent</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">You can remove this if(), every entry is either a file or a directory, by design.<br />
And the if() confused me, e.g. if it was false, the code below would still talk about an empty file ;). But it can't ever be false, so let's just remove that if().</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10543#inline-49963" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">karchive.cpp:475</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">file</span><span style="color: #aa2211">-></span><span class="n">size</span><span class="p">()</span> <span style="color: #aa2211">></span> <span style="color: #601200">0</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCWarning</span><span class="p">(</span><span class="n">KArchiveLog</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"It's a normal file, bailing out"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">return</span> <span style="color: #aa4000">nullptr</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Obviously that means mentioning "path" in this warning, something about that file being a duplicate.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10543#inline-49965" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">karchive.cpp:480</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCWarning</span><span class="p">(</span><span class="n">KArchiveLog</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"It's an empty file, assuming it is actually a directory and replacing"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">KArchiveEntry</span> <span style="color: #aa2211">*</span><span class="n">myEntry</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">const_cast</span><span style="color: #aa2211"><</span><span class="n">KArchiveEntry</span><span style="color: #aa2211">*></span><span class="p">(</span><span class="n">ent</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">If this can happen, since there's no data loss, maybe a qCDebug is enough?<br />
(this also needs to mention "path" of course)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10543#inline-49961" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kzip.cpp:756</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">setErrorString</span><span class="p">(</span><span class="n">tr</span><span class="p">(</span><span style="color: #766510">"File %1 is in folder %2, but %3 is actually a file."</span><span class="p">).</span><span class="n">arg</span><span class="p">(</span><span class="n">entryName</span><span class="p">).</span><span class="n">arg</span><span class="p">(</span><span class="n">path</span><span class="p">).</span><span class="n">arg</span><span class="p">(</span><span class="n">path</span><span class="p">));</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">delete</span> <span class="n">entry</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Use multi-arg to avoid issues in case one of these strings contains %1.</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">.arg(entryName, path, path)</pre></div></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R243 KArchive</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D10543" rel="noreferrer">https://phabricator.kde.org/D10543</a></div></div><br /><div><strong>To: </strong>sandsmark, dfaure, Frameworks<br /><strong>Cc: </strong>apol, michaelh<br /></div>