> On Oct. 13, 2014, 8:03 p.m., Lamarque Souza wrote: > > kioslave/trash/trashimpl.cpp, line 815 > > <https://git.reviewboard.kde.org/r/120573/diff/2/?file=318230#file318230line815> > > > > QFile::remove() does not work with directories. You should use > > QDir().rmdir() instead, which only works as long as the directory is empty > > though. > > Milian Wolff wrote: > in Qt5, there is a QDir::removeRecursively though. In Qt4/KDE4, you'll > need to use e.g. KIO::del or similar. > > René J.V. Bertin wrote: > Duly noted - does that mean that the corresponding (and existing) > statements in `createInfo` and `deleteInfo` (lines 311 and 392) are in error > too?! > > Sadly this doesn't explain everything: it's as if `isEmpty` is not > called, in fact: the kDebug() statement on line 811 is never printed.
I saw that the class already had a `synchronousDel` function. This function could receive an overload to accept a `QStringList` argument that will allow to schedule the 2 or 3 subdirectories to be deleted with a single call to synchronousDel instead of with 3 consecutive calls. - René J.V. ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/120573/#review68315 ----------------------------------------------------------- On Oct. 13, 2014, 10:42 p.m., René J.V. Bertin wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/120573/ > ----------------------------------------------------------- > > (Updated Oct. 13, 2014, 10:42 p.m.) > > > Review request for KDE Software on Mac OS X and KDE Runtime. > > > Repository: kde-runtime > > > Description > ------- > > KDE on OS X does not handle the desktop session (no "Plasma") nor can it rely > on XDG to obtain the proper paths to use for something like the trash. As a > result, all applications that propose to move things they manage to the > wastebin (Dolphin, but also digiKam) will store those items in a place that > has no particular meaning on OS X, and that will thus tend to fill up. > > OS X stores trash in one of several locations. Files trashed from the boot > volume (and/or the volume containing $HOME, I don't actually know that) end > up in `~/.Trash`. Files deleted from other volumes end up in > `/Volumes/volName/.Trashes/uid`, where volName is the volume name (regardless > whether it's an external or a remote drive; only mounted NFS shares are > handled differently) and uid the numerical user id. Permissions on `.Trashes` > are the same as those expected by KDE. > > The kio_trash kioslave appears to support several actual trash directory > locations, just like OS X. `TrashImpl::init()` creates a standard trash in > `~/.local/share/Trash` (at least under OS X) but also > `TrashImpl::trashForMountPoint()` that is used in cases I have not yet > encountered. > > On OS X, my modified `TrashImpl::init()` sets the standard trash directory to > `~/.Trash/KDE.trash` and will create the `files` and `info` subdirectories as > required, because they will of course be deleted when the user empties the OS > X trash. `TrashImpl::isEmpty()` has been modified to delete the KDE trash's > internal infrastructure when the wastebin is empty so that OS X also see the > trash as emptied, but that doesn't work yet. > > Remains to be done: > - figure out why `isEmpty()` doesn't completely clean out the trash as > expected which causes OS X to show the trash as full even after emptying the > wastebin through KDE. > - determine in what cases `trashForMountPoint()` is used, and finish the > modifications for it to use `/.Trashes/uid/KDE.trash` > > > Diffs > ----- > > kioslave/trash/trashimpl.h bc68723 > kioslave/trash/trashimpl.cpp 30ee05b > > Diff: https://git.reviewboard.kde.org/r/120573/diff/ > > > Testing > ------- > > On OS X 10.6.8 with kdelibs and kde-runtime git/4.14, using Dolphin. Tested > actions are > - move items to wastebin from $HOME and a directory on a different volume > - restore items to both places > - empty wastebin through Dolphin > - empty OS X trashcan > > > Thanks, > > René J.V. Bertin > >
