mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-22 10:33:31 +01:00
fix(trash): list a large trash, empty it, and browse it by folder
A large trash never finished listing, so the Trash page kept the rows of the last refresh that got anywhere, and Empty Trash listed the trash before sending the delete and hung there (B293). The paging fix is in proton-drive-rs 0.12.5. - The refresh reads only nodes it has not stored yet, without unlocking file keys, keeps the time the server says each was trashed, and drops rows only once the whole listing is in. - Empty Trash sends the delete at once under the trash call time limit and clears the stored listing. Restore and Delete Permanently drop their rows right away. - Schema v47 indexes trash.parent_uid and drops the stored rows once, so they are read again with real deletion times. - The Trash page groups items by the folder they were deleted from, opens deleted folders through the new ListTrashedFolder request, and has a search box and a switch back to one list. Restore and Delete Permanently on a folder row act on everything deleted from it. - pdfs trash takes --by-folder and --folder UID.
This commit is contained in:
1 parent
f141d88d97
commit
d0f9681593
30 files changed
+2661
-1306
No files matched your search
@@ -109,6 +109,7 @@ a live account since.
|
||||
| Entry | Title |
|
||||
|---|---|
|
||||
| [B66](#b66--local-only-pending-data-is-not-protected-at-shutdown-high-21) | Local-only pending data is not protected at shutdown (HIGH-21) |
|
||||
| [B293](#b293--a-large-trash-never-lists-and-empty-trash-never-empties-it) | A large trash never lists, and Empty Trash never empties it |
|
||||
| [B291](#b291--on-fedora-45s-oo7-every-saved-sign-in-is-lost-at-the-next-reboot) | On Fedora 45's oo7, every saved sign-in is lost at the next reboot |
|
||||
| [B289](#b289--the-takeout-import-mixes-in-other-services-and-drops-location-and-live-photos) | The Takeout import mixes in other services and drops location and live photos |
|
||||
| [B288](#b288--an-interrupted-takeout-import-reads-as-finished-and-one-error-ends-it) | An interrupted Takeout import reads as finished, and one error ends it |
|
||||
@@ -395,6 +396,38 @@ a live account since.
|
||||
|
||||
Newest first.
|
||||
|
||||
### B293 — A large trash never lists, and Empty Trash never empties it
|
||||
|
||||
**Status:** Fixed in code, live check pending
|
||||
|
||||
**Found:** 2026-11-22. The user reported that the Trash page always showed the same 64 items and
|
||||
that Empty Trash did nothing.
|
||||
|
||||
**Where:** `proton-drive-rs` `enumerate_trash_node_uids`; `crates/pdfs-fuse/src/lib.rs`
|
||||
`Core::refresh_trash` and `Core::empty_trash`
|
||||
|
||||
**Repro:** An account with a few thousand items in the trash. The log shows `background trash
|
||||
refresh failed error=enumerate trash: no answer within 120s` on every refresh, and Empty Trash
|
||||
shows `a control request has been running for a long time request=EmptyTrash age_secs=417`.
|
||||
|
||||
**Cause:** The SDK sent the trash paging parameters in lower case, unlike every other paged
|
||||
request, and kept asking while pages came back full. On a large trash the listing never
|
||||
finished. The refresh therefore timed out every time, and the page kept the rows of the last
|
||||
refresh that had got anywhere. Empty Trash listed the trash first, with no time limit, so the
|
||||
`DELETE` was never sent. A refresh also decrypted every trashed file again, and rewrote the whole
|
||||
table after every chunk.
|
||||
|
||||
**Fix:** SDK 0.12.5 sends `Page` and `PageSize` and stops on a page that brings nothing new.
|
||||
The refresh reads only nodes it has not stored yet, without unlocking file keys, and keeps the
|
||||
time the server says each was trashed. Rows go only once the whole listing is in. Empty Trash
|
||||
sends the `DELETE` at once, under the trash call time limit, and clears the stored listing.
|
||||
Restore and Delete Permanently drop their rows right away. Schema v47 indexes `trash.parent_uid`
|
||||
and drops the stored rows once, so they are read again with real deletion times.
|
||||
|
||||
**Verified:** `cargo test -p pdfs-fuse the_trash_lists_by_folder_and_empties -- --ignored`, the
|
||||
new `trash_upsert_keeps_other_rows_and_retain_drops_unlisted_ones`, and the SDK paging tests on
|
||||
2026-11-22. Pending: a live listing and empty on the affected account.
|
||||
|
||||
### B292 — Two programs changing settings at once lose one of the changes
|
||||
|
||||
**Status:** Fixed
|
||||
|
||||
@@ -23,6 +23,13 @@ scratch (user data in `staging/` and `recovery/` is never touched by this).
|
||||
|
||||
### Changed
|
||||
|
||||
- The Trash page shows the folders things were deleted from. Open one to see what
|
||||
was deleted there, and open a deleted folder to see what it held. A switch in
|
||||
the header goes back to one list, and a search box finds anything in the trash
|
||||
by name. Restore and Delete Permanently work on a whole folder row. `pdfs trash`
|
||||
takes `--by-folder`, and `--folder UID` for a deleted folder.
|
||||
- The trash loads faster: a refresh reads only what is new, without unlocking file
|
||||
keys, and shows the time each item was deleted as Proton Drive reports it.
|
||||
- The Places map draws an offline basemap, the one Proton Gallery shows: seas by
|
||||
depth, lakes, rivers, built-up areas, borders and town names, in light and dark,
|
||||
rendered in the background through `proton-map-rs`. It ships with every package
|
||||
@@ -56,6 +63,11 @@ scratch (user data in `staging/` and `recovery/` is never touched by this).
|
||||
atomic writer (temporary file, sync, rename, directory sync). The mount-failure file
|
||||
is now synced before the rename too, so a crash cannot leave it empty.
|
||||
|
||||
### Fixed
|
||||
|
||||
- A large trash listed only its first items and never refreshed, and Empty Trash
|
||||
never emptied it (B293). Needs proton-drive-rs 0.12.5.
|
||||
|
||||
## [3.9.0] — 2026-11-19
|
||||
|
||||
Schema: **46**. Photos adds a local database migration for incremental metadata sync.
|
||||
|
||||
+1
-1
@@ -154,7 +154,7 @@ commands are for scripts and for cases where the mount is not available.
|
||||
|
||||
| Command | Description |
|
||||
|---|---|
|
||||
| `pdfs trash` | List the Trash with the UIDs the next commands take. |
|
||||
| `pdfs trash` | List the Trash with the UIDs the next commands take. `--by-folder` groups it by original folder; `--folder UID` lists a deleted folder. |
|
||||
| `pdfs restore UIDS...` | Put items back where they were. |
|
||||
| `pdfs delete-forever UIDS...` | Delete items permanently. |
|
||||
| `pdfs empty-trash` | Delete everything in the Trash permanently. |
|
||||
|
||||
+9
-2
@@ -71,13 +71,20 @@ terminal: `pdfs copy PATH... NEW_PARENT`.
|
||||
## Trash
|
||||
|
||||
Deleted files go to the Trash, both from `~/ProtonDrive` and from the app. The **Trash** page
|
||||
lists them with the date they were deleted.
|
||||
shows the folders things were deleted from, with how many items each holds and when the last
|
||||
one went. Open a folder to see what was deleted from it, and open a deleted folder to see what
|
||||
it held. The folder button in the header switches to one list of everything, newest deletion
|
||||
first, and the search box finds an item anywhere in the Trash by name.
|
||||
|
||||
- **Restore** puts an item back where it was, together with any trashed folders above it.
|
||||
- **Delete Forever** and **Empty Trash** are permanent.
|
||||
|
||||
- Restore or delete a whole folder row to act on everything deleted from that folder.
|
||||
|
||||
From a terminal: `pdfs trash` lists the Trash with an ID for each item, and `pdfs restore`,
|
||||
`pdfs delete-forever` and `pdfs empty-trash` take those IDs.
|
||||
`pdfs delete-forever` and `pdfs empty-trash` take those IDs. `pdfs trash --by-folder` groups the
|
||||
list by the folder each item was deleted from, and `pdfs trash --folder ID` shows what a deleted
|
||||
folder holds.
|
||||
|
||||
## Earlier versions of a file
|
||||
|
||||
|
||||
Reference in new issue
Block a user