Issue1339: fix cross-device trashing #1782
Conversation
Use shutil.move() to perform the move to trash: this falls back to a copy when it needs to move a file between two devices. Addresses quodlibet#1339.
Consolidate trash folder finding and building into a single function that makes the trash dir and its required subdirs if needed. This routine also verifies that writes to the trash directory structure are possible before returning it, and will fall back correctly to the home trash folder if it has to. Ref http://standards.freedesktop.org/trash-spec/trashspec-latest.html Fixes quodlibet#1339, or at least makes the exception go away for many important cases.
|
Thanks for looking into it. What about using https://lazka.github.io/pgi-docs/#Gio-2.0/interfaces/File.html#Gio.File.trash instead? |
|
Is QuodLibet moving to Gio everywhere? Then that would be a better API. Conversely, and may not be an issue: fallbacks are allowed by the spec, and are nice to have. However |
No plans atm, but I can't think of a reason why we couldn't use it in this case (except pygobject+python3 only supporting utf-8 paths).
Yeah, deleting in case of an error wouldn't be a good idea :) We currently don't do fallbacks so that wouldn't be a regression at least. |
Issue1339: fix cross-device trashing
|
Merged for now, thanks. We should look into using Gio sometime... |
#1339 was annoying me in 3.5.1, so I threw together a quick fix. Implementation is now a bit closer to http://standards.freedesktop.org/trash-spec/trashspec-latest.html. This handles my silly cross-volume music library fine even for broken or unwriteable trash structures, provided the fallback is still OK.