<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/D22510">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/D22510#inline-132331">View Inline</a><span style="color: #4b4d51; font-weight: bold;">krun.cpp:1105</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: #aa4000">const</span> <span style="color: #aa4000">bool</span> <span class="n">isFileExecutable</span> <span style="color: #aa2211">=</span> <span class="p">(</span><span class="n">isExecutableFile</span><span class="p">(</span><span class="n">m_strURL</span><span class="p">,</span> <span class="n">mime</span><span class="p">.</span><span class="n">name</span><span class="p">())</span> <span style="color: #aa2211">||</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">mime</span><span class="p">.</span><span class="n">inherits</span><span class="p">(</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"application/x-desktop"</span><span class="p">)));</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">const</span> <span style="color: #aa4000">bool</span> <span class="n">isTextFile</span> <span style="color: #aa2211">=</span> <span class="n">mime</span><span class="p">.</span><span class="n">inherits</span><span class="p">(</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"text/plain"</span><span class="p">));</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This can be removed now that isExecutableFile returns true for desktop files.</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/D22510#inline-132332">View Inline</a><span style="color: #4b4d51; font-weight: bold;">krun.cpp:1389</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="n">runFlags</span> <span style="color: #aa2211">|=</span> <span class="n">KRun</span><span style="color: #aa2211">::</span><span class="n">RunExecutables</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #74777d">//If file is executable but doesn't have +x permission, ask user if he wants to set +x</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 style="color: #aa2211">!</span><span class="n">isExecutableFile</span><span class="p">(</span><span class="n">d</span><span style="color: #aa2211">-></span><span class="n">m_strURL</span><span class="p">,</span> <span class="n">type</span><span class="p">)</span> <span style="color: #aa2211">&&</span> <span class="n">isExecutable</span><span class="p">(</span><span class="n">type</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;">is *an* executable</p>
<p style="padding: 0; margin: 8px;">(otherwise this sentence is very confusing)</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/D22510#inline-132334">View Inline</a><span style="color: #4b4d51; font-weight: bold;">krun.cpp:1390</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: #74777d">//If file is executable but doesn't have +x permission, ask user if he wants to set +x</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 style="color: #aa2211">!</span><span class="n">isExecutableFile</span><span class="p">(</span><span class="n">d</span><span style="color: #aa2211">-></span><span class="n">m_strURL</span><span class="p">,</span> <span class="n">type</span><span class="p">)</span> <span style="color: #aa2211">&&</span> <span class="n">isExecutable</span><span class="p">(</span><span class="n">type</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">KMessageBox</span><span style="color: #aa2211">::</span><span class="n">ButtonCode</span> <span class="n">makeExecutable</span> <span style="color: #aa2211">=</span> <span class="n">KMessageBox</span><span style="color: #aa2211">::</span><span class="n">questionYesNo</span><span class="p">(</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">What happens for desktop files? Won't this go into this code, before going into the existing code to make desktop files executable?</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/D22510#inline-132333">View Inline</a><span style="color: #4b4d51; font-weight: bold;">krun.cpp:1404</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">mode_t</span> <span class="n">newPermissions</span> <span style="color: #aa2211">=</span> <span class="n">binaryFile</span><span class="p">.</span><span class="n">permissions</span><span class="p">()</span> <span style="color: #aa2211">|</span> <span class="n">S_IXUSR</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">KIO</span><span style="color: #aa2211">::</span><span class="n">Job</span><span style="color: #aa2211">*</span> <span class="n">chmodJob</span> <span style="color: #aa2211">=</span> <span class="n">KIO</span><span style="color: #aa2211">::</span><span class="n">chmod</span><span class="p">(</span><span class="n">d</span><span style="color: #aa2211">-></span><span class="n">m_strURL</span><span class="p">,</span> <span class="n">newPermissions</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">connect</span><span class="p">(</span><span class="n">chmodJob</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">KJob</span><span style="color: #aa2211">::</span><span class="n">result</span><span class="p">,</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Only local files can be executed anyway, so you could use file.setPermissions(QFile::ExeUser | file.permissions()) like makeFileExecutable does for desktop files.</p>
<p style="padding: 0; margin: 8px;">Actually maybe you could reuse more of that code?</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R241 KIO</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D22510">https://phabricator.kde.org/D22510</a></div></div><br /><div><strong>To: </strong>mdlubakowski, Frameworks, dfaure, cfeck, pino<br /><strong>Cc: </strong>broulik, ngraham, probono, kde-frameworks-devel, LeGast00n, GB_2, michaelh, bruns<br /></div>