<table><tr><td style="">rthomsen requested changes to this revision.<br />rthomsen 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/D27181">View Revision</a></tr></table><br /><div><div><p>Almost ready :)</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/D27181#inline-168149">View Inline</a><span style="color: #4b4d51; font-weight: bold;">cliinterface.cpp:598-600</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 class="n"><span class="bright">Kerfuffle</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">OverwriteQuery</span></span><span class="bright"> </span><span class="n"><span class="bright">query</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">absDestEntry</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">absolute</span>File<span class="bright">Path</span></span><span class="bright"></span><span class="p"><span class="bright">());</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span class="n"><span class="bright">relEntry</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">fileTime</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">QFileDevice</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="n">File<span class="bright">ModificationTime</span></span><span class="bright"></span><span class="p"><span class="bright">),</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">relEntry</span><span class="p">.</span><span class="n">fileTime</span><span class="p">(</span><span class="n">QFileDevice</span><span style="color: #aa2211">::</span><span class="n">FileModificationTime</span><span class="p">),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">relEntry</span><span class="p">.</span><span class="n">size</span><span class="p">()</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;"><tt style="background: #ebebeb; font-size: 13px;">dirIt.filePath()</tt> points to the source file so create a <tt style="background: #ebebeb; font-size: 13px;">QFileInfo</tt> and use that to get the properties. Also please use <tt style="background: #ebebeb; font-size: 13px;">QFileInfo::birthTime()</tt> and <tt style="background: #ebebeb; font-size: 13px;">QFileInfo::lastModified()</tt> here to get ctime and mtime, respectively.</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/D27181#inline-168151">View Inline</a><span style="color: #4b4d51; font-weight: bold;">cliinterface.cpp:979</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>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">Kerfuffle</span><span style="color: #aa2211">::</span><span class="n">OverwriteQuery</span> <span class="n">query</span><span class="p">(</span><span class="n">QDir</span><span style="color: #aa2211">::</span><span class="n">current</span><span class="p">().</span><span class="n">path</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span class="n">QLatin1Char</span><span class="p">(</span> <span style="color: #766510">'/'</span> <span class="p">)</span> <span style="color: #aa2211">+</span> <span class="n">m_storedFileName<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">);</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span class="bright"> </span><span class="n"><span class="bright">QFileInfo</span></span><span class="bright"> </span><span class="n"><span class="bright">fileInfo</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="n"><span class="bright">QFileInfo</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">m_storedFileName</span></span><span class="bright"></span><span class="p"><span class="bright">);</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Kerfuffle</span><span style="color: #aa2211">::</span><span class="n">OverwriteQuery</span> <span class="n">query</span><span class="p">(</span><span class="n">QDir</span><span style="color: #aa2211">::</span><span class="n">current</span><span class="p">().</span><span class="n">path</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span class="n">QLatin1Char</span><span class="p">(</span> <span style="color: #766510">'/'</span> <span class="p">)</span> <span style="color: #aa2211">+</span> <span class="n">m_storedFileName<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">In this case we can't easily get the properties of the source file, so I guess we should do the same as previously and just send the destination file properties. You should use <tt style="background: #ebebeb; font-size: 13px;">QDir::current().path() + QLatin1Char( '/' ) + m_storedFileName</tt> then.</p>
<p style="padding: 0; margin: 8px;">Also please use <tt style="background: #ebebeb; font-size: 13px;">QFileInfo::birthTime()</tt> and <tt style="background: #ebebeb; font-size: 13px;">QFileInfo::lastModified()</tt>.</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/D27181#inline-168146">View Inline</a><span style="color: #4b4d51; font-weight: bold;">queries.h:85</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 style="color: #a0a000">public</span><span class="p">:</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">explicit</span> <span class="n">OverwriteQuery</span><span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">QString</span><span style="color: #aa2211">&</span> <span class="n">filename</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">explicit</span> <span class="n">OverwriteQuery</span><span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">QString</span><span style="color: #aa2211">&</span> <span class="n">filename<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n"><span class="bright">QDateTime</span></span><span class="bright"> </span><span class="n"><span class="bright">date_src</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n"><span class="bright">QDateTime</span></span><span class="bright"> </span><span class="n"><span class="bright">mdate_src</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n"><span class="bright">qulonglong</span></span><span class="bright"> </span><span class="n"><span class="bright">size_src</span></span><span class="bright"> </span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">void</span> <span style="color: #004012">execute</span><span class="p">()</span> <span class="n">override</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">We mostly use camelcase-style in Ark so please call these arguments: <tt style="background: #ebebeb; font-size: 13px;">ctimeSrc</tt>, <tt style="background: #ebebeb; font-size: 13px;">mtimeSrc</tt> and <tt style="background: #ebebeb; font-size: 13px;">sizeSrc</tt> (and the member variables the same just prefixed with <tt style="background: #ebebeb; font-size: 13px;">m_</tt>.</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/D27181#inline-168144">View Inline</a><span style="color: #4b4d51; font-weight: bold;">singlefileplugin.cpp:123-124</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="bright"> </span><span class="n"><span class="bright">Kerfuffle</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">OverwriteQuery</span></span><span class="bright"> </span><span class="n"><span class="bright">query</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">newFileInfo</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">absoluteFilePath</span></span><span class="bright"></span><span class="p"><span class="bright">(),</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">newFileInfo</span><span class="p">.</span><span class="n">fileTime</span><span class="p">(</span><span class="n">QFileDevice</span><span style="color: #aa2211">::</span><span class="n">FileModificationTime</span><span class="p">),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">newFileInfo</span><span class="p">.</span><span class="n">fileTime</span><span class="p">(</span><span class="n">QFileDevice</span><span style="color: #aa2211">::</span><span class="n">FileModificationTime</span><span class="p">),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">newFileInfo</span><span class="p">.</span><span class="n">size</span><span class="p">()</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Please use <tt style="background: #ebebeb; font-size: 13px;">QFileInfo::birthTime()</tt> and <tt style="background: #ebebeb; font-size: 13px;">QFileInfo::lastModified()</tt>.</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/D27181#inline-168145">View Inline</a><span style="color: #4b4d51; font-weight: bold;">libzipplugin.cpp:651</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="n">Kerfuffle</span><span style="color: #aa2211">::</span><span class="n">OverwriteQuery</span> <span class="n">query</span><span class="p">(</span><span class="n">renamedEntry<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">);</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Kerfuffle</span><span style="color: #aa2211">::</span><span class="n">OverwriteQuery</span> <span class="n">query</span><span class="p">(</span><span class="n">renamedEntry<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QDateTime</span><span style="color: #aa2211">::</span><span class="n">fromSecsSinceEpoch</span><span class="p">(</span><span class="n">statBuffer</span><span class="p">.</span><span class="n">mtime</span><span class="p">),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QDateTime</span><span style="color: #aa2211">::</span><span class="n">fromSecsSinceEpoch</span><span class="p">(</span><span class="n">statBuffer</span><span class="p">.</span><span class="n">mtime</span><span class="p">),</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Zip format doesn't store ctime, so guess it makes sense to pass mtime for both.</p></div></div></div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D27181">https://phabricator.kde.org/D27181</a></div></div><br /><div><strong>To: </strong>papoteur, Ark, elvisangelaccio, rthomsen<br /><strong>Cc: </strong>rthomsen, meven, kde-utils-devel, fbampaloukas, tctara<br /></div>