From bfdd241330a4bb9a5530a6b335635364b2112632 Mon Sep 17 00:00:00 2001 From: Mohd Mehdi Date: Thu, 20 Feb 2025 05:43:09 +0000 Subject: [PATCH] parental-control: add support for Status and Enable --- parental-control/Makefile | 4 ++-- .../files/lib/parentalcontrol/sync_bundles.sh | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/parental-control/Makefile b/parental-control/Makefile index d736795fb..48f7bb78d 100644 --- a/parental-control/Makefile +++ b/parental-control/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=parental-control -PKG_VERSION:=1.1.1 +PKG_VERSION:=1.1.3 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/network/parental-control.git -PKG_SOURCE_VERSION:=6100c9fdcaa158841993e32965b1c9b98d4e8e01 +PKG_SOURCE_VERSION:=3e3bbbb660a23fd31744b0521998f79516db98fd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif diff --git a/parental-control/files/lib/parentalcontrol/sync_bundles.sh b/parental-control/files/lib/parentalcontrol/sync_bundles.sh index 21d36da8c..f9c440445 100644 --- a/parental-control/files/lib/parentalcontrol/sync_bundles.sh +++ b/parental-control/files/lib/parentalcontrol/sync_bundles.sh @@ -171,9 +171,13 @@ handle_download_url() { fi update_bundle_file_from_url "$sanitized_url" "$bundle_file_name" "$bundle_file_size" "$bundle_name" "$file_name" + return $? else logger -p info "Error: Unsupported URL format for ${bundle_file_name}" + return 1 fi + + return 0 } cleanup_bundle_files() { @@ -243,9 +247,10 @@ handle_filter_for_bundles() { local profile enable bundles bundle_name download_url check_bundle_exists() { - config_get name "$1" name - config_get_bool enable "$1" enable 0 - config_get download_url "$1" download_url + local cfg="$1" + config_get name "$cfg" name + config_get_bool enable "$cfg" enable 0 + config_get download_url "$cfg" download_url if [ "${enable}" -eq 0 ]; then # bundle is disabled @@ -254,6 +259,14 @@ handle_filter_for_bundles() { if [ "$name" = "$2" ]; then handle_download_url "$download_url" "$name" + local exit_status=$? + if [ "$exit_status" -eq 1 ]; then + uci -q set "parentalcontrol.${cfg}.status"="Error" + else + uci -q set "parentalcontrol.${cfg}.status"="" + fi + + uci commit parentalcontrol fi }