Mirror/luci-app-internet-detector
1
0
Fork 0
mirror of https://github.com/gSpotx2f/luci-app-internet-detector.git synced 2025-12-06 03:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-internet-detector: Fixed sorting function.

Browse Source
This commit is contained in:
gSpot
2025-10-03 21:11:55 +03:00
parent 10fedfded1
commit 663ac6c90b
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -26,16 +26,16 @@ Internet-detector is an application for checking the availability of the Interne
service internet-detector start
service internet-detector enable
wget --no-check-certificate -O /tmp/luci-app-internet-detector_1.6.6-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_1.6.6-r1_all.ipk
opkg install /tmp/luci-app-internet-detector_1.6.6-r1_all.ipk
rm /tmp/luci-app-internet-detector_1.6.6-r1_all.ipk
wget --no-check-certificate -O /tmp/luci-app-internet-detector_1.6.6-r2_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_1.6.6-r2_all.ipk
opkg install /tmp/luci-app-internet-detector_1.6.6-r2_all.ipk
rm /tmp/luci-app-internet-detector_1.6.6-r2_all.ipk
service rpcd restart
i18n-ru:
wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_1.6.6-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_1.6.6-r1_all.ipk
opkg install /tmp/luci-i18n-internet-detector-ru_1.6.6-r1_all.ipk
rm /tmp/luci-i18n-internet-detector-ru_1.6.6-r1_all.ipk
wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_1.6.6-r2_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_1.6.6-r2_all.ipk
opkg install /tmp/luci-i18n-internet-detector-ru_1.6.6-r2_all.ipk
rm /tmp/luci-i18n-internet-detector-ru_1.6.6-r2_all.ipk
## Screenshots:

2
luci-app-internet-detector/Makefile
View File

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-internet-detector
PKG_VERSION:=1.6.6
PKG_RELEASE:=1
PKG_RELEASE:=2
LUCI_TITLE:=LuCI support for internet-detector
LUCI_DEPENDS:=+internet-detector
LUCI_PKGARCH:=all

48
luci-app-internet-detector/htdocs/luci-static/resources/view/internet-detector.js
View File

@@ -69,13 +69,13 @@ var Timefield = ui.Textfield.extend({
let string = '0';
if(/^\d+$/.test(value)) {
value = Number(value);
if(value >= 86400 && (value % 86400) === 0) {
if(value >= 86400 && (value % 86400) == 0) {
string = String(value / 86400) + 'd';
}
else if(value >= 3600 && (value % 3600) === 0) {
else if(value >= 3600 && (value % 3600) == 0) {
string = String(value / 3600) + 'h';
}
else if(value >= 60 && (value % 60) === 0) {
else if(value >= 60 && (value % 60) == 0) {
string = String(value / 60) + 'm';
}
else {
@@ -107,16 +107,16 @@ var Timefield = ui.Textfield.extend({
value = 0,
res = rawValue.match(/^(\d+)([dhms]?)$/);
if(res) {
if(res[2] === 'd') {
if(res[2] == 'd') {
value = Number(res[1]) * 86400;
}
else if(res[2] === 'h') {
else if(res[2] == 'h') {
value = Number(res[1]) * 3600;
}
else if(res[2] === 'm') {
else if(res[2] == 'm') {
value = Number(res[1]) * 60;
}
else if(!res[2] || res[2] === 's') {
else if(!res[2] || res[2] == 's') {
value = Number(res[1]);
}
else {
@@ -275,14 +275,14 @@ return view.extend({
setInternetStatus() {
this.inetStatusArea.innerHTML = '';
if(!this.inetStatus || !this.inetStatus.instances || this.inetStatus.instances.length === 0) {
if(!this.inetStatus || !this.inetStatus.instances || this.inetStatus.instances.length == 0) {
let label = E('span', { 'class': 'id-label-status id-undefined' }, _('Undefined'));
if((this.currentAppMode === '1' && this.appStatus !== 'stoped') || this.currentAppMode === '2') {
if((this.currentAppMode == '1' && this.appStatus != 'stoped') || this.currentAppMode == '2') {
label.classList.add('spinning');
};
this.inetStatusArea.append(label);
} else {
this.inetStatus.instances.sort((a, b) => a.num > b.num);
this.inetStatus.instances.sort((a, b) => a.num - b.num);
for(let i of this.inetStatus.instances) {
let status = _('Disconnected');
@@ -297,7 +297,7 @@ return view.extend({
};
let publicIp = (i.mod_public_ip !== undefined) ?
' | %s: %s'.format(_('Public IP'), (i.mod_public_ip === '') ? _('Undefined') : _(i.mod_public_ip))
' | %s: %s'.format(_('Public IP'), (i.mod_public_ip == '') ? _('Undefined') : _(i.mod_public_ip))
: '';
this.inetStatusArea.append(
@@ -310,7 +310,7 @@ return view.extend({
this.modRegularScriptNextRun[i.instance] = i.mod_regular_script;
let nextRunLabel = document.getElementById('id_next_run_' + i.instance);
if(nextRunLabel) {
if(this.appStatus === 'running') {
if(this.appStatus == 'running') {
nextRunLabel.innerHTML = this.modRegularScriptNextRun[i.instance];
} else {
nextRunLabel.innerHTML = _('Not scheduled');
@@ -320,7 +320,7 @@ return view.extend({
};
};
if(this.appStatus === 'running') {
if(this.appStatus == 'running') {
this.serviceStatusLabel.textContent = _('Running');
} else {
this.serviceStatusLabel.textContent = _('Stopped');
@@ -633,7 +633,7 @@ return view.extend({
if(!data) {
return;
};
this.appStatus = (data[0].code === 0) ? data[0].stdout.trim() : null;
this.appStatus = (data[0].code == 0) ? data[0].stdout.trim() : null;
this.initStatus = data[1];
this.leds = data[2];
if(data[3]) {
@@ -675,7 +675,7 @@ return view.extend({
/* Service widget */
if(this.currentAppMode === '1') {
if(this.currentAppMode == '1') {
o = s.option(this.CBIBlockServiceStatus, this);
// restart button
@@ -709,7 +709,7 @@ return view.extend({
/* Instances configuration */
if(this.currentAppMode !== '2') {
if(this.currentAppMode != '2') {
// logging_level
o = s.option(form.ListValue, 'logging_level',
@@ -871,7 +871,7 @@ return view.extend({
/* Modules */
if(this.currentAppMode !== '2') {
if(this.currentAppMode != '2') {
s.tab('led_control', _('LED control'));
s.tab('reboot_device', _('Reboot device'));
s.tab('restart_network', _('Restart network'));
@@ -882,7 +882,7 @@ return view.extend({
s.tab('public_ip', _('Public IP address'));
if(this.currentAppMode !== '2') {
if(this.currentAppMode != '2') {
if(this.email) {
s.tab('email', _('Email notification'));
};
@@ -903,7 +903,7 @@ return view.extend({
return;
};
if(this.currentAppMode !== '2') {
if(this.currentAppMode != '2') {
// LED control
@@ -915,7 +915,7 @@ return view.extend({
o.modalonly = true;
if(this.leds.length > 0) {
this.leds.sort((a, b) => a.name > b.name);
this.leds.sort((a, b) => a.name > b.name ? 1 : -1);
// enabled
o = s.taboption('led_control', form.Flag,
@@ -1411,7 +1411,7 @@ return view.extend({
o.value(i, i + ' ' + _('sec'));
};
if(this.currentAppMode !== '2') {
if(this.currentAppMode != '2') {
// enable_ip_script
o = s.taboption('public_ip', form.Flag,
@@ -1778,7 +1778,7 @@ return view.extend({
// down_script_attempt_interval
o = ss.taboption('user_scripts_down_script', this.CBITimeInput,
'mod_user_scripts_down_script_attempt_interval',
_('Attempt interval'),
_('Attempt interval'),
_('Interval between down-script runs.')
);
o.default = '60';
@@ -1847,9 +1847,9 @@ return view.extend({
};
if(this.currentAppMode !== '0') {
if(this.currentAppMode != '0') {
poll.add(
L.bind((this.currentAppMode === '1') ? this.servicePoll : this.uiPoll, this),
L.bind((this.currentAppMode == '1') ? this.servicePoll : this.uiPoll, this),
this.pollInterval
);
};

14
luci-app-internet-detector/htdocs/luci-static/resources/view/status/include/00_internet.js
View File

@@ -92,16 +92,16 @@ return baseclass.extend({
}).catch(e => {});
};
if(this.currentAppMode === '2') {
if(this.currentAppMode == '2') {
return this.getUIPoll();
}
else if(this.currentAppMode === '1') {
else if(this.currentAppMode == '1') {
return L.resolveDefault(this.getInetStatus(), null);
};
},
render(data) {
if(this.currentAppMode === '0') {
if(this.currentAppMode == '0') {
return;
}
@@ -109,14 +109,14 @@ return baseclass.extend({
let inetStatusArea = E('div', {});
if(!this.inetStatus || !this.inetStatus.instances || this.inetStatus.instances.length === 0) {
if(!this.inetStatus || !this.inetStatus.instances || this.inetStatus.instances.length == 0) {
let label = E('span', { 'class': 'id-label-status id-undefined' }, _('Undefined'));
if(this.currentAppMode === '2') {
if(this.currentAppMode == '2') {
label.classList.add('spinning');
};
inetStatusArea.append(label);
} else {
this.inetStatus.instances.sort((a, b) => a.num > b.num);
this.inetStatus.instances.sort((a, b) => a.num - b.num);
for(let i of this.inetStatus.instances) {
let status = _('Disconnected');
@@ -131,7 +131,7 @@ return baseclass.extend({
};
let publicIp = (i.mod_public_ip !== undefined) ?
' | %s: %s'.format(_('Public IP'), (i.mod_public_ip === '') ? _('Undefined') : _(i.mod_public_ip))
' | %s: %s'.format(_('Public IP'), (i.mod_public_ip == '') ? _('Undefined') : _(i.mod_public_ip))
: '';
inetStatusArea.append(