b12f
/
nextcloud-fix-encrypted-conflicts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix path handling

main
Benjamin Bädorf 2023-01-25 23:40:57 +01:00
parent 5577aaa159
commit 699364de3e
No known key found for this signature in database
GPG Key ID: 4406E80E13CD656C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fix-conflicts.ts
View File

@ -19,7 +19,7 @@ import { join } from "https://deno.land/std@0.173.0/path/mod.ts";
p.close();
const outputStr = (new TextDecoder()).decode(output);
const fileNames = [...new Set(outputStr.split('\n').filter(s => !!s))].map(s => join(backupDir, s));
const fileNames = [...new Set(outputStr.split('\n').filter(s => !!s))];
const totalFiles = fileNames.length;
let filesSuccess = 0;
@ -28,13 +28,14 @@ import { join } from "https://deno.land/std@0.173.0/path/mod.ts";
for (let i = 0; i < totalFiles; i += BATCH_SIZE) {
fileData = [
...fileData,
...(await Promise.all(fileNames.slice(i, i + BATCH_SIZE).map(async (conflictedFileName) => {
...(await Promise.all(fileNames.slice(i, i + BATCH_SIZE).map(async (relativeConflictedFileName) => {
const conflictedFileName = join(backupDir, relativeConflictedFileName);
const conflictedNameMatch = conflictedFileName.match(CONFLICTED_COPY_REGEX);
if (!conflictedNameMatch) {
return `[${conflictedFileName}] encountered regex error`;
}
const conflictString = conflictedNameMatch[1];
const nonConflictedFileName = join(mainDir, conflictedFileName.replace(conflictString, ''));
const nonConflictedFileName = join(mainDir, relativeConflictedFileName.replace(conflictString, ''));
const conflictedFile = await Deno.open(conflictedFileName, { read: true });
const conflictedFileInfo = await Deno.fstat(conflictedFile.rid);