openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-05-31 02:21:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-adblock: release 4.5.5-1

Browse Source 
* sync with base package

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2026-04-17 09:59:11 +02:00
parent 8d4ebf01e7
commit 09d8181ef7
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/luci-app-adblock/Makefile
+1 -1
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for Adblock
LUCI_DEPENDS:=+luci-base +luci-lib-uqr +adblock
PKG_VERSION:=4.5.4
PKG_VERSION:=4.5.5
PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
+4 -4
View File
@@ -132,12 +132,12 @@ function handleAction(ev) {
clearInterval(window._adbSearchPoller);
window._adbSearchPoller = null;
}
L.resolveDefault(fs.write('/var/run/adblock.search', ''), '').then(function () {
L.resolveDefault(fs.write('/var/run/adblock/adblock.search', ''), '').then(function () {
L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['search', domain]), '');
let attempts = 0;
window._adbSearchPoller = setInterval(function () {
attempts++;
L.resolveDefault(fs.read('/var/run/adblock.search'), '').then(function (res) {
L.resolveDefault(fs.read('/var/run/adblock/adblock.search'), '').then(function (res) {
if (res && res.trim()) {
clearInterval(window._adbSearchPoller);
window._adbSearchPoller = null;
@@ -213,12 +213,12 @@ function handleAction(ev) {
const top_count = document.getElementById('top_count').value;
const res_count = document.getElementById('res_count').value;
const search = document.getElementById('search').value.trim().replace(/[^\w.\-:]/g, '') || '+';
L.resolveDefault(fs.write('/var/run/adblock.report', ''), '').then(function () {
L.resolveDefault(fs.write('/var/run/adblock/adblock.report', ''), '').then(function () {
L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['report', 'gen', top_count, res_count, search]), '');
let attempts = 0;
let poller = setInterval(function () {
attempts++;
L.resolveDefault(fs.read('/var/run/adblock.report'), '').then(function (res) {
L.resolveDefault(fs.read('/var/run/adblock/adblock.report'), '').then(function (res) {
if (res && res.trim()) {
clearInterval(poller);
ui.hideModal();
applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+2 -2
View File
@@ -80,11 +80,11 @@ return view.extend({
*/
let parseErrCount = 0;
poll.add(function () {
return L.resolveDefault(fs.stat('/var/run/adb_runtime.json'), null).then(function (stat) {
return L.resolveDefault(fs.stat('/var/run/adblock/adblock.runtime.json'), null).then(function (stat) {
if (!stat) {
return;
}
return L.resolveDefault(fs.read_direct('/var/run/adb_runtime.json'), null).then(function (res) {
return L.resolveDefault(fs.read_direct('/var/run/adblock/adblock.runtime.json'), null).then(function (res) {
const status = document.getElementById('status');
const buttons = document.querySelectorAll('.cbi-page-actions button');
let info = null;
applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
+4 -4
View File
@@ -21,11 +21,11 @@
"read",
"write"
],
"/var/run/adblock.search": [
"/var/run/adblock/adblock.search": [
"read",
"write"
],
"/var/run/adblock.report": [
"/var/run/adblock/adblock.report": [
"read",
"write"
]
@@ -36,10 +36,10 @@
"exec"
],
"file": {
"/var/run/adblock.pid": [
"/var/run/adblock/adblock.pid": [
"read"
],
"/var/run/adb_runtime.json": [
"/var/run/adblock/adblock.runtime.json": [
"read"
],
"/etc/init.d/adblock reload": [