suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes storage upload with subfolders

Browse Source
This commit is contained in:
Dan Stillman 2008-09-09 14:15:53 +00:00
parent d0275982d5
commit 1f334a2eb8
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
chrome/content/zotero/xpcom/storage.js
View File

@ -1029,7 +1029,7 @@ Zotero.Sync.Storage = new function () {
var fileName = entryName; var fileName = entryName;
} }
if (fileName.indexOf('/') != -1 || fileName.indexOf('.') == 0) { if (fileName.indexOf('.') == 0) {
Zotero.debug("Skipping " + fileName); Zotero.debug("Skipping " + fileName);
continue; continue;
} }
@ -1090,30 +1090,7 @@ Zotero.Sync.Storage = new function () {
var zw = Components.classes["@mozilla.org/zipwriter;1"] var zw = Components.classes["@mozilla.org/zipwriter;1"]
.createInstance(Components.interfaces.nsIZipWriter); .createInstance(Components.interfaces.nsIZipWriter);
zw.open(tmpFile, 0x04 | 0x08 | 0x20); // open rw, create, truncate zw.open(tmpFile, 0x04 | 0x08 | 0x20); // open rw, create, truncate
var fileList = []; var fileList = _zipDirectory(dir, dir, zw);
dir = dir.directoryEntries;
while (dir.hasMoreElements()) {
var file = dir.getNext();
file.QueryInterface(Components.interfaces.nsILocalFile);
var fileName = file.getRelativeDescriptor(file.parent);
if (fileName.indexOf('.') == 0) {
Zotero.debug('Skipping file ' + fileName);
continue;
}
//Zotero.debug("Adding file " + fileName);
fileName = Zotero.Utilities.Base64.encode(fileName) + "%ZB64";
zw.addEntryFile(
fileName,
Components.interfaces.nsIZipWriter.COMPRESSION_DEFAULT,
file,
true
);
fileList.push(fileName);
}
if (fileList.length == 0) { if (fileList.length == 0) {
Zotero.debug('No files to add -- removing zip file'); Zotero.debug('No files to add -- removing zip file');
tmpFile.remove(null); tmpFile.remove(null);
@ -1141,6 +1118,37 @@ Zotero.Sync.Storage = new function () {
return true; return true;
} }
function _zipDirectory(rootDir, dir, zipWriter) {
var fileList = [];
dir = dir.directoryEntries;
while (dir.hasMoreElements()) {
var file = dir.getNext();
file.QueryInterface(Components.interfaces.nsILocalFile);
if (file.isDirectory()) {
//Zotero.debug("Recursing into directory " + file.leafName);
fileList.concat(_zipDirectory(rootDir, file, zipWriter));
continue;
}
var fileName = file.getRelativeDescriptor(rootDir);
if (fileName.indexOf('.') == 0) {
Zotero.debug('Skipping file ' + fileName);
continue;
}
//Zotero.debug("Adding file " + fileName);
fileName = Zotero.Utilities.Base64.encode(fileName) + "%ZB64";
zipWriter.addEntryFile(
fileName,
Components.interfaces.nsIZipWriter.COMPRESSION_DEFAULT,
file,
true
);
fileList.push(fileName);
}
return fileList;
}
/** /**
* Upload the generated ZIP file to the server * Upload the generated ZIP file to the server