Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-proto-modemmanager: use helper in protocol

Browse source 
Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
This commit is contained in:
Lukas Voegl 2023-06-30 15:51:54 +02:00
parent 54aa70112c
commit 594bc35b87
2 changed files with 7 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
View file

@ -2,39 +2,7 @@
'require fs';
'require form';
'require network';
function getModemList() {
return fs.exec_direct('/usr/bin/mmcli', [ '-L' ]).then(function(res) {
var lines = (res || '').split(/\n/),
tasks = [];
for (var i = 0; i < lines.length; i++) {
var m = lines[i].match(/\/Modem\/(\d+)/);
if (m)
tasks.push(fs.exec_direct('/usr/bin/mmcli', [ '-m', m[1] ]));
}
return Promise.all(tasks).then(function(res) {
var modems = [];
for (var i = 0; i < res.length; i++) {
var man = res[i].match(/manufacturer: ([^\n]+)/),
mod = res[i].match(/model: ([^\n]+)/),
dev = res[i].match(/device: ([^\n]+)/);
if (dev) {
modems.push({
device: dev[1].trim(),
manufacturer: (man ? man[1].trim() : '') || '?',
model: (mod ? mod[1].trim() : '') || dev[1].trim()
});
}
}
return modems;
});
});
}
'require modemmanager_helper as helper';
network.registerPatternVirtual(/^mobiledata-.+$/);
network.registerErrorCode('MM_CONNECT_FAILED', _('Connection attempt failed.'));
@ -83,10 +51,12 @@ return network.registerProtocol('modemmanager', {
o.ucioption = 'device';
o.rmempty = false;
o.load = function(section_id) {
return getModemList().then(L.bind(function(devices) {
for (var i = 0; i < devices.length; i++)
this.value(devices[i].device,
'%s - %s'.format(devices[i].manufacturer, devices[i].model));
return helper.getModems().then(L.bind(function(devices) {
for (var i = 0; i < devices.length; i++) {
var generic = devices[i].modem.generic;
this.value(generic.device,
'%s - %s'.format(generic.manufacturer, generic.model));
}
return form.Value.prototype.load.apply(this, [section_id]);
}, this));
};

4
protocols/luci-proto-modemmanager/root/usr/share/rpcd/acl.d/luci-proto-modemmanager.json
View file

@ -4,10 +4,6 @@
"read": {
"cgi-io": [ "exec" ],
"file": {
"/usr/bin/mmcli -L": [ "exec" ],
"/usr/bin/mmcli -m [0-9]": [ "exec" ],
"/usr/bin/mmcli -m [0-9][0-9]": [ "exec" ],
"/usr/bin/mmcli -m [0-9][0-9][0-9]": [ "exec" ],
"/usr/bin/mmcli -L -J": [ "exec" ],
"/usr/bin/mmcli -m [0-9]* -J": [ "exec" ],
"/usr/bin/mmcli -i [0-9]* -J": [ "exec" ],