www

commit 6ba65270ceec0b3723b23a10384ac9251e767d68
parent 0850ca94b13191b9ea48df6022945d6be17b8d50
Author: Simon Kornblith <simon@simonster.com>
Date:   Sun,  7 Apr 2013 01:58:35 -0400

Revert "When mimeType is not supplied, try to fetch it from server and redo checks for automatic snapshots."

This reverts commit 6dd94f0a3ae2be60b0c6ebd4c27559f679adaaad.

Diffstat:
M
chrome/content/zotero/xpcom/attachments.js
 | 
4
+---
M
chrome/content/zotero/xpcom/mime.js
 | 
2
--
M
chrome/content/zotero/xpcom/translation/translate_item.js
 | 
28
++++------------------------

3 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js
@@ -30,8 +30,6 @@ Zotero.Attachments = new function(){
 	this.LINK_MODE_LINKED_URL = 3;
 	this.BASE_PATH_PLACEHOLDER = 'attachments:';
 	
-	this.SNAPSHOT_MIMETYPES = ["text/html", "application/xhtml+xml"];
-	
 	this.importFromFile = importFromFile;
 	this.linkFromFile = linkFromFile;
 	this.importSnapshotFromFile = importSnapshotFromFile;
@@ -576,7 +574,7 @@ Zotero.Attachments = new function(){
 				};
 			}
 			
-			if (this.SNAPSHOT_MIMETYPES.indexOf(mimeType) != -1) {
+			if (mimeType === 'text/html' || mimeType === 'application/xhtml+xml') {
 				var sync = true;
 				
 				// Load WebPageDump code
diff --git a/chrome/content/zotero/xpcom/mime.js b/chrome/content/zotero/xpcom/mime.js
@@ -330,8 +330,6 @@ Zotero.MIME = new function(){
 				var mimeType = xmlhttp.channel.contentType;
 			}
 			
-			if(!mimeType) mimeType = 'application/octet-stream';	//unknown item type according to RFC 2046 section 4.5.1
-			
 			var nsIURL = Components.classes["@mozilla.org/network/standard-url;1"]
 						.createInstance(Components.interfaces.nsIURL);
 			nsIURL.spec = url;
diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js
@@ -336,16 +336,10 @@ Zotero.Translate.ItemSaver.prototype = {
 			// Determine whether to save an attachment
 			if(attachment.snapshot !== false) {
 				if(attachment.document
-						|| (attachment.mimeType && Zotero.Attachments.SNAPSHOT_MIMETYPES.indexOf(attachment.mimeType) != -1)) {
-					if(!Zotero.Prefs.get("automaticSnapshots")) {
-						Zotero.debug("Translate: Automatic snapshots are disabled. Skipping.", 4);
-						return;
-					}
+						|| (attachment.mimeType && attachment.mimeType == "text/html")) {
+					if(!Zotero.Prefs.get("automaticSnapshots")) return;
 				} else {
-					if(!Zotero.Prefs.get("downloadAssociatedFiles")) {
-						Zotero.debug("Translate: File attachments are disabled. Skipping.", 4);
-						return;
-					}
+					if(!Zotero.Prefs.get("downloadAssociatedFiles")) return;
 				}
 			}
 			
@@ -411,24 +405,10 @@ Zotero.Translate.ItemSaver.prototype = {
 				// Save attachment if snapshot pref enabled or not HTML
 				// (in which case downloadAssociatedFiles applies)
 				} else {
-					if(!attachment.mimeType && attachment.mimeType !== '') {	//in case '' indicates unknwon mime type at some point
-						Zotero.debug("Translate: No mimeType specified for a possible snapshot. Trying to determine mimeType.", 4);
-						var me = this;
-						try {
-							Zotero.MIME.getMIMETypeFromURL(attachment.url, function (mimeType, hasNativeHandler) {
-								attachment.mimeType = mimeType;
-								me._saveAttachmentDownload(attachment, parentID, attachmentCallback);
-							}, this._cookieSandbox);
-						} catch(e) {
-							Zotero.debug("Translate: Error adding attachment "+attachment.url, 2);
-							attachmentCallback(attachment, false, e);
-						}
-						return;
-					}
 					var mimeType = (attachment.mimeType ? attachment.mimeType : null);
 					var fileBaseName = Zotero.Attachments.getFileBaseNameFromItem(parentID);
 					try {
-						Zotero.debug('Translate: Importing attachment from URL', 4);
+						Zotero.debug('Importing attachment from URL');
 						attachment.linkMode = "imported_url";
 						Zotero.Attachments.importFromURL(attachment.url, parentID, title,
 							fileBaseName, null, mimeType, this._libraryID, function(status, err) {