From 66fbf3d0085e00f74243cae1fccae3647d7be7e6 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 17 Oct 2009 05:07:17 +0000
Subject: [PATCH] Fix nsIFile.remove() errors during sync, I imagine

---
 chrome/content/zotero/xpcom/storage.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index c9106f083c..0b67e4aaae 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -850,9 +850,11 @@ Zotero.Sync.Storage = new function () {
 		}
 		catch (e) {
 			Zotero.debug(zipFile.leafName + " is not a valid ZIP file", 2);
-			if (zipFile.exists()) {
-				zipFile.remove(false);
-			}
+			zipReader.close();
+			zipFile.remove(false);
+			
+			// TODO: Remove prop file to trigger reuploading, in case it was an upload error?
+			
 			return false;
 		}
 		
@@ -861,7 +863,13 @@ Zotero.Sync.Storage = new function () {
 			Zotero.Attachments.createDirectoryForItem(item.id);
 		}
 		
-		_deleteExistingAttachmentFiles(item);
+		try {
+			_deleteExistingAttachmentFiles(item);
+		}
+		catch (e) {
+			zipReader.close();
+			throw (e);
+		}
 		
 		var returnFile = null;
 		
@@ -916,6 +924,7 @@ Zotero.Sync.Storage = new function () {
 					// Require 40 available characters in path -- this is arbitrary,
 					// but otherwise filenames are going to end up being cut off
 					if (newLength < 40) {
+						zipReader.close();
 						var msg = "Due to a Windows path length limitation, your Zotero data directory "
 								+ "is too deep in the filesystem for syncing to work reliably. "
 								+ "Please relocate your Zotero data to a higher directory.";
@@ -954,6 +963,7 @@ Zotero.Sync.Storage = new function () {
 					}
 				}
 				else {
+					zipReader.close();
 					throw(e);
 				}
 			}