parrot-blackbox 2.1.1 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parrot-blackbox",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Crash-proof, multi-cloud backup & recovery automation for Parrot OS. Daily/weekly off-disk backups with automatic catch-up, smart storage across many MEGA + Google Drive accounts, Timeshift snapshot backups and one-command restore.",
   "type": "module",
   "main": "src/cli.js",

package/src/storage/allocator.js

@@ -65,7 +65,11 @@ export function walkFiles(localDir) {
  *      will Google Drive accounts be used.
  *   2. Within each provider tier the classic water-filling strategy applies:
  *      pick the account that results in the lowest used-percentage after
- *      placing the file (most headroom wins on ties).
+ *      placing the file. Accounts that are within ~0.5% of quota from each
+ *      other are treated as equally full, and the account EARLIEST in the
+ *      configured pool order wins the tie — so an all-empty pool fills in
+ *      account order (mega-1, mega-2, …) instead of chasing `rclone about`
+ *      usage noise.
  */
 export function chooseAccount(needed, accounts) {
   // Tier 0 = mega, Tier 1 = gdrive / everything else.
@@ -79,14 +83,26 @@ export function chooseAccount(needed, accounts) {
   const candidates = eligible.filter((a) => providerTier(a) === bestTier);
 
   // Water-fill within the chosen tier: minimise resulting used-percentage.
+  // SCORE_EPS absorbs `rclone about` usage noise — MEGA inconsistently reports
+  // a few bytes to tens-of-MiB of phantom usage on otherwise-empty accounts.
+  // As long as accounts are effectively equally full, files go onto the account
+  // EARLIEST in the configured pool order.
+  const SCORE_EPS = 0.005; // 0.5 percentage points of quota
   let best = null;
   let bestScore = Infinity;
-  for (const acc of candidates) {
+  let bestIdx = Infinity;
+  for (let i = 0; i < candidates.length; i++) {
+    const acc = candidates[i];
     const quota = acc.total || 0;
     const score = quota ? (acc.used + needed) / quota : needed;
-    if (score < bestScore || (score === bestScore && acc.free > (best?.free ?? -1))) {
+    if (score < bestScore - SCORE_EPS) {
       bestScore = score;
       best = acc;
+      bestIdx = i;
+    } else if (Math.abs(score - bestScore) <= SCORE_EPS && i < bestIdx) {
+      // Effectively a tie → the earlier account in the pool wins.
+      best = acc;
+      bestIdx = i;
     }
   }
   return best;

package/src/storage/archive.js

@@ -150,7 +150,7 @@ export async function restoreArtifact(manifest, destDir, { onProgress } = {}) {
       for (const entry of batch.entries) {
         const target = path.join(destDir, ...entry.rel.split('/'));
         const loc = entry.loc[0];
-        const r = await copyToFile(`${loc.remote}:${loc.path}`, target);
+        const r = await copyToFile(`${loc.remote}:${loc.path}`, target, { force: true });
         if (!r.ok) throw new Error(`download failed for ${entry.rel}: ${r.error}`);
         files += 1;
         bytes += entry.size;

package/src/storage/rclone.js

@@ -64,9 +64,10 @@ export async function copyDir(localDir, remotePath) {
 }
 
 /** Copy a single local file to an exact remote path. */
-export async function copyToFile(localFile, remotePath, { ignoreExisting = false } = {}) {
+export async function copyToFile(localFile, remotePath, { ignoreExisting = false, force = false } = {}) {
   const args = ['copyto', localFile, remotePath];
   if (ignoreExisting) args.push('--ignore-existing');
+  if (force) args.push('--ignore-times'); // overwrite even a "newer" destination
   const res = await rejectFalse(args);
   return { ok: res.exitCode === 0, exitCode: res.exitCode, error: res.stderr?.trim() };
 }
@@ -131,7 +132,12 @@ export async function downloadBatch(remotePath, localDir, filesFromPath) {
     '--files-from', filesFromPath,
     '--transfers=16',
     '--checkers=16',
-    '--fast-list'
+    '--fast-list',
+    // Restore MUST reproduce the artifact exactly. rclone's default skips a
+    // destination file whose mtime looks newer (exactly what fresh-install
+    // default files are), which silently leaves "conflicts" — your backed-up
+    // version never comes back. --ignore-times forces the overwrite.
+    '--ignore-times',
   ];
   const res = await rejectFalse(args);
   return { ok: res.exitCode === 0, exitCode: res.exitCode, error: res.stderr?.trim() };