From 68f9e6743219c0e476f5ce9decbf004d9d4b5772 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Tue, 26 Aug 2025 03:49:08 +0000 Subject: [PATCH] luci-app-adblock-fast: update to 1.1.4-r12 * update to keep in sync with principal package Signed-off-by: Stan Grishin --- applications/luci-app-adblock-fast/Makefile | 2 +- .../resources/adblock-fast/status.js | 235 +++++++++--------- .../view/status/include/70_adblock-fast.js | 17 +- .../po/templates/adblock-fast.pot | 220 ++++++++-------- .../root/usr/libexec/rpcd/luci.adblock-fast | 2 +- 5 files changed, 229 insertions(+), 247 deletions(-) diff --git a/applications/luci-app-adblock-fast/Makefile b/applications/luci-app-adblock-fast/Makefile index 5adb008066..31b0eaccdc 100644 --- a/applications/luci-app-adblock-fast/Makefile +++ b/applications/luci-app-adblock-fast/Makefile @@ -7,7 +7,7 @@ PKG_NAME:=luci-app-adblock-fast PKG_LICENSE:=AGPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin PKG_VERSION:=1.1.4 -PKG_RELEASE:=6 +PKG_RELEASE:=12 LUCI_TITLE:=AdBlock-Fast Web UI LUCI_URL:=https://github.com/stangri/luci-app-adblock-fast/ diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js index 19758b08ea..1ca82275e9 100644 --- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js +++ b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js @@ -12,7 +12,7 @@ var pkg = { return "adblock-fast"; }, get LuciCompat() { - return 7; + return 8; }, get ReadmeCompat() { return ""; @@ -51,6 +51,106 @@ var pkg = { isObjEmpty: function (obj) { return Object.keys(obj).length === 0; }, + + statusTable: { + statusNoInstall: _("%s is not installed or not found").format( + "adblock-fast" + ), + statusStopped: _("Stopped"), + statusStarting: _("Starting"), + statusProcessing: _("Processing lists"), + statusRestarting: _("Restarting"), + statusForceReloading: _("Force Reloading"), + statusDownloading: _("Downloading lists"), + statusFail: _("Failed to start"), + statusSuccess: _("Active"), + statusTriggerBootWait: _("Waiting for trigger (on_boot)"), + statusTriggerStartWait: _("Waiting for trigger (on_start)"), + }, + + warningTable: { + warningInternalVersionMismatch: _( + "Internal version mismatch (package: %s, luci app: %s, luci rpcd: %s), you may need to update packages or reboot the device, please check the %sREADME%s." + ), + warningExternalDnsmasqConfig: _( + "Use of external dnsmasq config file detected, please set '%s' option to '%s'" + ).format("dns", "dnsmasq.conf"), + warningMissingRecommendedPackages: _("Missing recommended package: '%s'"), + warningOutdatedLuciPackage: _( + "The WebUI application (luci-app-adblock-fast) is outdated, please update it" + ), + warningOutdatedPrincipalPackage: _( + "The principal package (adblock-fast) is outdated, please update it" + ), + warningInvalidCompressedCacheDir: _( + "Invalid compressed cache directory '%s'" + ), + warningFreeRamCheckFail: _("Can't detect free RAM"), + warningSanityCheckTLD: _("Sanity check discovered TLDs in %s"), + warningSanityCheckLeadingDot: _( + "Sanity check discovered leading dots in %s" + ), + }, + + errorTable: { + errorConfigValidationFail: _("Config (%s) validation failure!").format( + "/etc/config/" + "adblock-fast" + ), + errorServiceDisabled: _("%s is currently disabled").format("adblock-fast"), + errorNoDnsmasqIpset: _( + "The dnsmasq ipset support is enabled, but dnsmasq is either not installed or installed dnsmasq does not support ipset" + ), + errorNoIpset: _( + "The dnsmasq ipset support is enabled, but ipset is either not installed or installed ipset does not support '%s' type" + ).format("hash:net"), + errorNoDnsmasqNftset: _( + "The dnsmasq nft set support is enabled, but dnsmasq is either not installed or installed dnsmasq does not support nft set" + ), + errorNoNft: _( + "The dnsmasq nft sets support is enabled, but nft is not installed" + ), + errorNoWanGateway: _("The %s failed to discover WAN gateway").format( + "adblock-fast" + ), + errorOutputDirCreate: _("Failed to create directory for %s file"), + errorOutputFileCreate: _("Failed to create '%s' file"), + errorFailDNSReload: _("Failed to restart/reload DNS resolver"), + errorSharedMemory: _("Failed to access shared memory"), + errorSorting: _("Failed to sort data file"), + errorOptimization: _("Failed to optimize data file"), + errorAllowListProcessing: _("Failed to process allow-list"), + errorDataFileFormatting: _("Failed to format data file"), + // NOTE: keep placeholders; fill with info at render time + errorMovingDataFile: _("Failed to move temporary data file to '%s'"), + errorCreatingCompressedCache: _("Failed to create compressed cache"), + errorRemovingTempFiles: _("Failed to remove temporary files"), + errorRestoreCompressedCache: _("Failed to unpack compressed cache"), + // NOTE: keep placeholders; fill with info at render time + errorRestoreCache: _("Failed to move '%s' to '%s'"), + errorOhSnap: _("Failed to create block-list or restart DNS resolver"), + errorStopping: _("Failed to stop %s").format("adblock-fast"), + errorDNSReload: _("Failed to reload/restart DNS resolver"), + errorDownloadingConfigUpdate: _("Failed to download Config Update file"), + errorDownloadingList: _("Failed to download %s"), + errorParsingConfigUpdate: _("Failed to parse Config Update file"), + errorParsingList: _("Failed to parse %s"), + errorNoSSLSupport: _("No HTTPS/SSL support on device"), + errorCreatingDirectory: _( + "Failed to create output/cache/gzip file directory" + ), + errorDetectingFileType: _("Failed to detect format %s"), + errorNothingToDo: _("No blocked list URLs nor blocked-domains enabled"), + errorTooLittleRam: _( + "Free ram (%s) is not enough to process all enabled block-lists" + ), + errorCreatingBackupFile: _("failed to create backup file %s"), + errorDeletingDataFile: _("failed to delete data file %s"), + errorRestoringBackupFile: _("failed to restore backup file %s"), + errorNoOutputFile: _("failed to create final block-list %s"), + errorNoHeartbeat: _( + "Heartbeat domain is not accessible after resolver restart" + ), + }, }; var getFileUrlFilesizes = rpc.declare({ @@ -175,17 +275,6 @@ var status = baseclass.extend({ var text = ""; var outputFile = reply.status.outputFile; var outputCache = reply.status.outputCache; - var statusTable = { - statusNoInstall: _("%s is not installed or not found").format(pkg.Name), - statusStopped: _("Stopped"), - statusStarting: _("Starting"), - statusProcessing: _("Processing lists"), - statusRestarting: _("Restarting"), - statusForceReloading: _("Force Reloading"), - statusDownloading: _("Downloading lists"), - statusFail: _("Failed to start"), - statusSuccess: _("Active"), - }; var header = E("h2", {}, _("AdBlock-Fast - Status")); var statusTitle = E( @@ -197,7 +286,7 @@ var status = baseclass.extend({ text += _("Version %s").format(reply.status.version) + " - "; switch (reply.status.status) { case "statusSuccess": - text += statusTable[reply.status.status] + "."; + text += pkg.statusTable[reply.status.status] + "."; text += "
" + _("Blocking %s domains (with %s).").format( @@ -226,10 +315,13 @@ var status = baseclass.extend({ break; case "statusStopped": if (reply.status.enabled) { - text += statusTable[reply.status.status] + "."; + text += pkg.statusTable[reply.status.status] + "."; } else { text += - statusTable[reply.status.status] + " (" + _("Disabled") + ")."; + pkg.statusTable[reply.status.status] + + " (" + + _("Disabled") + + ")."; } if (reply.status.outputCacheExists) { text += "
" + _("Cache file found."); @@ -241,10 +333,10 @@ var status = baseclass.extend({ case "statusForceReloading": case "statusDownloading": case "statusProcessing": - text += statusTable[reply.status.status] + "..."; + text += pkg.statusTable[reply.status.status] + "..."; break; default: - text += statusTable[reply.status.status] + "."; + text += pkg.statusTable[reply.status.status] + "."; break; } } else { @@ -259,31 +351,6 @@ var status = baseclass.extend({ var warningsDiv = []; if (reply.ubus.warnings && reply.ubus.warnings.length) { - var warningTable = { - warningInternalVersionMismatch: _( - "Internal version mismatch (package: %s, luci app: %s, luci rpcd: %s), you may need to update packages or reboot the device, please check the %sREADME%s." - ), - warningExternalDnsmasqConfig: _( - "Use of external dnsmasq config file detected, please set '%s' option to '%s'" - ).format("dns", "dnsmasq.conf"), - warningMissingRecommendedPackages: _( - "Missing recommended package: '%s'" - ), - warningOutdatedLuciPackage: _( - "The WebUI application (luci-app-adblock-fast) is outdated, please update it" - ), - warningOutdatedPrincipalPackage: _( - "The principal package (adblock-fast) is outdated, please update it" - ), - warningInvalidCompressedCacheDir: _( - "Invalid compressed cache directory '%s'" - ), - warningFreeRamCheckFail: _("Can't detect free RAM"), - warningSanityCheckTLD: _("Sanity check discovered TLDs in %s"), - warningSanityCheckLeadingDot: _( - "Sanity check discovered leading dots in %s" - ), - }; var warningsTitle = E( "label", { class: "cbi-value-title" }, @@ -291,13 +358,16 @@ var status = baseclass.extend({ ); var text = ""; reply.ubus.warnings.forEach((element) => { - if (element.code && warningTable[element.code]) { - text += pkg.formatMessage(element.info, warningTable[element.code]); + if (element.code && pkg.warningTable[element.code]) { + text += pkg.formatMessage( + element.info, + pkg.warningTable[element.code] + ); } else { text += _("Unknown warning") + "
"; } }); - var warningsText = E("div", {}, text); + var warningsText = E("div", { class: "cbi-value-description" }, text); var warningsField = E( "div", { class: "cbi-value-field" }, @@ -311,72 +381,6 @@ var status = baseclass.extend({ var errorsDiv = []; if (reply.ubus.errors && reply.ubus.errors.length) { - var errorTable = { - errorConfigValidationFail: _( - "Config (%s) validation failure!" - ).format("/etc/config/" + pkg.Name), - errorServiceDisabled: _("%s is currently disabled").format(pkg.Name), - errorNoDnsmasqIpset: _( - "The dnsmasq ipset support is enabled, but dnsmasq is either not installed or installed dnsmasq does not support ipset" - ), - errorNoIpset: _( - "The dnsmasq ipset support is enabled, but ipset is either not installed or installed ipset does not support '%s' type" - ).format("hash:net"), - errorNoDnsmasqNftset: _( - "The dnsmasq nft set support is enabled, but dnsmasq is either not installed or installed dnsmasq does not support nft set" - ), - errorNoNft: _( - "The dnsmasq nft sets support is enabled, but nft is not installed" - ), - errorNoWanGateway: _("The %s failed to discover WAN gateway").format( - pkg.Name - ), - errorOutputDirCreate: _("Failed to create directory for %s file"), - errorOutputFileCreate: _("Failed to create '%s' file"), - errorFailDNSReload: _("Failed to restart/reload DNS resolver"), - errorSharedMemory: _("Failed to access shared memory"), - errorSorting: _("Failed to sort data file"), - errorOptimization: _("Failed to optimize data file"), - errorAllowListProcessing: _("Failed to process allow-list"), - errorDataFileFormatting: _("Failed to format data file"), - errorMovingDataFile: _( - "Failed to move temporary data file to '%s'" - ).format(outputFile), - errorCreatingCompressedCache: _("Failed to create compressed cache"), - errorRemovingTempFiles: _("Failed to remove temporary files"), - errorRestoreCompressedCache: _("Failed to unpack compressed cache"), - errorRestoreCache: _("Failed to move '%s' to '%s'").format( - outputCache, - outputFile - ), - errorOhSnap: _("Failed to create block-list or restart DNS resolver"), - errorStopping: _("Failed to stop %s").format(pkg.Name), - errorDNSReload: _("Failed to reload/restart DNS resolver"), - errorDownloadingConfigUpdate: _( - "Failed to download Config Update file" - ), - errorDownloadingList: _("Failed to download %s"), - errorParsingConfigUpdate: _("Failed to parse Config Update file"), - errorParsingList: _("Failed to parse %s"), - errorNoSSLSupport: _("No HTTPS/SSL support on device"), - errorCreatingDirectory: _( - "Failed to create output/cache/gzip file directory" - ), - errorDetectingFileType: _("Failed to detect format %s"), - errorNothingToDo: _( - "No blocked list URLs nor blocked-domains enabled" - ), - errorTooLittleRam: _( - "Free ram (%s) is not enough to process all enabled block-lists" - ), - errorCreatingBackupFile: _("failed to create backup file %s"), - errorDeletingDataFile: _("failed to delete data file %s"), - errorRestoringBackupFile: _("failed to restore backup file %s"), - errorNoOutputFile: _("failed to create final block-list %s"), - errorNoHeartbeat: _( - "Heartbeat domain is not accessible after resolver restart" - ), - }; var errorsTitle = E( "label", { class: "cbi-value-title" }, @@ -384,8 +388,11 @@ var status = baseclass.extend({ ); var text = ""; reply.ubus.errors.forEach((element) => { - if (element.code && errorTable[element.code]) { - text += pkg.formatMessage(element.info, errorTable[element.code]); + if (element.code && pkg.errorTable[element.code]) { + text += pkg.formatMessage( + element.info, + pkg.errorTable[element.code] + ); } else { text += _("Unknown error") + "
"; } @@ -394,7 +401,7 @@ var status = baseclass.extend({ '', "!
" ); - var errorsText = E("div", {}, text); + var errorsText = E("div", { class: "cbi-value-description" }, text); var errorsField = E("div", { class: "cbi-value-field" }, errorsText); errorsDiv = E("div", { class: "cbi-value" }, [ errorsTitle, diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js index f81243d8ea..19db4c4711 100644 --- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js +++ b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js @@ -4,7 +4,7 @@ "require baseclass"; "require adblock-fast.status as adb"; -var pkg = adb.pkg; +const { pkg } = adb; return baseclass.extend({ title: _("AdBlock-Fast"), @@ -35,19 +35,6 @@ return baseclass.extend({ leds: [], }, }; - var statusTable = { - statusNoInstall: _("%s is not installed or not found").format(pkg.Name), - statusStopped: _("Stopped"), - statusStarting: _("Starting"), - statusProcessing: _("Processing lists"), - statusRestarting: _("Restarting"), - statusForceReloading: _("Force Reloading"), - statusDownloading: _("Downloading lists"), - statusError: _("Error"), - statusWarning: _("Warning"), - statusFail: _("Fail"), - statusSuccess: _("Active"), - }; var cacheText; if (reply.status.outputCacheExists) { @@ -80,7 +67,7 @@ return baseclass.extend({ E( "td", { class: "td" }, - statusTable[reply.status.status] || _("Unknown") + pkg.statusTable[reply.status.status] || _("Unknown") ), E("td", { class: "td" }, reply.status.version || _("-")), E("td", { class: "td" }, reply.status.dns || _("-")), diff --git a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot index d3b4bcbb5b..d99b29ffa1 100644 --- a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot +++ b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot @@ -1,20 +1,19 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:318 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:99 msgid "%s is currently disabled" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:179 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:39 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:56 msgid "%s is not installed or not found" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:85 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:86 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:87 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:88 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:89 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:72 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:73 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:74 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:75 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:76 msgid "-" msgstr "" @@ -22,8 +21,7 @@ msgstr "" msgid "Action" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:187 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:49 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:66 msgid "Active" msgstr "" @@ -57,7 +55,7 @@ msgstr "" msgid "AdBlock-Fast - Configuration" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:190 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:279 msgid "AdBlock-Fast - Status" msgstr "" @@ -101,43 +99,43 @@ msgid "Block" msgstr "" #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:473 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:75 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:62 msgid "Blocked Domains" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:203 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:292 msgid "Blocking %s domains (with %s)." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:76 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:63 msgid "Cache" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:54 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:41 msgid "Cache file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:235 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:327 msgid "Cache file found." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:281 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:88 msgid "Can't detect free RAM" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:56 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:43 msgid "Compressed cache" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:208 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:297 msgid "Compressed cache file created." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:237 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:329 msgid "Compressed cache file found." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:316 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:96 msgid "Config (%s) validation failure!" msgstr "" @@ -154,7 +152,7 @@ msgid "Curl maximum file size (in bytes)" msgstr "" #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:131 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:74 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:61 msgid "DNS Service" msgstr "" @@ -171,7 +169,7 @@ msgid "" "Directory for compressed cache file of block-list in the persistent memory." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:519 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:526 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:347 msgid "Disable" msgstr "" @@ -180,11 +178,11 @@ msgstr "" msgid "Disable Debugging" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:232 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:323 msgid "Disabled" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:513 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:520 msgid "Disabling %s service" msgstr "" @@ -208,12 +206,11 @@ msgstr "" msgid "Download time-out (in seconds)" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:185 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:45 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:64 msgid "Downloading lists" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:500 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:507 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:348 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:502 msgid "Enable" @@ -228,124 +225,115 @@ msgstr "" msgid "Enables debug output to /tmp/adblock-fast.log." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:494 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:501 msgid "Enabling %s service" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:46 -msgid "Error" -msgstr "" - -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:393 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:400 msgid "Errors encountered, please check the %sREADME%s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:48 -msgid "Fail" -msgstr "" - -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:337 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:118 msgid "Failed to access shared memory" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:335 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:116 msgid "Failed to create '%s' file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:352 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:130 msgid "Failed to create block-list or restart DNS resolver" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:345 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:125 msgid "Failed to create compressed cache" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:334 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:115 msgid "Failed to create directory for %s file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:363 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:139 msgid "Failed to create output/cache/gzip file directory" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:365 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:141 msgid "Failed to detect format %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:358 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:134 msgid "Failed to download %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:356 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:133 msgid "Failed to download Config Update file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:341 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:122 msgid "Failed to format data file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:348 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:129 msgid "Failed to move '%s' to '%s'" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:343 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:124 msgid "Failed to move temporary data file to '%s'" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:339 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:120 msgid "Failed to optimize data file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:360 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:136 msgid "Failed to parse %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:359 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:135 msgid "Failed to parse Config Update file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:340 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:121 msgid "Failed to process allow-list" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:354 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:132 msgid "Failed to reload/restart DNS resolver" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:346 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:126 msgid "Failed to remove temporary files" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:336 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:117 msgid "Failed to restart/reload DNS resolver" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:338 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:119 msgid "Failed to sort data file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:186 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:65 msgid "Failed to start" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:353 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:131 msgid "Failed to stop %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:347 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:127 msgid "Failed to unpack compressed cache" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:77 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:64 msgid "Force DNS Ports" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:211 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:300 msgid "Force DNS ports:" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:184 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:44 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:63 msgid "Force Reloading" msgstr "" @@ -357,7 +345,7 @@ msgstr "" msgid "Force Router DNS server to all local devices" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:441 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:448 msgid "Force redownloading %s block lists" msgstr "" @@ -365,7 +353,7 @@ msgstr "" msgid "Forces Router DNS use on local devices, also known as DNS Hijacking." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:370 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:144 msgid "Free ram (%s) is not enough to process all enabled block-lists" msgstr "" @@ -373,7 +361,7 @@ msgstr "" msgid "Grant UCI and file access for luci-app-adblock-fast" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:377 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:151 msgid "Heartbeat domain is not accessible after resolver restart" msgstr "" @@ -401,14 +389,14 @@ msgstr "" msgid "Individual domains to be blocked." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:264 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:73 msgid "" "Internal version mismatch (package: %s, luci app: %s, luci rpcd: %s), you " "may need to update packages or reboot the device, please check the " "%sREADME%s." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:279 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:86 msgid "Invalid compressed cache directory '%s'" msgstr "" @@ -426,7 +414,7 @@ msgstr "" msgid "Let local devices use their own DNS servers if set" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:270 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:78 msgid "Missing recommended package: '%s'" msgstr "" @@ -446,15 +434,15 @@ msgstr "" msgid "No Ad-blocking on dnsmasq" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:361 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:137 msgid "No HTTPS/SSL support on device" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:367 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:142 msgid "No blocked list URLs nor blocked-domains enabled" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:251 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:343 msgid "Not installed or not found" msgstr "" @@ -462,11 +450,11 @@ msgstr "" msgid "Output Verbosity Setting" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:462 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:469 msgid "Pause" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:457 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:464 msgid "Pausing %s" msgstr "" @@ -486,7 +474,7 @@ msgstr "" msgid "Pick the dnsmasq instance(s) for ad-blocking" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:221 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:310 msgid "Please %sdonate%s to support development of this project." msgstr "" @@ -503,41 +491,39 @@ msgstr "" msgid "Please note that %s is not supported on this system." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:182 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:42 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:61 msgid "Processing lists" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:447 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:454 msgid "Redownload" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:183 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:43 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:62 msgid "Restarting" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:282 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:89 msgid "Sanity check discovered TLDs in %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:284 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:91 msgid "Sanity check discovered leading dots in %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:560 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:567 msgid "Service Control" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:383 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:387 msgid "Service Errors" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:194 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:283 msgid "Service Status" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:290 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:357 msgid "Service Warnings" msgstr "" @@ -557,24 +543,23 @@ msgstr "" msgid "Some output" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:428 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:435 msgid "Start" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:181 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:41 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:60 msgid "Starting" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:422 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:429 msgid "Starting %s service" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:72 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:59 msgid "Status" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:481 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:488 msgid "Stop" msgstr "" @@ -582,12 +567,11 @@ msgstr "" msgid "Stop the download if it is stalled for set number of seconds." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:180 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:40 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:59 msgid "Stopped" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:475 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:482 msgid "Stopping %s service" msgstr "" @@ -603,38 +587,38 @@ msgstr "" msgid "Suppress output" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:331 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:112 msgid "The %s failed to discover WAN gateway" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:273 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:80 msgid "" "The WebUI application (luci-app-adblock-fast) is outdated, please update it" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:320 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:101 msgid "" "The dnsmasq ipset support is enabled, but dnsmasq is either not installed or " "installed dnsmasq does not support ipset" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:323 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:104 msgid "" "The dnsmasq ipset support is enabled, but ipset is either not installed or " "installed ipset does not support '%s' type" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:326 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:107 msgid "" "The dnsmasq nft set support is enabled, but dnsmasq is either not installed " "or installed dnsmasq does not support nft set" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:329 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:110 msgid "The dnsmasq nft sets support is enabled, but nft is not installed" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:276 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:83 msgid "The principal package (adblock-fast) is outdated, please update it" msgstr "" @@ -653,11 +637,11 @@ msgstr "" #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:493 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:520 -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:83 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:70 msgid "Unknown" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:390 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:397 msgid "Unknown error" msgstr "" @@ -665,7 +649,7 @@ msgstr "" msgid "Unknown message" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:297 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:367 msgid "Unknown warning" msgstr "" @@ -677,7 +661,7 @@ msgstr "" msgid "Use ad-blocking on the dnsmasq instance(s)" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:267 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:76 msgid "" "Use of external dnsmasq config file detected, please set '%s' option to '%s'" msgstr "" @@ -690,16 +674,20 @@ msgstr "" msgid "Verbose output" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:73 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:60 msgid "Version" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:197 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:286 msgid "Version %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:47 -msgid "Warning" +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:67 +msgid "Waiting for trigger (on_boot)" +msgstr "" + +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:68 +msgid "Waiting for trigger (on_start)" msgstr "" #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:244 @@ -734,19 +722,19 @@ msgstr "" msgid "dnsmasq servers file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:372 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:146 msgid "failed to create backup file %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:375 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:149 msgid "failed to create final block-list %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:373 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:147 msgid "failed to delete data file %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:374 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:148 msgid "failed to restore backup file %s" msgstr "" diff --git a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast index 3181bfd932..998749b988 100755 --- a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast +++ b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast @@ -15,7 +15,7 @@ # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "pause" }' # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "stop" }' -readonly rpcdCompat='7' +readonly rpcdCompat='8' readonly adbFunctionsFile='/etc/init.d/adblock-fast' if [ -s "$adbFunctionsFile" ]; then # shellcheck source=../../../../../adblock-fast/files/etc/init.d/adblock-fast -- 2.30.2