<table><tr><td style="">bruns added inline comments.
</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/D11745">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/D11745#inline-60893">View Inline</a><span style="color: #4b4d51; font-weight: bold;">databasesanitizer.cpp:116</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">if</span> <span class="p">((</span><span style="color: #aa2211">!</span><span class="n">includeIds</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">()</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span class="n">includeIds</span><span class="p">.</span><span class="n">contains</span><span class="p">(</span><span class="n">info</span><span class="p">.</span><span class="n">deviceId</span><span class="p">))</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa2211">||</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">excludeIds</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">()</span> <span style="color: #aa2211">&&</span> <span class="n">excludeIds</span><span class="p">.</span><span class="n">contains</span><span class="p">(</span><span class="n">info</span><span class="p">.</span><span class="n">deviceId</span><span class="p">))</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa2211">||</span> <span class="p">(</span><span class="n">purging</span> <span style="color: #aa2211">&&</span> <span class="n">info</span><span class="p">.</span><span class="n">accessible</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa2211">||</span> <span class="p">(</span><span class="n">urlFilter</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span class="n">urlFilter</span><span style="color: #aa2211">-></span><span class="n">match</span><span class="p">(</span><span class="n">info</span><span class="p">.</span><span class="n">url</span><span class="p">).</span><span class="n">hasMatch</span><span class="p">())</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I think this becomes a little bit clearer if you move it to the top of the map iteration and use a <tt style="background: #ebebeb; font-size: 13px;">continue;</tt> to process the next item, e.g.:</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);">quint64 id= it.key();
deviceId = idToDeviceId(id); // idutils.h
if (!includeIds.isEmpty() && !includeIds.contains(deviceId)) {
continue;
} else if (excludeIds.contains(info.deviceId)) {
continue;
} else if (urlFilter && !urlFilter->match(it.value()).hasMatch())
continue;
}
checkedFiles += 1;
FileInfo info;
....
if (info.accessible)
accessibleCount++
if ((info.accessible && !(accessFilter & IgnoreAvailable)) ||
(!info.accessible && !(accessFilter & IgnoreUnavailable))) {
result.append(info);
}</pre></div>
<p style="padding: 0; margin: 8px;"><tt style="background: #ebebeb; font-size: 13px;">ignoredCount = map.size() - checkedFiles</tt><br />
<tt style="background: #ebebeb; font-size: 13px;">inaccessibleCount = checkedFiles - accessibleCount</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/D11745#inline-60874">View Inline</a><span style="color: #4b4d51; font-weight: bold;">michaelh</span> wrote in <span style="color: #4b4d51; font-weight: bold;">databasesanitizer.cpp:134</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">I'm not content with this solution. Still, it's the best I could do without bloating the code too much.</p></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">for the second, return</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);">struct summary {
quint64 ignored;
quint64 accessible;
quint64 inaccessible;
};</pre></div></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/D11745#inline-60895">View Inline</a><span style="color: #4b4d51; font-weight: bold;">databasesanitizer.cpp:183</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">it</span><span class="p">.</span><span class="n">value</span><span class="p">().</span><span class="n">mounted</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span class="p">(</span><span class="n">accessFilter</span> <span style="color: #aa2211">&</span> <span class="n">DatabaseSanitizer</span><span style="color: #aa2211">::</span><span class="n">IgnoreMounted</span><span class="p">))</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa2211">||</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">it</span><span class="p">.</span><span class="n">value</span><span class="p">().</span><span class="n">mounted</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span class="p">(</span><span class="n">accessFilter</span> <span style="color: #aa2211">&</span> <span class="n">DatabaseSanitizer</span><span style="color: #aa2211">::</span><span class="n">IgnoreUnmounted</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 class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">You can omit <tt style="background: #ebebeb; font-size: 13px;">DatabaseSanitizer::</tt> here</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/D11745#inline-60709">View Inline</a><span style="color: #4b4d51; font-weight: bold;">bruns</span> wrote in <span style="color: #4b4d51; font-weight: bold;">databasesanitizer.h:41</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">Hm still awkward:</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);">IgnoreNone = 0,
IgnoreAvailable = 1,
IgnoreUnavailable = 2,
IgnoreMounted = IgnoreAvailable << 4, <-- (1 << 4) == 16
IgnoreUnmounted = IgnoreUnavailable << 4 <-- (2 << 4) == 32</pre></div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Thats probably not what you want - IgnoreUnmounted (mounted-only) implicitly includes IgnoreUnavailable, so you will exclude listing unavailable files even on mounted filesystems.</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/D11745">https://phabricator.kde.org/D11745</a></div></div><br /><div><strong>To: </strong>michaelh, Baloo, Frameworks<br /><strong>Cc: </strong>bruns, ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, alexeymin<br /></div>