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

Use OS.File.removeDir() to delete existing attachment files during sync

Browse Source
This commit is contained in:
Dan Stillman 2016-06-02 03:40:01 -04:00
parent 88a43fea31
commit 0d008b4704
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
chrome/content/zotero/xpcom/storage/storageLocal.js
View File

@ -894,38 +894,9 @@ Zotero.Sync.Storage.Local = {
}), }),
_deleteExistingAttachmentFiles: Zotero.Promise.coroutine(function* (item) { _deleteExistingAttachmentFiles: Zotero.Promise.method(function (item) {
var parentDir = Zotero.Attachments.getStorageDirectory(item).path; var parentDir = Zotero.Attachments.getStorageDirectory(item).path;
return this._deleteExistingFilesInDirectory(parentDir); return OS.File.removeDir(parentDir);
}),
_deleteExistingFilesInDirectory: Zotero.Promise.coroutine(function* (dir) {
var dirsToDelete = [];
var iterator = new OS.File.DirectoryIterator(dir);
try {
yield iterator.forEach(function (entry) {
return Zotero.Promise.coroutine(function* () {
if (entry.isDir) {
dirsToDelete.push(entry.path);
}
else {
try {
yield OS.File.remove(entry.path);
}
catch (e) {
Zotero.File.checkFileAccessError(e, entry.path, 'delete');
}
}
})();
});
}
finally {
iterator.close();
}
for (let path of dirsToDelete) {
yield this._deleteExistingFilesInDirectory(path);
}
}), }),