mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Mendeley import: Look for Downloaded files relative to DB if not found

Browse source 
Addresses #1451
This commit is contained in:
Dan Stillman 2018-06-05 08:29:28 -04:00
parent 2939b3ae95
commit 6ac65373a3
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
chrome/content/zotero/import/mendeley/mendeleyImport.js
View file

@ -740,21 +740,37 @@ Zotero_Import_Mendeley.prototype._saveItems = async function (libraryID, json) {
* Saves attachments and extracted annotations for a given document * Saves attachments and extracted annotations for a given document
*/ */
Zotero_Import_Mendeley.prototype._saveFilesAndAnnotations = async function (files, libraryID, parentItemID, annotations) { Zotero_Import_Mendeley.prototype._saveFilesAndAnnotations = async function (files, libraryID, parentItemID, annotations) {
var dataDir = OS.Path.dirname(this._file);
for (let file of files) { for (let file of files) {
try { try {
if (!file.fileURL) continue; if (!file.fileURL) continue;
let path = OS.Path.fromFileURI(file.fileURL); let path = OS.Path.fromFileURI(file.fileURL);
let isDownloadedFile = this._isDownloadedFile(path);
let fileExists = false;
if (await OS.File.exists(path)) {
fileExists = true;
}
// For file paths in Downloaded folder, try relative to database if not found at the
// absolute location, in case this is a DB backup
else if (isDownloadedFile) {
let altPath = OS.Path.join(dataDir, 'Downloaded', OS.Path.basename(path));
if (altPath != path && await OS.File.exists(altPath)) {
path = altPath;
fileExists = true;
}
}
let attachment; let attachment;
if (await OS.File.exists(path)) { if (fileExists) {
let options = { let options = {
libraryID, libraryID,
parentItemID, parentItemID,
file: path file: path
}; };
// If file is in Mendeley downloads folder, import it // If file is in Mendeley downloads folder, import it
if (OS.Path.dirname(path).endsWith(OS.Path.join('Mendeley Desktop', 'Downloaded'))) { if (isDownloadedFile) {
attachment = await Zotero.Attachments.importFromFile(options); attachment = await Zotero.Attachments.importFromFile(options);
} }
// Otherwise link it // Otherwise link it
@ -789,6 +805,13 @@ Zotero_Import_Mendeley.prototype._saveFilesAndAnnotations = async function (file
} }
} }
Zotero_Import_Mendeley.prototype._isDownloadedFile = async function (path) {
var parentDir = OS.Path.dirname(path);
return parentDir.endsWith(OS.Path.join('Application Support', 'Mendeley Desktop', 'Downloaded'))
|| parentDir.endsWith(OS.Path.join('Local', 'Mendeley Ltd', 'Desktop', 'Downloaded'))
|| parentDir.endsWith(OS.Path.join('data', 'Mendeley Ltd.', 'Mendeley Desktop', 'Downloaded'));
}
Zotero_Import_Mendeley.prototype._saveAnnotations = async function (annotations, parentItemID, attachmentItemID) { Zotero_Import_Mendeley.prototype._saveAnnotations = async function (annotations, parentItemID, attachmentItemID) {
if (!annotations.length) return; if (!annotations.length) return;
var noteStrings = []; var noteStrings = [];