b12f/nextcloud-fix-encryption-conflicts
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: actually working conflict resolution

Browse source
This commit is contained in:
b12f 2024-08-17 12:31:53 +02:00
parent 699364de3e
commit 702b201d1e
Signed by: b12f
GPG key ID: 729956E1124F8F26
1 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
fix-conflicts.ts
View file

@ -4,7 +4,7 @@ import { join } from "https://deno.land/std@0.173.0/path/mod.ts";
const mainDir = '/home/ben/Nextcloud'; const mainDir = '/home/ben/Nextcloud';
const backupDir = '/home/ben/Nextcloud.bak'; const backupDir = '/home/ben/Nextcloud.bak';
const DRY_RUN = true; const DRY_RUN = Deno.env.get('MOIST_RUN') === '1' ? false : true;
const BATCH_SIZE = 16; const BATCH_SIZE = 16;
const ENCRYPTED_CONTENT_STRING = 'HBEGIN:oc_encryption_module:OC_DEFAULT_MODULE:cipher'; const ENCRYPTED_CONTENT_STRING = 'HBEGIN:oc_encryption_module:OC_DEFAULT_MODULE:cipher';
const CONFLICTED_COPY_REGEX = /.*( \(conflicted copy \d{4}-\d{2}-\d{2} \d+\))(\.[^\.]*)?/; const CONFLICTED_COPY_REGEX = /.*( \(conflicted copy \d{4}-\d{2}-\d{2} \d+\))(\.[^\.]*)?/;
@ -43,9 +43,13 @@ import { join } from "https://deno.land/std@0.173.0/path/mod.ts";
if (!normalFile) { if (!normalFile) {
if (!DRY_RUN) { if (!DRY_RUN) {
// Only the conflicted file exists, just move it to the non-conflict filename // Only the conflicted file exists, just move it to the non-conflict filename
await Deno.rename(conflictedFileName, nonConflictedFileName); try {
await Deno.copyFile(conflictedFileName, nonConflictedFileName);
} catch (err) {
console.error(err);
} }
return `[${conflictedFileName}] only conflicted exists. Move to non-conflict filename`; }
return `[${conflictedFileName}] only conflicted exists. Copy to non-conflict filename`;
} }
const normalFileInfo = await Deno.fstat(normalFile.rid); const normalFileInfo = await Deno.fstat(normalFile.rid);
conflictedFile.close(); conflictedFile.close();
@ -66,9 +70,9 @@ import { join } from "https://deno.land/std@0.173.0/path/mod.ts";
if (normalSha === conflictedSha) { if (normalSha === conflictedSha) {
if (!DRY_RUN) { if (!DRY_RUN) {
// They're the same, remove the conflicted file // They're the same, remove the conflicted file
await Deno.remove(conflictedFileName); // await Deno.remove(conflictedFileName);
} }
return `[${conflictedFileName}] conflict and non-conflict have the same contents, remove the conflict`; return `[${conflictedFileName}] conflict and non-conflict have the same contents, do nothing`;
} }
const headP = Deno.run({ const headP = Deno.run({
@ -91,42 +95,52 @@ import { join } from "https://deno.land/std@0.173.0/path/mod.ts";
console.error(nonConflictedFileName, conflictedFileName); console.error(nonConflictedFileName, conflictedFileName);
if (!DRY_RUN) { if (!DRY_RUN) {
// Whatever, deleted the conflicted one // Whatever, deleted the conflicted one
await Deno.remove(conflictedFileName); // await Deno.remove(conflictedFileName);
} }
return `[${conflictedFileName}] both are encrypted but with different contents. We'll remove the conflict`; return `[${conflictedFileName}] both are encrypted but with different contents. Do nothing`;
} }
if (normalEncrypted) { if (normalEncrypted) {
if (!DRY_RUN) { if (!DRY_RUN) {
// delete normal const ddP = Deno.run({
await Deno.remove(nonConflictedFileName); cmd: ['dd', `if=${conflictedFileName}`, `of=${nonConflictedFileName}`],
await Deno.rename(conflictedFileName, nonConflictedFileName); });
const status = await ddP.status();
if (status.code !== 0) {
console.error(`Could not replace contents of file! ${conflictedFileName} > ${nonConflictedFileName}`);
} }
return `[${conflictedFileName}] the non-conflict is encrypted. Remove it and move the conflicted file in its place`; ddP.close();
}
return `[${conflictedFileName}] the non-conflict is encrypted. Replace its contents with the non-encrypted stuff`;
} }
if (conflictedEncrypted) { if (conflictedEncrypted) {
if (!DRY_RUN) { if (!DRY_RUN) {
// delete conflicted // delete conflicted
await Deno.remove(conflictedFileName); // await Deno.remove(conflictedFileName);
} }
return `[${conflictedFileName}] the conflict is encrypted. Remove it and keep the normal file`; return `[${conflictedFileName}] the conflict is encrypted. Do nothing`;
} }
if (normalFileInfo.mtime > conflictedFileInfo.mtime) { if (normalFileInfo.mtime > conflictedFileInfo.mtime) {
if (!DRY_RUN) { if (!DRY_RUN) {
// delete conflicted // delete conflicted
await Deno.remove(conflictedFileName); // await Deno.remove(conflictedFileName);
} }
return `[${conflictedFileName}] conflict is older than the non-conflict. Remove the conflict`; return `[${conflictedFileName}] conflict is older than the non-conflict. Do nothing`;
} }
if (!DRY_RUN) { if (!DRY_RUN) {
// delete normal const ddP = Deno.run({
await Deno.remove(nonConflictedFileName); cmd: ['dd', `if=${conflictedFileName}`, `of=${nonConflictedFileName}`],
await Deno.rename(conflictedFileName, nonConflictedFileName); });
const status = await ddP.status();
if (status.code !== 0) {
console.error(`Could not replace contents of file! ${conflictedFileName} > ${nonConflictedFileName}`);
} }
return `[${conflictedFileName}] non-conflict is older than the conflict. Remove the non-conflict`; ddP.close();
}
return `[${conflictedFileName}] non-conflict is older than the conflict. Replace its contents with the newer stuff`;
}).map(p => p.then((msg) => { }).map(p => p.then((msg) => {
filesSuccess++; filesSuccess++;
console.log(`[${filesSuccess}/${totalFiles}] ${msg}`); console.log(`[${filesSuccess}/${totalFiles}] ${msg}`);