MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-20 18:23:21 +00:00
Code Issues Releases Wiki Activity

Fixed Toast and Message-Box for non-english characters for older linux releases, like Ubuntu 10-14

Browse Source
This commit is contained in:
Bryan Roe
2020-06-11 10:29:37 -07:00
parent f0a1744338
commit f230243475
3 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

50
modules/message-box.js
View File

@@ -44,6 +44,12 @@ const WM_CLOSE = 0x0010;
var promise = require('promise'); var promise = require('promise');
//function sendConsoleText(msg)
//{
// require('MeshAgent').SendCommand({ action: 'msg', type: 'console', value: msg });
//}
function messageBox() function messageBox()
{ {
this._ObjectID = 'message-box'; this._ObjectID = 'message-box';
@@ -324,6 +330,8 @@ function linux_messageBox()
if (this.zenity) if (this.zenity)
{ {
ret._options = { title: title.trim(), caption: caption.trim(), timeout: timeout, layout: layout, zenity: this.zenity };
// GNOME/ZENITY // GNOME/ZENITY
if (this.zenity.timeout) if (this.zenity.timeout)
{ {
@@ -341,7 +349,7 @@ function linux_messageBox()
} }
ret.child.descriptorMetadata = 'zenity, message-box' ret.child.descriptorMetadata = 'zenity, message-box'
ret.child.promise = ret; ret.child.promise = ret;
ret.child.stderr.on('data', function (chunk) { }); ret.child.stderr.str = ''; ret.child.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
ret.child.stdout.on('data', function (chunk) { }); ret.child.stdout.on('data', function (chunk) { });
ret.child.on('exit', function (code) ret.child.on('exit', function (code)
{ {
@@ -355,7 +363,45 @@ function linux_messageBox()
this.promise._rej('denied'); this.promise._rej('denied');
break; break;
default: default:
this.promise._rej('timeout'); if (this.stderr.str.includes('option is not') && this.promise._options.zenity.timeout)
{
var uname = require('user-sessions').getUsername(uid);
this.promise._ch = require('child_process').execFile('/bin/sh', ['sh'], { type: require('child_process').SpawnTypes.TERM });
this.promise._ch.promise = this.promise;
this.promise._ch.stderr.str = ''; this.promise._ch.stderr.on('data', function (c) { this.str += c.toString(); });
this.promise._ch.stdout.str = ''; this.promise._ch.stdout.on('data', function (c)
{
this.str += c.toString();
if (this.str.includes('<<<<$_RESULT>>>>')) { this.str = this.str.split('<<<<$_RESULT>>>>')[1]; }
if (this.str.includes('>>>>')) { this.parent.kill(); }
});
this.promise._ch.stdin.write('su - ' + uname + '\n');
this.promise._ch.stdin.write('export DISPLAY=' + xinfo.display + '\n');
this.promise._ch.stdin.write('zenity ' + (this.promise._options.layout == null ? '--question' : '--warning'));
this.promise._ch.stdin.write(' --title=' + this.promise._options.title + ' --text=' + this.promise._options.caption);
this.promise._ch.stdin.write(' --timeout=' + this.promise._options.timeout + '\nexport _RESULT=$?\necho "<<<<$_RESULT>>>>"\nexit');
this.promise._ch.on('exit', function ()
{
var res = this.stdout.str.split('>>>>')[0].split('<<<<')[1];
switch(parseInt(res))
{
case 0:
this.promise._res();
break;
case 1:
this.promise._rej('denied');
break;
default:
this.promise._rej(this.stderr.str.toString());
break;
}
});
}
else
{
this.promise._rej(this.stderr.str.trim());
}
break; break;
} }
}); });

8
modules/toaster.js
View File

@@ -126,7 +126,6 @@ function Toaster()
{ {
if (process.platform == 'linux' && !require('linux-dbus').hasService('org.freedesktop.Notifications')) if (process.platform == 'linux' && !require('linux-dbus').hasService('org.freedesktop.Notifications'))
{ {
// No D-Bus service to handle notifications, so we must fake a notification with ZENITY --info // No D-Bus service to handle notifications, so we must fake a notification with ZENITY --info
if (require('message-box').zenity.timeout) if (require('message-box').zenity.timeout)
{ {
@@ -168,7 +167,11 @@ function Toaster()
if (require('message-box').zenity.timeout) if (require('message-box').zenity.timeout)
{ {
// Timeout Supported // Timeout Supported
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } }); retVal._mb = require('message-box').create(retVal.title, retVal.caption, 5, 1);
retVal._mb.toast = retVal;
retVal._mb.then(function () { this.toast._res('DISMISSED'); }, function (e) { this.toast._rej(e); });
return (retVal);
//retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
} }
else else
{ {
@@ -181,7 +184,6 @@ function Toaster()
} }
else else
{ {
// Use ZENITY Notification // Use ZENITY Notification
retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--notification', '--title=' + title, '--text=' + caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } }); retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--notification', '--title=' + title, '--text=' + caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
retVal.child.descriptorMetadata = 'toaster (zenity/notification)' retVal.child.descriptorMetadata = 'toaster (zenity/notification)'