mirror of
https://github.com/narrrl/narl-workspace.git
synced 2026-11-19 10:45:03 +01:00
fix: keep the mirror out of the device root
Proton refuses a file directly in a device's root folder — 422 "Cannot create file at the root of a device" — so the first real backup died on RESTORE.txt, before it had written anything. The mirror now lives in a `data/` folder on the device, which is both what Proton permits and the honest name for what it holds: the contents of DIARY_DATA_DIR. Every remote path changed with it, so the bookkeeping describing the old layout is dropped and rebuilt on the next run. A device root that already collected an empty `uploads/` folder from the failed attempt keeps it; it is not ours to guess about, and deleting it is one click. Also quiet rPGP's packet-header warnings by default. They fire on every key Proton wrote slightly differently to how rPGP re-serialises it — cosmetic, once per unlock, and loud enough to bury the backup's own log. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D5Gk8FPkRXu1e6Nj2BCRE1
This commit is contained in:
1 parent
ca0039400e
commit
7646ecc397
5 files changed
+62
-24
No files matched your search
+26
-7
@@ -161,10 +161,16 @@ impl Backup {
|
||||
Ok(Some(summary))
|
||||
}
|
||||
|
||||
/// The two folders the mirror writes into: the device's root, and the
|
||||
/// `uploads/` folder inside it. Both are registered on first use and then
|
||||
/// The two folders the mirror writes into: `data/` on the device, and
|
||||
/// `data/uploads/` inside it. Both are registered on first use and then
|
||||
/// remembered.
|
||||
///
|
||||
/// Nothing is written to the device's own root, because Proton refuses it —
|
||||
/// a device root holds folders, and a file there is answered with 422
|
||||
/// "Cannot create file at the root of a device". `data/` is that folder,
|
||||
/// and it is also the honest name for what it holds: the diary's data
|
||||
/// directory, copied.
|
||||
///
|
||||
/// Remembering them is the point. Resolving either by name means listing a
|
||||
/// folder's children and decrypting every name in it, and Proton asks
|
||||
/// third-party clients not to traverse the tree repeatedly for things that
|
||||
@@ -175,7 +181,7 @@ impl Backup {
|
||||
async fn device_folders(&self, client: &ProtonDriveClient) -> Result<(NodeUid, NodeUid)> {
|
||||
let name = self.config.backup.device_name.clone();
|
||||
let cached_name = self.state_get("device_name").await?;
|
||||
let fresh = cached_name.as_deref() != Some(name.as_str());
|
||||
let mut fresh = cached_name.as_deref() != Some(name.as_str());
|
||||
|
||||
let root = match self.cached_node(client, "device_root", fresh).await? {
|
||||
Some(uid) => uid,
|
||||
@@ -185,17 +191,30 @@ impl Backup {
|
||||
self.state_set("device_uid", device.uid.as_str()).await?;
|
||||
self.state_set("device_root", &device.root_folder_uid.to_string())
|
||||
.await?;
|
||||
// A new device root cannot hold the old uploads folder.
|
||||
self.state_set("device_uploads", "").await?;
|
||||
// Folders remembered inside the old root mean nothing in a new
|
||||
// one, whichever of them still resolves.
|
||||
fresh = true;
|
||||
device.root_folder_uid
|
||||
}
|
||||
};
|
||||
|
||||
let data = match self.cached_node(client, "device_data", fresh).await? {
|
||||
Some(uid) => uid,
|
||||
None => {
|
||||
let uid = client
|
||||
.create_folder_path(&root, "data")
|
||||
.await
|
||||
.context("could not create the data folder on the device")?;
|
||||
self.state_set("device_data", &uid.to_string()).await?;
|
||||
uid
|
||||
}
|
||||
};
|
||||
|
||||
let uploads = match self.cached_node(client, "device_uploads", fresh).await? {
|
||||
Some(uid) => uid,
|
||||
None => {
|
||||
let uid = client
|
||||
.create_folder_path(&root, "uploads")
|
||||
.create_folder_path(&data, "uploads")
|
||||
.await
|
||||
.context("could not create the uploads folder on the device")?;
|
||||
self.state_set("device_uploads", &uid.to_string()).await?;
|
||||
@@ -204,7 +223,7 @@ impl Backup {
|
||||
};
|
||||
|
||||
self.set(move |s| s.device = Some(name.clone()));
|
||||
Ok((root, uploads))
|
||||
Ok((data, uploads))
|
||||
}
|
||||
|
||||
/// A remembered node, if it is still remembered and still there.
|
||||
|
||||
Reference in new issue
Block a user