Details

Reviewers

Group Reviewers

Baloo
Frameworks

Maniphest Tasks

T8250: Sanitize the database

Commits

R293:b050c0ab0ef7: Introduce baloodb CLI tool

Summary

This is the command line interface of database sanitizer

Test Plan

Run on command line
Example:

$ baloodb list --missing-only --device-id 2049 '/otto/'
Listing database contents...
Missing: device: 2049 inode: 5053 url: /tmp/otto/A
Missing: device: 2049 inode: 9441 url: /tmp/otto/B
Missing: device: 2049 inode: 9464 url: /tmp/otto/B/B.txt
Found 3 matching items
Elapsed: 87.7154 secs

Diff Detail

Repository

R293 Baloo

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

michaelh created this revision.Mar 13 2018, 2:23 PM

Restricted Application added projects: Frameworks, Baloo. · View Herald TranscriptMar 13 2018, 2:23 PM

michaelh requested review of this revision.Mar 13 2018, 2:23 PM

michaelh added a dependency: D11285: Introduce sanitizer class.

michaelh mentioned this in D11213: balooctl: Introduce list command.Mar 13 2018, 2:25 PM

This is really nice, I like it! Should make debugging a lot easier. Noticed a couple of things:

$ baloodb -v
baloodb

$ baloodb devices
command "devices"
Listing database contents...
Device:2049 14855 items
Found 14855 matching items
Elapsed: 0.326553 secs

Add KAboutData
Remove debug statement

Remove obsolete include

In D11287#225860, @ngraham wrote:

This is really nice, I like it! Should make debugging a lot easier. Noticed a couple of things:

This is how the output now does and nearly should look.

$ baloodb devices
Listing database contents...
Device:22 3 items     
Device:43 76 items
Device:42 3627 items
Device:41 40 items
Device:2053 6438 items
Device:2049 22 items
Device:2069 1533 items
Device:2066 11643 items
Device:2064 99 items
Device:2086 220 items
Device:2098 1450 items
Found 25151 matching items
Elapsed: 4.42067 secs

$ baloodb devices 2>/dev/null
Device:22 3 items
Device:41 40 items
Device:42 3627 items
Device:43 76 items
Device:2069 1533 items
Device:2064 99 items
Device:2066 11643 items
Device:2053 6438 items
Device:2049 22 items
Device:2098 1450 items
Device:2086 220 items

The "found items" count has to be fixed in D11285. Are there more things?

Rebase on master
Improve help message

Should there be a note in --help message like "This is an experimental tool. The command line interface is subject to change."?

michaelh mentioned this in D11038: balooctl: Add clean option to remove stale file index entries.Mar 18 2018, 8:37 AM

michaelh added a dependent revision: D11452: sanitizer: Improve device listing.Mar 18 2018, 11:34 AM

mlaurent requested changes to this revision.Mar 19 2018, 1:20 PM

mlaurent added a subscriber: mlaurent.

mlaurent added inline comments.

src/tools/baloodb/main.cpp
104	extra space at the end of i18n
113	const auto &c ?
125	coding style: remove space after()
132	options.count() == 0 => isEmpty()
136	very hard to read it. Could you split in several QString so it will more easy to check it's if ok :)
204	!isEmpty()

This revision now requires changes to proceed.Mar 19 2018, 1:20 PM

michaelh added inline comments.Mar 19 2018, 1:53 PM

src/tools/baloodb/main.cpp
136	I had trouble myself :)
162	To point this out. I'm not the maintainer of baloo. Maybe better remove this?

Improve readability and apply other suggested changes

michaelh marked 4 inline comments as done.Mar 19 2018, 1:56 PM

ngraham added inline comments.Mar 19 2018, 1:58 PM

src/tools/baloodb/main.cpp
66	Any reason not to use a std::vector instead?
162	I think you sort of are Baloo's de facto maintainer (which is a good thing, and you've earned the position)!

michaelh added inline comments.Mar 19 2018, 3:45 PM

src/tools/baloodb/main.cpp
66	No reason. Will change to std::vector.

mlaurent requested changes to this revision.Mar 20 2018, 7:14 AM

mlaurent added inline comments.

src/tools/baloodb/CMakeLists.txt
17	install(TARGETS baloodb ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
src/tools/baloodb/main.cpp
152	const QString allCommandStr

This revision now requires changes to proceed.Mar 20 2018, 7:14 AM

Apply suggested changes

michaelh marked 7 inline comments as done.Mar 20 2018, 7:34 AM

michaelh added inline comments.

src/tools/baloodb/CMakeLists.txt
17	@mlaurent Is it worth the effort to change this for the other cli tools accordingly?
src/tools/baloodb/main.cpp
152	More const than suggested

mlaurent added inline comments.Mar 20 2018, 8:08 AM

src/tools/baloodb/CMakeLists.txt
17	It's the default variable. But don't chnage it in this patch. Perhaps in the future as you are the baloo maintainer :)

mlaurent accepted this revision.Mar 20 2018, 8:21 AM

This revision is now accepted and ready to land.Mar 20 2018, 8:21 AM

Closed by commit R293:b050c0ab0ef7: Introduce baloodb CLI tool (authored by michaelh). · Explain WhyMar 20 2018, 8:24 AM

This revision was automatically updated to reflect the committed changes.

michaelh marked 2 inline comments as done.

michaelh added a task: T8250: Sanitize the database.Apr 12 2018, 9:09 PM

		Path
M		src/tools/CMakeLists.txt (1 line)
A	M	src/tools/baloodb/CMakeLists.txt (16 lines)
A	M	src/tools/baloodb/Messages.sh (2 lines)
A	M	src/tools/baloodb/main.cpp (262 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	29406	d9eaf61		Mar 13 2018, 2:17 PM	★	★
Diff 2	29524	d9eaf61	- Add KAboutData	Mar 14 2018, 7:45 PM	★	★
Diff 3	29525	d9eaf61	- Remove obsolete include	Mar 14 2018, 7:48 PM	★	★
Diff 4	29694	5e471c3	- Rebase on master	Mar 16 2018, 7:30 PM	★	★
Diff 5	29914	5e471c3	- Improve readability and apply other suggested changes	Mar 19 2018, 1:54 PM	★	★
Diff 6	29969	5e471c3	- Apply suggested changes	Mar 20 2018, 7:28 AM	★	★
Diff 7	29976	5e471c3	R293:b050c0ab0ef763984577b0e456e821dfda8fa95b	Mar 20 2018, 8:27 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
1fe7a429b8fa	008f83c2f27e	0efbdb68dcc7	Michael Heidelbach	Improve readability and apply other suggested changes	Mar 19 2018, 1:56 PM
0efbdb68dcc7	07416fd120d1	cafc00a10402	Michael Heidelbach	Improve help message	Mar 16 2018, 7:31 PM
cafc00a10402	8ec707f4baf4	b11293e12e5f 5e471c3d39b3	Michael Heidelbach	Merge branch 'master' of git://anongit.kde.org/baloo into sanitize-cmd	Mar 16 2018, 7:14 PM
b11293e12e5f	60556db1ceb3	6627caa0cf4e	Michael Heidelbach	Remove obsolete #include	Mar 14 2018, 7:50 PM
6627caa0cf4e	13c173b9f278	44c609ffdff2	Michael Heidelbach	- Add KAboutData - Remove debug statement	Mar 14 2018, 7:46 PM
44c609ffdff2	6e93c10679de	a7b570acd728	Michael Heidelbach	Introduce baloodb CLI tool (Show More…)	Mar 13 2018, 1:47 PM
a7b570acd728	751925240626	52569e1bbca3	Michael Heidelbach	Clean up code	Mar 13 2018, 2:09 PM
52569e1bbca3	7289196f5bd3	8bf9f985fb05	Michael Heidelbach	sanitize: Introduce printProgress()	Mar 13 2018, 1:51 PM
8bf9f985fb05	f512f2855bb5	457741ece915	Michael Heidelbach	documenturldb: Remove Q_ASSERTs	Mar 13 2018, 1:50 PM
457741ece915	bfcc06269d79	2b3c425c8107	Michael Heidelbach	Apply minor adjustments	Mar 13 2018, 1:13 PM
2b3c425c8107	18135758b05f	5bacac6b7f03	Michael Heidelbach	Introduce sanitizer class (Show More…)	Mar 13 2018, 12:30 PM

Status	Author	Revision
Accepted	michaelh	D12044 baloodb: Improve interface
Needs Review	michaelh	D12222 baloodb: Use complete access filtering for all outputs
Closed	michaelh	D11753 baloodb: Add clean command
Closed	michaelh	D11745 databasesanitizer: Use flags for filtering
Closed	bruns	D12165 Use QStorageInfo instead of a homegrown implementation
Closed	michaelh	D11452 sanitizer: Improve device listing
Closed	michaelh	D11287 Introduce baloodb CLI tool
Closed	michaelh	D11285 Introduce sanitizer class

Introduce baloodb CLI tool
ClosedPublic
Actions

Details

Diff Detail

Revision Contents
Changeset List

Diff 29976

src/tools/CMakeLists.txt

src/tools/baloodb/CMakeLists.txt

src/tools/baloodb/Messages.sh

src/tools/baloodb/main.cpp

Introduce baloodb CLI toolClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 29976

src/tools/CMakeLists.txt

src/tools/baloodb/CMakeLists.txt

src/tools/baloodb/Messages.sh

src/tools/baloodb/main.cpp

Introduce baloodb CLI tool
ClosedPublic
Actions

Revision Contents
Changeset List