Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-27 04:40:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: service: Add method getPackageDict

Browse Source
This commit is contained in:
remittor
2026-01-26 13:00:54 +03:00
parent 1f89151fe5
commit e2c6c0552e
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/service.js
View File

@@ -50,7 +50,7 @@ return view.extend({
fs.exec(tools.execPath, [ 'enabled' ]), // svc_en fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
tools.getSvcInfo(), // svc_info tools.getSvcInfo(), // svc_info
fs.exec('/bin/busybox', [ 'ps' ]), // process list fs.exec('/bin/busybox', [ 'ps' ]), // process list
fs.exec(tools.packager.path, tools.packager.args), // installed packages tools.getPackageDict(), // installed packages
tools.getStratList(), // nfqws strategy list tools.getStratList(), // nfqws strategy list
fs.exec('/bin/cat', [ '/etc/openwrt_release' ]), // CPU arch fs.exec('/bin/cat', [ '/etc/openwrt_release' ]), // CPU arch
uci.load(tools.appName), // config uci.load(tools.appName), // config
@@ -75,7 +75,7 @@ return view.extend({
let svc_en = status_array[1]; // stdout: empty or error text let svc_en = status_array[1]; // stdout: empty or error text
let svc_info = status_array[2]; // stdout: JSON as text let svc_info = status_array[2]; // stdout: JSON as text
let proc_list = status_array[3]; // stdout: multiline text let proc_list = status_array[3]; // stdout: multiline text
let pkg_list = status_array[4]; // stdout: installed packages let pkg_dict = status_array[4]; // stdout: installed packages
let stratlist = status_array[5]; // array of strat names let stratlist = status_array[5]; // array of strat names
let sys_info = status_array[6]; // stdout: openwrt distrib info let sys_info = status_array[6]; // stdout: openwrt distrib info
@@ -95,8 +95,8 @@ return view.extend({
this.disableButtons(true, -1, elems); this.disableButtons(true, -1, elems);
return; return;
} }
if (pkg_list.code != 0) { if (!pkg_dict) {
ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()')); ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': getPackageDict()'));
this.disableButtons(true, -1, elems); this.disableButtons(true, -1, elems);
return; return;
} }
@@ -342,9 +342,9 @@ return view.extend({
} }
let cfg = uci.get(tools.appName, 'config'); let cfg = uci.get(tools.appName, 'config');
let pkg_list = status_array[4]; let pkgdict = status_array[4];
if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) { if (pkgdict == null) {
ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()')); ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
return; return;
} }
@@ -431,12 +431,12 @@ return view.extend({
poll.add(L.bind(this.statusPoll, this)); poll.add(L.bind(this.statusPoll, this));
let page_title = tools.AppName; let page_title = tools.AppName;
let pkgdict = tools.decode_pkg_list(pkg_list.stdout, false);
page_title += ' &nbsp '; page_title += ' &nbsp ';
if (pkgdict[tools.appName] === undefined || pkgdict[tools.appName] == '') { if (pkgdict[tools.appName] === undefined || pkgdict[tools.appName] == '') {
page_title += 'unknown version'; page_title += 'unknown version';
} else { } else {
page_title += 'v' + pkgdict[tools.appName]; page_title += 'v' + pkgdict[tools.appName];
page_title = page_title.replace(/-r1$/, '');
} }
let aux1 = E('em'); let aux1 = E('em');
let aux2 = E('em'); let aux2 = E('em');

30
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
View File

@@ -101,6 +101,30 @@ return baseclass.extend({
}); });
}, },
getPackageDict: function()
{
let ses_var_name = this.appName+'_pkgdict';
let exec_cmd = this.packager.path;
let exec_arg = this.packager.args;
return fs.exec(exec_cmd, exec_arg).then(res => {
let pdict_json = sessionStorage.getItem(ses_var_name);
if (res.code != 0) {
console.log(this.appName + ': Unable to enumerate installed packages. code = ' + res.code);
if (pdict_json != null) {
return JSON.parse(pdict_json); // return cached value
}
return null;
}
let pdict = this.decode_pkg_list(res.stdout);
if (pdict != pdict_json) {
sessionStorage.setItem(ses_var_name, JSON.stringify(pdict)); // renew cache
}
return pdict;
}).catch(e => {
ui.addNotification(null, E('p', _('Unable to enumerate installed packages.') + ' Error: %s'.format(e)));
});
},
getStratList: function() { getStratList: function() {
let exec_cmd = '/bin/busybox'; let exec_cmd = '/bin/busybox';
let exec_arg = [ 'awk', '-F', '"', '/if \\[ "\\$strat" = "/ {print $4}', this.defCfgPath ]; let exec_arg = [ 'awk', '-F', '"', '/if \\[ "\\$strat" = "/ {print $4}', this.defCfgPath ];
@@ -141,7 +165,7 @@ return baseclass.extend({
return m ? m[2] : defval; return m ? m[2] : defval;
}, },
decode_pkg_list: function(pkg_list, with_suffix_r1 = true) { decode_pkg_list: function(pkg_list) {
let pkg_dict = { }; let pkg_dict = { };
if (!pkg_list) { if (!pkg_list) {
return pkg_dict; return pkg_dict;
@@ -180,12 +204,8 @@ return baseclass.extend({
} }
} }
if (rev >= 0) { if (rev >= 0) {
if (rev == 1 && !with_suffix_r1) {
// nothing
} else {
ver += '-r' + rev; ver += '-r' + rev;
} }
}
pkg_dict[name] = ver; pkg_dict[name] = ver;
} }
return pkg_dict; return pkg_dict;