D11745: databasesanitizer: Use flags for filtering

This revision was automatically updated to reflect the committed changes. Closed by commit R293:6fb268be2c42: databasesanitizer: Use flags for filtering (authored by michaelh). REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=32147&id=32178 REVISION DETA

D11745: databasesanitizer: Use flags for filtering

michaelh added inline comments. INLINE COMMENTS > bruns wrote in databasesanitizer.cpp:250 > This line definitely needs a comment why this is here added in D11753 REPOSITORY R293 Baloo BRANCH sanitize-enums (branched from master) REVISION DETAIL http

D11745: databasesanitizer: Use flags for filtering

bruns accepted this revision. bruns added a comment. This revision is now accepted and ready to land. Save the missing comment for "tmpfs", looks fine, thanks! INLINE COMMENTS > databasesanitizer.cpp:250 > auto mounted = info.isValid(); > - > -if (missingOnly && mounted) { >

D11745: databasesanitizer: Use flags for filtering

michaelh updated this revision to Diff 32147. michaelh added a comment. - Ignore tmpfs devices REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=32104&id=32147 BRANCH sanitize-enums (branched from master) REVISION DETAIL https://phabricator.kde.or

D11745: databasesanitizer: Use flags for filtering

michaelh updated this revision to Diff 32104. michaelh added a comment. - Adapt to upstream changes REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=32014&id=32104 BRANCH sanitize-enums (branched from master) REVISION DETAIL https://phabricator.k

D11745: databasesanitizer: Use flags for filtering

bruns added a dependency: D12165: Use QStorageInfo instead of a homegrown implementation. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks, bruns Cc: bruns, ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, alexeymin

D11745: databasesanitizer: Use flags for filtering

bruns requested changes to this revision. bruns added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > databasesanitizer.cpp:193 > +} else { > +usedDevices.erase(it++); > +} this is definitely wrong, erasing invalidates ite

D11745: databasesanitizer: Use flags for filtering

michaelh added a task: T8250: Sanitize the database. REPOSITORY R293 Baloo BRANCH sanitize-enums (branched from master) REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks, bruns Cc: bruns, ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, al

D11745: databasesanitizer: Use flags for filtering

bruns accepted this revision. This revision is now accepted and ready to land. REPOSITORY R293 Baloo BRANCH sanitize-enums (branched from master) REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks, bruns Cc: bruns, ngraham, smithjd, ashaposhnikov, michael

D11745: databasesanitizer: Use flags for filtering

michaelh updated this revision to Diff 32014. michaelh added a comment. Single qDebug REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=32005&id=32014 BRANCH sanitize-enums (branched from master) REVISION DETAIL https://phabricator.kde.org/D11745

D11745: databasesanitizer: Use flags for filtering

bruns added inline comments. INLINE COMMENTS > databasesanitizer.cpp:32 > #include > +#include > double QDebug REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks Cc: bruns, ngraham, smithjd, ashaposhnikov, michaelh, astippich, s

D11745: databasesanitizer: Use flags for filtering

michaelh updated this revision to Diff 32005. michaelh added a comment. - Hopefully get the enum right this time - Use struct for summary REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=31811&id=32005 BRANCH sanitize-enums (branched from master)

D11745: databasesanitizer: Use flags for filtering

michaelh planned changes to this revision. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks Cc: bruns, ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, alexeymin

D11745: databasesanitizer: Use flags for filtering

bruns added inline comments. INLINE COMMENTS > databasesanitizer.cpp:116 > if ((!includeIds.isEmpty() && > !includeIds.contains(info.deviceId)) > || (!excludeIds.isEmpty() && > excludeIds.contains(info.deviceId)) > || (urlFilter && !urlFilter->matc

D11745: databasesanitizer: Use flags for filtering

michaelh added inline comments. INLINE COMMENTS > databasesanitizer.cpp:134 > +map.size() - ignoredCount - accessibleCount > +)}; > } I'm not content with this solution. Still, it's the best I could do without bloating the code too much. > databasesanitizer.cpp:245

D11745: databasesanitizer: Use flags for filtering

michaelh marked 4 inline comments as done. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks Cc: bruns, ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, alexeymin

D11745: databasesanitizer: Use flags for filtering

michaelh updated this revision to Diff 31811. michaelh added a comment. - Improve printList summary REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=31807&id=31811 BRANCH sanitize-enums (branched from master) REVISION DETAIL https://phabricator.k

D11745: databasesanitizer: Use flags for filtering

michaelh updated this revision to Diff 31807. michaelh marked 2 inline comments as done. michaelh added a comment. - Adapt to upstream changes - Correct enum - Apply suggested changes REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=31365&id=31807

D11745: databasesanitizer: Use flags for filtering

bruns added inline comments. INLINE COMMENTS > databasesanitizer.cpp:100 > QTextStream err(stderr); > for (quint64 id: keys) { > printProgress(err, i, max, 100); As you are not iterating over sorted keys, just directly iterate on the map. > databasesanitizer.cpp:1

D11745: databasesanitizer: Use flags for filtering

michaelh updated this revision to Diff 31365. michaelh added a comment. - Correct typo(?) REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11745?vs=30716&id=31365 BRANCH sanitize-enums (branched from master) REVISION DETAIL https://phabricator.kde.org/D11

D11745: databasesanitizer: Use flags for filtering

michaelh added inline comments. INLINE COMMENTS > bruns wrote in databasesanitizer.h:41 > Is this correct? IgnoreMounted = (1 << 1) = 2 == IgnoreUnavailable? That's a sneaky question! :-) REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frame

D11745: databasesanitizer: Use flags for filtering

bruns added inline comments. INLINE COMMENTS > databasesanitizer.h:41 > +IgnoreUnavailable = 2, > +IgnoreMounted = IgnoreAvailable << 1, > +IgnoreUnmounted = IgnoreUnavailable << 1 Is this correct? IgnoreMounted = (1 << 1) = 2 == IgnoreUnavailable? REPOSITORY R293 Balo

D11745: databasesanitizer: Use flags for filtering

michaelh edited the summary of this revision. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks Cc: ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, nicolasfella, alexeymin

D11745: databasesanitizer: Use flags for filtering

michaelh added a dependent revision: D11753: baloodb: Add clean command. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks Cc: ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, nicolasfella, alexeymin

D11745: databasesanitizer: Use flags for filtering

michaelh added a dependency: D11452: sanitizer: Improve device listing. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D11745 To: michaelh, #baloo, #frameworks Cc: ngraham, smithjd, ashaposhnikov, michaelh, astippich, spoorun, nicolasfella, alexeymin

D11745: databasesanitizer: Use flags for filtering

michaelh created this revision. michaelh added reviewers: Baloo, Frameworks. Restricted Application added projects: Frameworks, Baloo. michaelh requested review of this revision. REVISION SUMMARY This is in preparation for the upcoming 'clean' and 'repair' commands. It also helps to keep the A