Allow for more operations on tag trees (e.g. rename, copy, delete) and fix some existing issues.
BUG: 314373
BUG: 340098
BUG: 376229
BUG: 332214
BUG: 340099
Details
Details
- Reviewers
vhanda ngraham dfaure - Group Reviewers
Frameworks Dolphin - Commits
- R293:16664fccb7b7: Strip down and re-write the baloo tags KIO slave
Diff Detail
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.
Comment Actions
Fantastic work. I wasn't able to apply it with arc, though:
This diff is against commit 9383ea8927579555301eb378c1ce299dde2a2d08, but
the commit is nowhere in the working copy. Try to apply it against the
current working copy state? (e58d6ab06561e455576375e03cb25dd18fd4089f)
Can you rebase the diff against current git master? Also, can you add some details of your testing?
Comment Actions
Maybe update your local repo? It is against the most recent commit in master. It was diff'ed from a non-master branch...
Comment Actions
Oh, I'm a dolt. I was trying to apply this to KIO, not Baloo. Ignore me; works fine when you're not holding it wrong. :)
Comment Actions
Copying/cutting file tags works both from local files and also tagged files. Breaking tags works, e.g. nested tag foo in bar can be copied or cut to foobar/barfoo tag path. Cutting and pasting a file folder results in a new tag on the folder, copying applies the destination path + file path as a tag to all files recursively inside that folder.
Deleting tags removes the tag from the file or directory.
Making new directories / tags is possible, entering the directory results in an error and the directory disappears. Copying or cutting tags into this directory must happen before it's entered.
Previews work, and a bug that caused nested tags to show up in similary named tag folders was also fixed.
Comment Actions
I have been using this for weeks without any negative effects. I'm giving this my blessing, but let's wait for others to weigh in.
Comment Actions
Deep tag copies (to the filesystem and also in the slave) are known to be broken (1 or more folder deep) because of the preview fix in the first revision.
Comment Actions
- Stricter url validation.
- Fix deep copies.
This revision reverts the preview fix. There is an open bug (https://bugs.kde.org/show_bug.cgi?id=194181) regarding dolphin/KIO leaving around partial copies.
| src/kioslaves/tags/kio_tags.cpp | ||
|---|---|---|
| 58 |
| |
| 158 | missing KIO::Overwrite support? Can the dest already exist? | |
| 273–280 | And otherwise? what happens if it's neither TagFileUrl nor LocalUrl? should error(not supported) be called? The job would never finish otherwise. | |
| 288–289 | same question, can dest already exist? | |
| 349 | the QString() isn't needed (repeats) | |
| 416 | missing return, to avoid emitting finished() twice | |
| 438 | can this fail? | |
| 468 | This conversion from bool to int sounds ... fragile. + (result.tag.isEmpty() ? 0 : 1) | |
| 472 | tagSection isn't used by the if condition itself, so it could move into the if(). | |
| 473 | The && !result.tag.isEmpty() is useless. | |
| 494 | That's better written as if (url.isLocalFile()) | |
| 497 | KIO::stat never returns nullptr, so the if() isn't useful. | |
| 500 | same question as before | |
| 519 | could this whole splitting be optimized by saying something like this? result.tag.prepend("tag:");
result.tag.replace('/', " AND tag:");It's just that split is slow (allocates a temporary container etc.). But maybe split is fine here, I guess it's likely not time critical. | |
Comment Actions
- Check if the destination file already has the tag.
- Simplify file query creation.
Review fixes.
Comment Actions
- Merge local and tag file handling.
- Create the tag directory entries and validate the tag at the same time.
| src/kioslaves/tags/kio_tags.cpp | ||
|---|---|---|
| 158 | 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. | |
| 272–273 | Could be another "else if" for symmetry, or better, this could all be a switch statement. It still seems odd to me that if it's not invalid, tag, or local, then get() finishes without an error, is that expected? | |
| 288–289 | same issue here, still no support for Overwrite. | |
| 421–422 | No you don't ;) This comment confused me. 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.". | |
| 438 | This was a rethorical question :-) | |
| 518 | Would it be simpler to use QDir::cleanPath() for all this path cleaning? Just an idea, ignore if bogus. | |
| src/kioslaves/tags/kio_tags.cpp | ||
|---|---|---|
| 158 | KIO::Overwrite is not usable here, because the calls are not relayed to the forwarding slave base. Silently failing is good enough here, IMHO. There's no user action required to recover when a file already has a tag, and no data loss. A popup is unjustifiably intrusive. | |
| 438 | Sorry, I though that I was using start() here, and obviously missed Baloo::TagJob's inherited members.. | |
| src/kioslaves/tags/kio_tags.cpp | ||
|---|---|---|
| 400–407 | You can use boolean conditions rather than if statements, example validTag = validTag || tag.startWith(...) Why?
| |
| 409 | Better reverse conditions if (chopLastSection ||...) You don't need expensive call like contains | |
| src/kioslaves/tags/kio_tags.h | ||
| 107 | metaData(QString{}) | |
| 112–113 | Use enum rather than boolean trap | |
Comment Actions
Currently known issues:
- Deep copying a tag tree with a tagged folder with multiple recursed entries to the local filesystem places all of the tagged folder's recursed items into the root of the destination.
Comment Actions
Excellent! @smithjd, is this ready to go in now, or are you still making more changes?
Comment Actions
- Fix generating previews copies the file to tmp.
- Fix tag navigation display labels in Dolphin.
- Stricter url validation.
- Create a full url instead of only a path.
- Check if the destination file already has the tag.
- Merge local and tag file handling.
- Make io slave work with kioclient.
- Review changes.
- Review suggestions.
- Fix valid tag calculation.
- Fix for slash-less tag urls.
- Fix tagged directory listing.
Comment Actions
There are still known problems with tagged directory copies. Overall however it's in a pretty good state and these can probably be left until later. I'll look more into the directory copies after merging this into master.