commit 24f7b9fe488121f35d6c228f112e3c9695e3e52d
parent 524033abc93f265ba6108e2e06e0b1e7680ef0e5
Author: Simon Kornblith <simon@simonster.com>
Date: Fri, 27 Apr 2012 22:25:40 -0400
Expose path to PDF in Zotero storage folder to export translators as attachment.localPath
Diffstat:
1 file changed, 110 insertions(+), 104 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js
@@ -635,120 +635,126 @@ Zotero.Translate.ItemGetter.prototype = {
attachmentArray.mimeType = attachmentArray.uniqueFields.mimeType = attachment.attachmentMIMEType;
// Get charset
attachmentArray.charset = attachmentArray.uniqueFields.charset = attachment.attachmentCharset;
-
- if(linkMode != Zotero.Attachments.LINK_MODE_LINKED_URL && this._exportFileDirectory) {
- var exportDir = this._exportFileDirectory;
-
- // Add path and filename if not an internet link
+ if(linkMode != Zotero.Attachments.LINK_MODE_LINKED_URL) {
var attachFile = attachment.getFile();
- if(attachFile) {
- attachmentArray.defaultPath = "files/" + attachmentArray.itemID + "/" + attachFile.leafName;
- attachmentArray.filename = attachFile.leafName;
+ attachmentArray.localPath = attachFile.path;
+
+ if(this._exportFileDirectory) {
+ var exportDir = this._exportFileDirectory;
- /**
- * Copies the attachment file to the specified relative path from the
- * export directory.
- * @param {String} attachPath The path to which the file should be exported
- * including the filename. If supporting files are included, they will be
- * copied as well without any renaming.
- * @param {Boolean} overwriteExisting Optional - If this is set to false, the
- * function will throw an error when exporting a file would require an existing
- * file to be overwritten. If true, the file will be silently overwritten.
- * defaults to false if not provided.
- */
- attachmentArray.saveFile = function(attachPath, overwriteExisting) {
- // Ensure a valid path is specified
- if(attachPath === undefined || attachPath == "") {
- throw new Error("ERROR_EMPTY_PATH");
- }
-
- // Set the default value of overwriteExisting if it was not provided
- if (overwriteExisting === undefined) {
- overwriteExisting = false;
- }
+ // Add path and filename if not an internet link
+ var attachFile = attachment.getFile();
+ if(attachFile) {
+ attachmentArray.defaultPath = "files/" + attachmentArray.itemID + "/" + attachFile.leafName;
+ attachmentArray.filename = attachFile.leafName;
- // Separate the path into a list of subdirectories and the attachment filename,
- // and initialize the required file objects
- var targetFile = Components.classes["@mozilla.org/file/local;1"].
- createInstance(Components.interfaces.nsILocalFile);
- targetFile.initWithFile(exportDir);
- for each(var dir in attachPath.split("/")) targetFile.append(dir);
-
- // First, check that we have not gone lower than exportDir in the hierarchy
- var parent = targetFile, inExportFileDirectory;
- while((parent = parent.parent)) {
- if(exportDir.equals(parent)) {
- inExportFileDirectory = true;
- break;
+ /**
+ * Copies the attachment file to the specified relative path from the
+ * export directory.
+ * @param {String} attachPath The path to which the file should be exported
+ * including the filename. If supporting files are included, they will be
+ * copied as well without any renaming.
+ * @param {Boolean} overwriteExisting Optional - If this is set to false, the
+ * function will throw an error when exporting a file would require an existing
+ * file to be overwritten. If true, the file will be silently overwritten.
+ * defaults to false if not provided.
+ */
+ attachmentArray.saveFile = function(attachPath, overwriteExisting) {
+ // Ensure a valid path is specified
+ if(attachPath === undefined || attachPath == "") {
+ throw new Error("ERROR_EMPTY_PATH");
}
- }
-
- if(!inExportFileDirectory) {
- throw new Error("Invalid path; attachment cannot be placed above export "+
- "directory in the file hirarchy");
- }
-
- // Create intermediate directories if they don't exist
- parent = targetFile;
- while((parent = parent.parent) && !parent.exists()) {
- parent.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0700);
- }
-
- // Delete any existing file if overwriteExisting is set, or throw an exception
- // if it is not
- if(targetFile.exists()) {
- if(overwriteExisting) {
- targetFile.remove(false);
- } else {
- throw new Error("ERROR_FILE_EXISTS " + targetFile.leafName);
+
+ // Set the default value of overwriteExisting if it was not provided
+ if (overwriteExisting === undefined) {
+ overwriteExisting = false;
}
- }
-
- var directory = targetFile.parent;
-
- // The only attachments that can have multiple supporting files are of mime type
- // text/html (specified in Attachments.getNumFiles())
- if(attachment.attachmentMIMEType == "text/html"
- && Zotero.Attachments.getNumFiles(attachment) > 1) {
- // Attachment is a snapshot with supporting files. Check if any of the
- // supporting files would cause a name conflict, and build a list of transfers
- // that should be performed
- var copySrcs = [];
- var files = attachment.getFile().parent.directoryEntries;
- while (files.hasMoreElements()) {
- file = files.getNext();
- file.QueryInterface(Components.interfaces.nsIFile);
-
- // Ignore the main attachment file (has already been checked for name conflict)
- if(attachFile.equals(file)) {
- continue;
+
+ // Separate the path into a list of subdirectories and the attachment filename,
+ // and initialize the required file objects
+ var targetFile = Components.classes["@mozilla.org/file/local;1"].
+ createInstance(Components.interfaces.nsILocalFile);
+ targetFile.initWithFile(exportDir);
+ for each(var dir in attachPath.split("/")) targetFile.append(dir);
+
+ // First, check that we have not gone lower than exportDir in the hierarchy
+ var parent = targetFile, inExportFileDirectory;
+ while((parent = parent.parent)) {
+ if(exportDir.equals(parent)) {
+ inExportFileDirectory = true;
+ break;
}
-
- // Remove any existing files in the target destination if overwriteExisting
- // is set, or throw an exception if it is not
- var targetSupportFile = targetFile.parent.clone();
- targetSupportFile.append(file.leafName);
- if(targetSupportFile.exists()) {
- if(overwriteExisting) {
- targetSupportFile.remove(false);
- } else {
- throw new Error("ERROR_FILE_EXISTS " + targetSupportFile.leafName);
- }
+ }
+
+ if(!inExportFileDirectory) {
+ throw new Error("Invalid path; attachment cannot be placed above export "+
+ "directory in the file hirarchy");
+ }
+
+ // Create intermediate directories if they don't exist
+ parent = targetFile;
+ while((parent = parent.parent) && !parent.exists()) {
+ parent.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0700);
+ }
+
+ // Delete any existing file if overwriteExisting is set, or throw an exception
+ // if it is not
+ if(targetFile.exists()) {
+ if(overwriteExisting) {
+ targetFile.remove(false);
+ } else {
+ throw new Error("ERROR_FILE_EXISTS " + targetFile.leafName);
}
- copySrcs.push(file.clone());
}
- // No conflicts were detected or all conflicts were resolved, perform the copying
- attachFile.copyTo(directory, targetFile.leafName);
- for(var i = 0; i < copySrcs.length; i++) {
- copySrcs[i].copyTo(directory, copySrcs[i].leafName);
+ var directory = targetFile.parent;
+
+ // The only attachments that can have multiple supporting files are of mime type
+ // text/html (specified in Attachments.getNumFiles())
+ if(attachment.attachmentMIMEType == "text/html"
+ && Zotero.Attachments.getNumFiles(attachment) > 1) {
+ // Attachment is a snapshot with supporting files. Check if any of the
+ // supporting files would cause a name conflict, and build a list of transfers
+ // that should be performed
+ var copySrcs = [];
+ var files = attachment.getFile().parent.directoryEntries;
+ while (files.hasMoreElements()) {
+ file = files.getNext();
+ file.QueryInterface(Components.interfaces.nsIFile);
+
+ // Ignore the main attachment file (has already been checked for name conflict)
+ if(attachFile.equals(file)) {
+ continue;
+ }
+
+ // Remove any existing files in the target destination if overwriteExisting
+ // is set, or throw an exception if it is not
+ var targetSupportFile = targetFile.parent.clone();
+ targetSupportFile.append(file.leafName);
+ if(targetSupportFile.exists()) {
+ if(overwriteExisting) {
+ targetSupportFile.remove(false);
+ } else {
+ throw new Error("ERROR_FILE_EXISTS " + targetSupportFile.leafName);
+ }
+ }
+ copySrcs.push(file.clone());
+ }
+
+ // No conflicts were detected or all conflicts were resolved, perform the copying
+ attachFile.copyTo(directory, targetFile.leafName);
+ for(var i = 0; i < copySrcs.length; i++) {
+ copySrcs[i].copyTo(directory, copySrcs[i].leafName);
+ }
+ } else {
+ // Attachment is a single file
+ // Copy the file to the specified location
+ attachFile.copyTo(directory, targetFile.leafName);
}
- } else {
- // Attachment is a single file
- // Copy the file to the specified location
- attachFile.copyTo(directory, targetFile.leafName);
- }
- };
+
+ attachmentArray.path = targetFile.path;
+ };
+ }
}
}
