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

Trigger downloading and opening of evicted iCloud Drive files

Browse source
This commit is contained in:
Dan Stillman 2018-08-19 01:36:23 -04:00
parent e48a1a2abb
commit ec76575645
3 changed files with 110 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chrome/content/zotero/xpcom/file.js
View file

@ -1334,6 +1334,11 @@ Zotero.File = new function(){
} }
this.getEvictedICloudPath = function (path) {
return OS.Path.join(OS.Path.dirname(path), '.' + OS.Path.basename(path) + '.icloud');
};
this.isDropboxDirectory = function(path) { this.isDropboxDirectory = function(path) {
return path.toLowerCase().indexOf('dropbox') != -1; return path.toLowerCase().indexOf('dropbox') != -1;
} }

2
chrome/content/zotero/xpcom/zotero.js
View file

@ -1010,6 +1010,8 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
* Launch a file with the given application * Launch a file with the given application
*/ */
this.launchFileWithApplication = function (filePath, applicationPath) { this.launchFileWithApplication = function (filePath, applicationPath) {
Zotero.debug(`Launching ${filePath} with ${applicationPath}`);
var exec = Zotero.File.pathToFile(applicationPath); var exec = Zotero.File.pathToFile(applicationPath);
if (!exec.exists()) { if (!exec.exists()) {
throw new Error("'" + applicationPath + "' does not exist"); throw new Error("'" + applicationPath + "' does not exist");

119
chrome/content/zotero/zoteroPane.js
View file

@ -4055,7 +4055,7 @@ var ZoteroPane = new function()
}); });
this.viewAttachment = Zotero.serial(Zotero.Promise.coroutine(function* (itemIDs, event, noLocateOnMissing, forceExternalViewer) { this.viewAttachment = Zotero.serial(async function (itemIDs, event, noLocateOnMissing, forceExternalViewer) {
// If view isn't editable, don't show Locate button, since the updated // If view isn't editable, don't show Locate button, since the updated
// path couldn't be sent back up // path couldn't be sent back up
if (!this.collectionsView.editable) { if (!this.collectionsView.editable) {
@ -4071,9 +4071,26 @@ var ZoteroPane = new function()
} }
} }
var launchFile = async function (path, contentType) {
// Custom PDF handler
if (contentType === 'application/pdf') {
let pdfHandler = Zotero.Prefs.get("fileHandler.pdf");
if (pdfHandler) {
if (await OS.File.exists(pdfHandler)) {
Zotero.launchFileWithApplication(path, pdfHandler);
return;
}
else {
Zotero.logError(`${pdfHandler} not found -- launching file normally`);
}
}
}
Zotero.launchFile(path);
};
for (let i = 0; i < itemIDs.length; i++) { for (let i = 0; i < itemIDs.length; i++) {
let itemID = itemIDs[i]; let itemID = itemIDs[i];
var item = yield Zotero.Items.getAsync(itemID); let item = await Zotero.Items.getAsync(itemID);
if (!item.isAttachment()) { if (!item.isAttachment()) {
throw new Error("Item " + itemID + " is not an attachment"); throw new Error("Item " + itemID + " is not an attachment");
} }
@ -4083,58 +4100,79 @@ var ZoteroPane = new function()
continue; continue;
} }
var path = yield item.getFilePathAsync(); let isLinkedFile = !item.isImportedAttachment();
if (path) { let path = item.getFilePath();
let file = Zotero.File.pathToFile(path); let fileExists = await OS.File.exists(path);
let evictedICloudPath;
Zotero.debug("Opening " + path); // If the file is an evicted iCloud Drive file, launch that to trigger a download.
// As of 10.13.6, launching an .icloud file triggers the download and opens the
if(forceExternalViewer !== undefined) { // associated program (e.g., Preview) but won't actually open the file, so we wait a bit
var externalViewer = forceExternalViewer; // for the original file to exist and then continue with regular file opening below.
} else { //
var mimeType = yield Zotero.MIME.getMIMETypeFromFile(file); // To trigger eviction for testing, use Cirrus from https://eclecticlight.co/downloads/
if (!fileExists && Zotero.isMac && isLinkedFile) {
//var mimeType = attachment.attachmentMIMEType; // Get the path to the .icloud file
// TODO: update DB with new info if changed? let iCloudPath = Zotero.File.getEvictedICloudPath(item.getFilePath());
if (await OS.File.exists(iCloudPath)) {
var ext = Zotero.File.getExtension(file); Zotero.debug("Triggering download of iCloud file");
var externalViewer = !Zotero.MIME.hasInternalHandler(mimeType, ext) await launchFile(iCloudPath, item.attachmentContentType);
|| Zotero.Prefs.get('launchNonNativeFiles'); let time = new Date();
let maxTime = 5000;
let revealed = false;
while (true) {
// If too much time has elapsed, just reveal the file in Finder instead
if (new Date() - time > maxTime) {
Zotero.debug(`File not available after ${maxTime} -- revealing instead`);
try {
Zotero.File.reveal(iCloudPath);
revealed = true;
}
catch (e) {
Zotero.logError(e);
// In case the main file became available
try {
Zotero.File.reveal(path);
revealed = true;
}
catch (e) {
Zotero.logError(e);
}
}
break;
} }
if (!externalViewer) { // Wait a bit for the download and check again
let url = Services.io.newFileURI(file).spec; await Zotero.Promise.delay(250);
this.loadURI(url, event); Zotero.debug("Checking for downloaded file");
if (await OS.File.exists(path)) {
Zotero.debug("File is ready");
fileExists = true;
break;
}
} }
else {
Zotero.Notifier.trigger('open', 'file', itemID);
// Custom PDF handler if (revealed) {
if (item.attachmentContentType === 'application/pdf') {
let pdfHandler = Zotero.Prefs.get("fileHandler.pdf");
if (pdfHandler) {
if (yield OS.File.exists(pdfHandler)) {
Zotero.launchFileWithApplication(file.path, pdfHandler);
continue; continue;
} }
else {
Zotero.logError(`${pdfHandler} not found -- launching file normally`);
}
} }
} }
Zotero.launchFile(file); if (fileExists) {
Zotero.debug("Opening " + path);
Zotero.Notifier.trigger('open', 'file', item.id);
launchFile(path, item.attachmentContentType);
continue;
} }
}
else { if (isLinkedFile || !Zotero.Sync.Storage.Local.getEnabledForLibrary(item.libraryID)) {
if (!item.isImportedAttachment()
|| !Zotero.Sync.Storage.Local.getEnabledForLibrary(item.libraryID)) {
this.showAttachmentNotFoundDialog(itemID, noLocateOnMissing); this.showAttachmentNotFoundDialog(itemID, noLocateOnMissing);
return; return;
} }
try { try {
yield Zotero.Sync.Runner.downloadFile(item); await Zotero.Sync.Runner.downloadFile(item);
} }
catch (e) { catch (e) {
// TODO: show error somewhere else // TODO: show error somewhere else
@ -4143,7 +4181,7 @@ var ZoteroPane = new function()
return; return;
} }
if (!(yield item.getFilePathAsync())) { if (!await item.getFilePathAsync()) {
ZoteroPane_Local.showAttachmentNotFoundDialog(item.id, noLocateOnMissing, true); ZoteroPane_Local.showAttachmentNotFoundDialog(item.id, noLocateOnMissing, true);
return; return;
} }
@ -4155,8 +4193,7 @@ var ZoteroPane = new function()
// Retry after download // Retry after download
i--; i--;
} }
} });
}));
/** /**