update 2025-01-04 04:20:30

luci-app-autotimeset/Makefile

@@ -11,8 +11,8 @@ PKG_NAME:=luci-app-$(NAME)
 LUCI_TITLE:=LuCI support for Scheduled Time setting
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=2.1.0
-PKG_RELEASE:=20240318
+PKG_VERSION:=2.2.0
+PKG_RELEASE:=20240412
 
 
 define Package/$(PKG_NAME)/conffiles

luci-app-autotimeset/luasrc/controller/autotimeset.lua

@@ -6,16 +6,16 @@ function index()
 		return
 	end
         entry({"admin", "control"}, firstchild(), "Control", 44).dependent = false
-        local e = entry({"admin", "control", "autotimeset"}, alias("admin", "control", "autotimeset", "base"), _("Scheduled Setting"), 20)
+        local e = entry({"admin", "control", "autotimeset"}, alias("admin", "control", "autotimeset", "scheduledtask"), _("Scheduled Setting"), 20)
 	e.dependent = false
 	e.acl_depends = { "luci-app-autotimeset" }
-        entry({"admin", "control", "autotimeset", "base"}, cbi("autotimeset/base"),  _("Scheduled Setting"), 1).leaf = true
-        entry({"admin", "control", "autotimeset", "log"}, form("autotimeset/log"), _("Log"), 2).leaf = true
+        entry({"admin", "control", "autotimeset", "scheduledtask"}, cbi("autotimeset/scheduledtask"),  _("Scheduled task"), 10).leaf = true
+        entry({"admin", "control", "autotimeset", "startuptask"}, cbi("autotimeset/startuptask"),  _("Startup task"), 20).leaf = true
+        entry({"admin", "control", "autotimeset", "log"}, form("autotimeset/log"), _("Log"), 30).leaf = true
         entry({"admin","control","autotimeset","dellog"},call("dellog"))
         entry({"admin","control","autotimeset","getlog"},call("getlog"))
 end
 
-
 function getlog()
 	logfile="/etc/autotimeset/autotimeset.log"
 	if not fs.access(logfile) then

luci-app-autotimeset/luasrc/model/cbi/autotimeset/base.lua

@@ -30,16 +30,17 @@ e:value(1,translate("Scheduled Reboot"))
 e:value(2,translate("Scheduled Poweroff"))
 e:value(3,translate("Scheduled ReNetwork"))
 e:value(4,translate("Scheduled RestartSamba"))
+e:value(16,translate("Scheduled Restartlan"))
 e:value(5,translate("Scheduled Restartwan"))
 e:value(6,translate("Scheduled Closewan"))
 e:value(7,translate("Scheduled Clearmem"))
 e:value(8,translate("Scheduled Sysfree"))
 e:value(9,translate("Scheduled DisReconn"))
 e:value(10,translate("Scheduled DisRereboot"))
 e:value(11,translate("Scheduled Restartmwan3"))
-e:value(12,translate("Scheduled Customscript"))
 e:value(13,translate("Scheduled Wifiup"))
 e:value(14,translate("Scheduled Wifidown"))
+e:value(12,translate("Scheduled Customscript"))
 e:value(15,translate("Scheduled Customscript2"))
 e.default=2
 

luci-app-autotimeset/luasrc/model/cbi/autotimeset/scheduledtask.lua

@@ -0,0 +1,79 @@
+
+local m,s,e
+
+m=Map("autotimeset",translate("Scheduled task"),translate("<b>The original [Timing Settings] includes scheduled task execution and startup task execution. Presets include over 10 functions, including restart, shutdown, network restart, memory release, system cleaning, network sharing, network shutdown, automatic detection of network disconnects and reconnection, MWAN3 load balancing detection of reconnection, and custom scripts</b></br>") ..
+translate("N1-N5 is continuous, N1, N3, N5 is discontinuous, */N represents every N hours or every N minutes.The week can only be 0~6, the hour can only be 0~23, the minute can only be 0~59, the unavailable time is 48 hours."))
+
+s = m:section(TypedSection, 'global')
+s.anonymous=true
+
+e=s:option(TextValue, "customscript" ,translate("Edit Custom Script"))
+e.description = translate("The execution content of the [Scheduled Customscript] in the task name")
+e.rows = 5
+e.default=" "
+
+e=s:option(TextValue, "customscript2" ,translate("Edit Custom Script2"))
+e.description = translate("The execution content of the [Scheduled Customscript2] in the task name")
+e.rows = 5
+e.default=" "
+
+s=m:section(TypedSection,"stime","")
+s.addremove=true
+s.anonymous=true
+s.template = "cbi/tblsection"
+
+e = s:option(Value, 'remarks', translate('Remarks'))
+
+e=s:option(Flag,"enable",translate("Enable"))
+e.rmempty = false
+e.default=0
+
+e=s:option(ListValue,"stype",translate("Scheduled Type"))
+e:value(1,translate("Scheduled Reboot"))
+e:value(2,translate("Scheduled Poweroff"))
+e:value(3,translate("Scheduled ReNetwork"))
+e:value(4,translate("Scheduled RestartSamba"))
+e:value(5,translate("Scheduled Restartwan"))
+e:value(6,translate("Scheduled Closewan"))
+e:value(7,translate("Scheduled Clearmem"))
+e:value(8,translate("Scheduled Sysfree"))
+e:value(9,translate("Scheduled DisReconn"))
+e:value(10,translate("Scheduled DisRereboot"))
+e:value(11,translate("Scheduled Restartmwan3"))
+e:value(13,translate("Scheduled Wifiup"))
+e:value(14,translate("Scheduled Wifidown"))
+e:value(12,translate("Scheduled Customscript"))
+e:value(15,translate("Scheduled Customscript2"))
+e.default=2
+
+
+e=s:option(Value,"month",translate("Month(0~11)"))
+e.rmempty = false
+e.default = '*'
+
+week=s:option(Value,"week",translate("Week Day(0~6)"))
+week.rmempty = true
+week:value('*',translate("Everyday"))
+week:value(0,translate("Sunday"))
+week:value(1,translate("Monday"))
+week:value(2,translate("Tuesday"))
+week:value(3,translate("Wednesday"))
+week:value(4,translate("Thursday"))
+week:value(5,translate("Friday"))
+week:value(6,translate("Saturday"))
+week.default='*'
+
+e=s:option(Value,"hour",translate("Hour(0~23)"))
+e.rmempty = false
+e.default = 0
+
+e=s:option(Value,"minute",translate("Minute(0~59)"))
+e.rmempty = false
+e.default = 0
+
+m.apply_on_parse = true
+m.on_after_apply = function(self,map)
+	luci.sys.exec("/etc/init.d/autotimeset start")
+end
+
+return m

luci-app-autotimeset/luasrc/model/cbi/autotimeset/startuptask.lua

@@ -0,0 +1,57 @@
+
+local m,s,e
+
+m=Map("autotimeset",translate("Startup task"),translate("<b>The original [Timing Settings] includes scheduled task execution and startup task execution. Presets include over 10 functions, including restart, shutdown, network restart, memory release, system cleaning, network sharing, network shutdown, automatic detection of network disconnects and reconnection, MWAN3 load balancing detection of reconnection, and custom scripts</b></br>") ..
+translate("The task to be executed upon startup, with a startup delay time unit of seconds."))
+
+s = m:section(TypedSection, 'global')
+s.anonymous=true
+
+e=s:option(TextValue, "customscript" ,translate("Edit Custom Script"))
+e.description = translate("The execution content of the [Scheduled Customscript] in the task name")
+e.rows = 5
+e.default=" "
+
+e=s:option(TextValue, "customscript2" ,translate("Edit Custom Script2"))
+e.description = translate("The execution content of the [Scheduled Customscript2] in the task name")
+e.rows = 5
+e.default=" "
+
+s=m:section(TypedSection,"ltime","")
+s.addremove=true
+s.anonymous=true
+s.template = "cbi/tblsection"
+
+e = s:option(Value, 'remarks', translate('Remarks'))
+
+e=s:option(Flag,"enable",translate("Enable"))
+e.rmempty = false
+e.default=0
+
+e=s:option(ListValue,"stype",translate("Scheduled Type"))
+e:value(1,translate("Scheduled Reboot"))
+e:value(2,translate("Scheduled Poweroff"))
+e:value(3,translate("Scheduled ReNetwork"))
+e:value(4,translate("Scheduled RestartSamba"))
+e:value(5,translate("Scheduled Restartwan"))
+e:value(6,translate("Scheduled Closewan"))
+e:value(7,translate("Scheduled Clearmem"))
+e:value(8,translate("Scheduled Sysfree"))
+e:value(9,translate("Scheduled DisReconn"))
+e:value(10,translate("Scheduled DisRereboot"))
+e:value(11,translate("Scheduled Restartmwan3"))
+e:value(13,translate("Scheduled Wifiup"))
+e:value(14,translate("Scheduled Wifidown"))
+e:value(12,translate("Scheduled Customscript"))
+e:value(15,translate("Scheduled Customscript2"))
+e.default=2
+
+e=s:option(Value,"delay",translate("Delayed Start(seconds)"))
+e.default=10
+
+m.apply_on_parse = true
+m.on_after_apply = function(self,map)
+	luci.sys.exec("/etc/init.d/autotimeset start")
+end
+
+return m

luci-app-autotimeset/po/zh-cn/autotimeset.po

@@ -5,8 +5,17 @@ msgstr "<b>任务设置包括定时任务执行和开机启动任务执行，预
 msgid "N1-N5 is continuous, N1, N3, N5 is discontinuous, */N represents every N hours or every N minutes.The week can only be 0~6, the hour can only be 0~23, the minute can only be 0~59, the unavailable time is 48 hours."
 msgstr "N1-N5连续，N1,N3,N5不连续，*/N表示每N小时或每N分钟。月份范围0-11，星期范围0～6，小时范围0～23，分钟范围0～59，不可用72小时或者90分钟等连续范围。"
 
-msgid "Scheduled task/startup task settings"
-msgstr "定时执行任务/开机启动任务设置"
+msgid "Scheduled task"
+msgstr "定时执行任务"
+
+msgid "Startup task"
+msgstr "开机启动任务"
+
+msgid "The task to be executed upon startup, with a startup delay time unit of seconds."
+msgstr "开机启动执行的任务，启动延时时间单位为秒。"
+
+msgid "Control"
+msgstr "管控"
 
 msgid "Scheduled Setting"
 msgstr "任务设置"
@@ -15,19 +24,10 @@ msgid "Test/Verify Settings"
 msgstr "测试/验证设置"
 
 msgid "Scheduled Type"
-msgstr "任务名称"
-
-msgid "Task Type"
 msgstr "任务类型"
 
-msgid "Scheduled task execution"
-msgstr "定时执行任务"
-
-msgid "Startup task"
-msgstr "开机启动任务"
-
-msgid "Startup delay time"
-msgstr "延迟时间【开机用】"
+msgid "Delayed Start(seconds)"
+msgstr "开机任务延时(秒)"
 
 msgid "Log"
 msgstr "日志"
@@ -44,6 +44,9 @@ msgstr "重启网络"
 msgid "Scheduled RestartSamba"
 msgstr "重启网络共享"
 
+msgid "Scheduled Restartlan"
+msgstr "重启LAN"
+
 msgid "Scheduled Restartwan"
 msgstr "重启WAN"
 
@@ -90,17 +93,17 @@ msgid "The execution content of the [Scheduled Customscript2] in the task name"
 msgstr "任务名称中【自定义脚本2】执行内容"
 
 msgid "Month(0~11)"
-msgstr "月份(0~11)【定时用】"
+msgstr "月份(0~11)"
 
 msgid "Week Day(0~6)"
-msgstr "星期(0~6)【定时用】"
+msgstr "星期(0~6)"
 
 msgid "Everyday"
-msgstr "每天【定时用】"
+msgstr "每天"
 
 msgid "Hour(0~23)"
-msgstr "小时(0~23)【定时用】"
+msgstr "小时(0~23)"
 
 msgid "Minute(0~59)"
-msgstr "分钟(0~59)【定时用】"
+msgstr "分钟(0~59)"
 

luci-app-autotimeset/po/zh_Hans/autotimeset.po

@@ -5,8 +5,17 @@ msgstr "<b>任务设置包括定时任务执行和开机启动任务执行，预
 msgid "N1-N5 is continuous, N1, N3, N5 is discontinuous, */N represents every N hours or every N minutes.The week can only be 0~6, the hour can only be 0~23, the minute can only be 0~59, the unavailable time is 48 hours."
 msgstr "N1-N5连续，N1,N3,N5不连续，*/N表示每N小时或每N分钟。月份范围0-11，星期范围0～6，小时范围0～23，分钟范围0～59，不可用72小时或者90分钟等连续范围。"
 
-msgid "Scheduled task/startup task settings"
-msgstr "定时执行任务/开机启动任务设置"
+msgid "Scheduled task"
+msgstr "定时执行任务"
+
+msgid "Startup task"
+msgstr "开机启动任务"
+
+msgid "The task to be executed upon startup, with a startup delay time unit of seconds."
+msgstr "开机启动执行的任务，启动延时时间单位为秒。"
+
+msgid "Control"
+msgstr "管控"
 
 msgid "Scheduled Setting"
 msgstr "任务设置"
@@ -15,19 +24,10 @@ msgid "Test/Verify Settings"
 msgstr "测试/验证设置"
 
 msgid "Scheduled Type"
-msgstr "任务名称"
-
-msgid "Task Type"
 msgstr "任务类型"
 
-msgid "Scheduled task execution"
-msgstr "定时执行任务"
-
-msgid "Startup task"
-msgstr "开机启动任务"
-
-msgid "Startup delay time"
-msgstr "延迟时间【开机用】"
+msgid "Delayed Start(seconds)"
+msgstr "开机任务延时(秒)"
 
 msgid "Log"
 msgstr "日志"
@@ -44,6 +44,9 @@ msgstr "重启网络"
 msgid "Scheduled RestartSamba"
 msgstr "重启网络共享"
 
+msgid "Scheduled Restartlan"
+msgstr "重启LAN"
+
 msgid "Scheduled Restartwan"
 msgstr "重启WAN"
 
@@ -90,17 +93,17 @@ msgid "The execution content of the [Scheduled Customscript2] in the task name"
 msgstr "任务名称中【自定义脚本2】执行内容"
 
 msgid "Month(0~11)"
-msgstr "月份(0~11)【定时用】"
+msgstr "月份(0~11)"
 
 msgid "Week Day(0~6)"
-msgstr "星期(0~6)【定时用】"
+msgstr "星期(0~6)"
 
 msgid "Everyday"
-msgstr "每天【定时用】"
+msgstr "每天"
 
 msgid "Hour(0~23)"
-msgstr "小时(0~23)【定时用】"
+msgstr "小时(0~23)"
 
 msgid "Minute(0~59)"
-msgstr "分钟(0~59)【定时用】"
+msgstr "分钟(0~59)"