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

Stored files with '%' in filename couldn't be found on Windows -- now, on all platforms, filter imported filename (after first trying to URL decode, just to be nice)

Browse Source
This commit is contained in:
Dan Stillman 2010-02-08 17:56:43 +00:00
parent 7f70af0c1f
commit 50e100ec82
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chrome/content/zotero/xpcom/attachments.js
View File

@ -49,10 +49,16 @@ Zotero.Attachments = new function(){
function importFromFile(file, sourceItemID, libraryID) { function importFromFile(file, sourceItemID, libraryID) {
Zotero.debug('Importing attachment from file'); Zotero.debug('Importing attachment from file');
var title = file.leafName; // Try decoding URI entities, since we're going to strip '%'
var newName = file.leafName;
try {
newName = decodeURIComponent(file.leafName);
}
catch (e) {}
newName = Zotero.File.getValidFileName(newName);
if (!file.isFile()) { if (!file.isFile()) {
throw ("'" + title + "' must be a file in Zotero.Attachments.importFromFile()"); throw ("'" + file.leafName + "' must be a file in Zotero.Attachments.importFromFile()");
} }
Zotero.DB.beginTransaction(); Zotero.DB.beginTransaction();
@ -67,7 +73,7 @@ Zotero.Attachments = new function(){
else if (libraryID) { else if (libraryID) {
attachmentItem.libraryID = libraryID; attachmentItem.libraryID = libraryID;
} }
attachmentItem.setField('title', title); attachmentItem.setField('title', newName);
attachmentItem.setSource(sourceItemID); attachmentItem.setSource(sourceItemID);
attachmentItem.attachmentLinkMode = this.LINK_MODE_IMPORTED_FILE; attachmentItem.attachmentLinkMode = this.LINK_MODE_IMPORTED_FILE;
var itemID = attachmentItem.save(); var itemID = attachmentItem.save();
@ -75,11 +81,11 @@ Zotero.Attachments = new function(){
// Create directory for attachment files within storage directory // Create directory for attachment files within storage directory
var destDir = this.createDirectoryForItem(itemID); var destDir = this.createDirectoryForItem(itemID);
file.copyTo(destDir, null); file.copyTo(destDir, newName);
// Point to copied file // Point to copied file
var newFile = destDir.clone(); var newFile = destDir.clone();
newFile.append(title); newFile.append(newName);
var mimeType = Zotero.MIME.getMIMETypeFromFile(newFile); var mimeType = Zotero.MIME.getMIMETypeFromFile(newFile);