> On Oct. 14, 2014, 11:13 p.m., David Faure wrote: > > kioslave/trash/trashimpl.cpp, line 1043 > > <https://git.reviewboard.kde.org/r/120573/diff/6/?file=318520#file318520line1043> > > > > such a debug statement is more useful if it prints out the input to the > > method, i.e. "topdir". > > René J.V. Bertin wrote: > Point(s) taken. For now I still don't know in what circumstances > trashForMountPoint is called/used. Once that figured out the new debug > statements can go altogether ... > > René J.V. Bertin wrote: > I'm keeping the Q_OS_MAC except for the last debug statement, as a > reminder to remove them when `trashForMountPoint` has been taken care of. > > Unless it's a remnant from the past that's no longer being used? > > David Faure wrote: > What would be a remnant from the past? trashForMountPoint?? It's called > by TrashImpl::findTrashDirectory and by TrashImpl::scanTrashDirectories. > It's the way we find the trash dirs on other partitions. Surely that is > used. > > You can e.g. try opening trash:/ in a kde file manager, it will scan for > all trash dirs. > > René J.V. Bertin wrote: > Well, I've done that; opening the trash in Dolphin is part of my regular > testing routine for this. And NEVER have I yet seen debug output from > trashForMountPoint... > > René J.V. Bertin wrote: > Even for the NFS mount mounted under /Volumes (comparable to /media) I > just checked: the file I moved ended up in the ~/.Trash directory.
Note to self: This appears to work now, remember to remove the debug statements or generalise them. - René J.V. ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/120573/#review68418 ----------------------------------------------------------- On Oct. 18, 2014, 8:08 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. 18, 2014, 8:08 p.m.) > > > Review request for KDE Software on Mac OS X, KDE Runtime and David Faure. > > > 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::fileRemoved()` has been modified to call a new function, > `deleteEmptyTrashInfraStructure` to delete the KDE trash's internal > infrastructure when the wastebin is empty so that OS X also sees the trash as > emptied. (Since implementing `deleteEmptyTrashInfraStructure` this feature > actually works, as expected as far as I can tell). > > Remains to be done: > - determine in what cases `trashForMountPoint()` is used, and finish the > modifications for it to use `/.Trashes/uid/KDE.trash` > > > Diffs > ----- > > kioslave/trash/CMakeLists.txt 3604089 > kioslave/trash/kcmtrash.cpp f4811fd > kioslave/trash/tests/CMakeLists.txt 9161fdf > 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 > >
