[JammingBen]

Description

Restoring a trashed folder together with items from inside it (e.g. "select all" in the trash bin) could create an empty folder for the child first. The restore of the actual folder then replaced it, sending the child back to the trash.

• Items are restored level by level, so a folder is back before its children.
• A folder that is restored in the same batch is no longer created as a missing parent.
• Restores no longer overwrite by default. Only items the user chose "Replace" for in the conflict dialog overwrite an existing item. Anything else fails if a same-named item exists, instead of silently replacing it. Such a failure currently only shows the generic "Failed to restore" message.
• Items with the same path within one batch (e.g. a file deleted twice) no longer show up in the conflict dialog. Each one follows the choice made for the first item at that path: it is restored as a copy (file (1).txt) if that item is restored, and stays in the trash if it is skipped.
• In a locked vault a copy would get a cleartext name, so such duplicates are not restored and a "Duplicate name in an encrypted folder" error is shown.

How to test

Parent folders:

• A folder contains keep.md and a.md. Delete a.md, then the folder.
• In Deleted files select both and Restore.

Duplicates in one batch:

• Create and delete file.txt twice, then create file.txt once more.
• In Deleted files select both file.txt and Restore, choose "Skip": nothing is restored.
• Repeat with "Replace": the existing file is replaced, the other one is restored as file (1).txt.
• Delete file.txt so none exists, restore both: file.txt and file (1).txt, no dialog.

Limitations

This is a can of worms, more known issues are filed in #4077.

[kulmann]

TIL: there is Map.groupBy 🙈 with that you can do:

const resourcesByDepth = Map.groupBy(resources, ({ path }) => getDepth(path))
const sortedDepths = [...resourcesByDepth.keys()].sort((a, b) => a - b)
for (const depth of sortedDepths) {
  await Promise.allSettled(
    resourcesByDepth.get(depth).map((r) => queue.add(() => restoreResource(r)))
  )
}

which saves you filtering "again and again" (well... to be fair, that's a bit exaggerated) per depth value.

[JammingBen]

My agent warned me though that not every Browser we officially support also supports this, since it's a somewhat new ES2024 feature.

[kulmann]

whoopsi. ok 😓