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

prevent integration pipe from blocking and make sure integration pipe gets removed

Browse source
This commit is contained in:
Simon Kornblith 2011-03-20 08:26:25 +00:00
parent 7f9b29f751
commit 52d38c9daf
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,29 +186,40 @@ Zotero.Integration = new function() {
* Reads from the temp file set up to handle integration pipe and executes the appropriate * Reads from the temp file set up to handle integration pipe and executes the appropriate
* integration command * integration command
*/ */
var _integrationPipeObserver = {"observe":function() { var _integrationPipeObserver = {"observe":function(subject) {
var string = Zotero.File.getContents(_tmpFile); // if we had an error reading from the pipe, return immediately, because trying to read
// again will probably just cause us to loop
if(subject.exitValue !== 0) {
Components.utils.reportError("Zotero: An error occurred reading from integration pipe");
return;
}
// read from pipe
var string = Zotero.File.getContents(_tmpFile);
if(string != "") { if(string != "") {
// exec command if possible
var parts = string.match(/^([^ \n]*) ([^ \n]*)(?: ([^\n]*))?\n?$/); var parts = string.match(/^([^ \n]*) ([^ \n]*)(?: ([^\n]*))?\n?$/);
if(parts) { if(parts) {
var agent = parts[1].toString(); var agent = parts[1].toString();
var cmd = parts[2].toString(); var cmd = parts[2].toString();
// return if we were told to shutdown
if(agent === "Zotero" && cmd === "shutdown") return;
// set up another process to read from the pipe
_shProc.runAsync(_shCmd, _shCmd.length, _integrationPipeObserver);
var document = parts[3] ? parts[3].toString() : null; var document = parts[3] ? parts[3].toString() : null;
// remove temp file and halt reading on shutdown
if(agent === "Zotero" && cmd === "shutdown") {
_tmpFile.remove();
return;
}
Zotero.Integration.execCommand(agent, cmd, document); Zotero.Integration.execCommand(agent, cmd, document);
} else { } else {
Components.utils.reportError("Integration Worker: Invalid input received: "+string); // set up another process to read from the pipe
_shProc.runAsync(_shCmd, _shCmd.length, _integrationPipeObserver);
Components.utils.reportError("Zotero: Invalid integration input received: "+string);
} }
} else {
// set up another process to read from the pipe
_shProc.runAsync(_shCmd, _shCmd.length, _integrationPipeObserver);
} }
_shProc.runAsync(_shCmd, _shCmd.length, _integrationPipeObserver);
}}; }};
/** /**
@ -371,6 +382,7 @@ Zotero.Integration = new function() {
oStream.write(cmd, cmd.length); oStream.write(cmd, cmd.length);
oStream.close(); oStream.close();
_fifoFile.remove(false); _fifoFile.remove(false);
_tmpFile.remove(false);
} }
/** /**