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

Expose more integration pipe handling code

Browse source 
This should eventually reduce the amount of duplicated code needed to
handle Word 2016 for Mac
This commit is contained in:
Simon Kornblith 2015-07-12 13:45:39 -04:00
parent e355cab886
commit 7d87d70e92
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
chrome/content/zotero/xpcom/integration.js
View file

@ -88,7 +88,7 @@ Zotero.Integration = new function() {
sharedPipe.append(".zoteroIntegrationPipe_"+logname); sharedPipe.append(".zoteroIntegrationPipe_"+logname);
if(sharedPipe.exists()) { if(sharedPipe.exists()) {
if(_deletePipe(sharedPipe) && sharedDir.isWritable()) { if(this.deletePipe(sharedPipe) && sharedDir.isWritable()) {
pipe = sharedPipe; pipe = sharedPipe;
} }
} else if(sharedDir.isWritable()) { } else if(sharedDir.isWritable()) {
@ -104,36 +104,44 @@ Zotero.Integration = new function() {
pipe.append(".zoteroIntegrationPipe"); pipe.append(".zoteroIntegrationPipe");
// destroy old pipe, if one exists // destroy old pipe, if one exists
if(!_deletePipe(pipe)) return; if(!this.deletePipe(pipe)) return;
} }
// try to initialize pipe // try to initialize pipe
try { try {
Zotero.IPC.Pipe.initPipeListener(pipe, function(string) { this.initPipe(pipe);
if(string != "") {
// exec command if possible
var parts = string.match(/^([^ \n]*) ([^ \n]*)(?: ([^\n]*))?\n?$/);
if(parts) {
var agent = parts[1].toString();
var cmd = parts[2].toString();
var document = parts[3] ? parts[3].toString() : null;
Zotero.Integration.execCommand(agent, cmd, document);
} else {
Components.utils.reportError("Zotero: Invalid integration input received: "+string);
}
}
});
} catch(e) { } catch(e) {
Zotero.logError(e); Zotero.logError(e);
} }
Q.delay(1000).then(_checkPluginVersions); Q.delay(1000).then(_checkPluginVersions);
} }
/**
* Begin listening for integration commands on the given pipe
* @param {String} pipe The path to the pipe
*/
this.initPipe = function(pipe) {
Zotero.IPC.Pipe.initPipeListener(pipe, function(string) {
if(string != "") {
// exec command if possible
var parts = string.match(/^([^ \n]*) ([^ \n]*)(?: ([^\n]*))?\n?$/);
if(parts) {
var agent = parts[1].toString();
var cmd = parts[2].toString();
var document = parts[3] ? parts[3].toString() : null;
Zotero.Integration.execCommand(agent, cmd, document);
} else {
Components.utils.reportError("Zotero: Invalid integration input received: "+string);
}
}
});
}
/** /**
* Deletes a defunct pipe on OS X * Deletes a defunct pipe on OS X
*/ */
function _deletePipe(pipe) { this.deletePipe = function(pipe) {
try { try {
if(pipe.exists()) { if(pipe.exists()) {
Zotero.IPC.safePipeWrite(pipe, "Zotero shutdown\n"); Zotero.IPC.safePipeWrite(pipe, "Zotero shutdown\n");