<table><tr><td style="">dfaure requested changes to this revision.<br />dfaure added inline comments.<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/D8098" rel="noreferrer">View Revision</a></tr></table><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/D8098#inline-37591" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">dfaure</span> wrote in <span style="color: #4b4d51; font-weight: bold;">kio_tags.cpp:119</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">missing KIO::Overwrite support? Can the dest already exist?</p></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I see an added check for "already exists" and an early return (good), but no support for KIO::Overwrite. If the user uses dolphin to copy a tag they might click on "overwrite" and it won't work, if copy() just ignores KIO::Overwrite.</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/D8098#inline-37592" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">dfaure</span> wrote in <span style="color: #4b4d51; font-weight: bold;">kio_tags.cpp:163</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">same question, can dest already exist?<br />
(if so, then the right thing to do is error(), unless <tt style="background: #ebebeb; font-size: 13px;">flags & Overwrite</tt>)</p></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">same issue here, still no support for Overwrite.</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/D8098#inline-37917" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">smithjd</span> wrote in <span style="color: #4b4d51; font-weight: bold;">kio_tags.cpp:292</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">No.</p></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This was a rethorical question :-)<br />
It can fail, see <tt style="background: #ebebeb; font-size: 13px;">TagListJob::start()</tt>, therefore please check the return value of exec().</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/D8098#inline-39882" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kio_tags.cpp:148</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: #aa4000"><span class="bright">case</span></span><span class="bright"> </span><span style="color: #a0a000"><span class="bright">FileUrl</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(251, 175, 175, .7);"> <span class="n">ForwardingSlaveBase</span><span style="color: #aa2211">::</span><span class="n">get</span><span class="p">(<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">QUrl</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">fromL</span>ocal<span class="bright">File</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">fileUrl</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 style="color: #aa4000"><span class="bright">if</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">result</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">urlType</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">LocalUrl</span></span><span class="bright"></span><span class="p"><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">ForwardingSlaveBase</span><span style="color: #aa2211">::</span><span class="n">get</span><span class="p">(<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">result</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">l</span>ocal<span class="bright">Url</span></span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Could be another "else if" for symmetry, or better, this could all be a switch statement.</p>
<p style="padding: 0; margin: 8px;">It still seems odd to me that if it's not invalid, tag, or local, then get() finishes without an error, is that expected?</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/D8098#inline-39883" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kio_tags.cpp:287</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: #aa4000"><span class="bright">void</span></span><span class="bright"> </span><span class="n"><span class="bright">TagsProtocol</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">del</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #aa4000"><span class="bright">const</span></span><span class="bright"> </span><span class="n"><span class="bright">QUrl</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">url</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">bool</span></span><span class="bright"> </span><span class="n"><span class="bright">is</span>file<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 style="color: #74777d"><span class="bright">// The ForwardingSlaveBase functions are always called with a </span>file<span class="bright">:// url</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d">// In this case we just set the newUrl = url</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #aa4000">bool</span> <span class="n">TagsProtocol</span><span style="color: #aa2211">::</span><span class="n">rewriteUrl</span><span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">QUrl</span><span style="color: #aa2211">&</span> <span class="n">url</span><span class="p">,</span> <span class="n">QUrl</span><span style="color: #aa2211">&</span> <span class="n">newURL</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">No you don't ;) This comment confused me.<br />
When calling ForwardingSlaveBase methods with a file URL, rewriteUrl isn't called at all (see <tt style="background: #ebebeb; font-size: 13px;">if (url.scheme() == q->mProtocol) {</tt> in <tt style="background: #ebebeb; font-size: 13px;">ForwardingSlaveBasePrivate::internalRewriteUrl</tt>.</p>
<p style="padding: 0; margin: 8px;">So in fact rewriteUrl() is never called, AFAICS. You could verify that with a Q_ASSERT(false) in here, and extensive testing ;-) Maybe don't commit that though. But at least, if I'm right, change the comment to "So rewriteUrl is never called.".</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/D8098#inline-39885" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kio_tags.cpp:366</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">result</span><span class="p">.</span><span class="n">tag</span><span class="p">.</span><span class="n">endsWith</span><span class="p">(</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">".."</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">result</span><span class="p">.</span><span class="n">tag</span> <span style="color: #aa2211">=</span> <span class="n">result</span><span class="p">.</span><span class="n">tag</span><span class="p">.</span><span class="n">section</span><span class="p">(</span><span class="n">QDir</span><span style="color: #aa2211">::</span><span class="n">separator</span><span class="p">(),</span> <span style="color: #601200">0</span><span class="p">,</span> <span style="color: #aa2211">-</span><span style="color: #601200">3</span><span class="p">);</span>
</div><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 style="color: #aa4000">if</span> <span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="n">tag</span><span class="p">.</span><span class="n">endsWith</span><span class="p">(</span><span class="n">QChar</span><span class="p">(</span><span style="color: #766510">'.'</span><span class="p">))</span> <span style="color: #aa2211">||</span> <span class="n">result</span><span class="p">.</span><span class="n">decodedUrl</span><span class="p">.</span><span class="n">contains</span><span class="p">(</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">chopLastSection</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;">Would it be simpler to use QDir::cleanPath() for all this path cleaning? Just an idea, ignore if bogus.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R293 Baloo</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D8098" rel="noreferrer">https://phabricator.kde.org/D8098</a></div></div><br /><div><strong>To: </strong>smithjd, Frameworks, vhanda, Dolphin, ngraham, dfaure<br /><strong>Cc: </strong>dfaure, nicolasfella, ngraham<br /></div>