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

Fix infinite loop in Zotero.File.zipDirectory() on subdirectory

Browse source 
But subdirectories shouldn't actually be used yet, because they won't
extract properly on 4.0.
This commit is contained in:
Dan Stillman 2016-06-02 00:59:32 -04:00
parent 37063f639f
commit fc4d7fa4bf
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -731,7 +731,7 @@ Zotero.File = new function(){
return; return;
} }
if (entry.isDir) { if (entry.isDir) {
entries.concat(yield _addZipEntries(rootPath, path, zipWriter)); entries.concat(yield _addZipEntries(rootPath, entry.path, zipWriter));
return; return;
} }
if (entry.name.startsWith('.')) { if (entry.name.startsWith('.')) {

37
test/tests/fileTest.js
View file

@ -69,4 +69,41 @@ describe("Zotero.File", function () {
); );
}) })
}) })
describe("#zipDirectory()", function () {
it("should compress a directory recursively", function* () {
var tmpPath = Zotero.getTempDirectory().path;
var path = OS.Path.join(tmpPath, Zotero.Utilities.randomString());
yield OS.File.makeDir(path);
yield Zotero.File.putContentsAsync(OS.Path.join(path, '.zotero-ft-cache'), '');
yield Zotero.File.putContentsAsync(OS.Path.join(path, 'a.txt'), 'A');
// Create subdirectory
var subPath = OS.Path.join(path, 'sub');
yield OS.File.makeDir(subPath);
yield Zotero.File.putContentsAsync(OS.Path.join(subPath, 'b.txt'), 'B');
var zipFile = OS.Path.join(tmpPath, 'test.zip');
yield Zotero.File.zipDirectory(path, zipFile);
var zr = Components.classes["@mozilla.org/libjar/zip-reader;1"]
.createInstance(Components.interfaces.nsIZipReader);
zr.open(Zotero.File.pathToFile(zipFile));
var entries = zr.findEntries('*');
var files = {};
var is = Components.classes['@mozilla.org/scriptableinputstream;1']
.createInstance(Components.interfaces.nsIScriptableInputStream);
while (entries.hasMore()) {
let entryPointer = entries.getNext();
let entry = zr.getEntry(entryPointer);
let inputStream = zr.getInputStream(entryPointer);
is.init(inputStream);
files[entryPointer] = is.read(entry.realSize);
}
zr.close();
assert.notProperty(files, '.zotero-ft-cache');
assert.propertyVal(files, 'a.txt', 'A');
assert.propertyVal(files, 'sub/b.txt', 'B');
});
});
}) })