mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Zotero.File.copyDirectory(): Fix copying of subdirectories on Windows

Browse source 
This fixes copying of the previous extracted SingleFileZ snapshots
between libraries.
This commit is contained in:
Dan Stillman 2020-11-01 18:51:01 -05:00
parent d16512c84f
commit 367fea1847
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/file.js
View file

@ -976,8 +976,10 @@ Zotero.File = new function(){
});
return this.iterateDirectory(source, function (entry) {
return OS.File.copy(entry.path, OS.Path.join(target, entry.name));
})
return entry.isDir
? this.copyDirectory(entry.path, OS.Path.join(target, entry.name))
: OS.File.copy(entry.path, OS.Path.join(target, entry.name));
}.bind(this))
});

24
test/tests/fileTest.js
View file

@ -237,6 +237,30 @@ describe("Zotero.File", function () {
"Test 2"
);
})
it("should copy subfolders", async function () {
// file1
// subdir/file2
var tmpDir = await getTempDirectory()
var source = OS.Path.join(tmpDir, "1");
await OS.File.makeDir(OS.Path.join(source, 'subdir'), {
from: tmpDir
});
Zotero.File.putContents(Zotero.File.pathToFile(OS.Path.join(source, 'file1')), 'abc');
Zotero.File.putContents(Zotero.File.pathToFile(OS.Path.join(source, 'subdir', 'file2')), 'def');
var target = OS.Path.join(tmpDir, "2");
await OS.File.makeDir(target);
await Zotero.File.copyDirectory(source, target);
var targetFile1 = OS.Path.join(target, 'file1');
var targetFile2 = OS.Path.join(target, 'subdir', 'file2');
assert.isTrue(await OS.File.exists(targetFile1));
assert.isTrue(await OS.File.exists(targetFile2));
assert.equal(Zotero.File.getContents(targetFile1), 'abc');
assert.equal(Zotero.File.getContents(targetFile2), 'def');
});
})
describe("#createDirectoryIfMissing()", function () {