fix(ci): synchronize PO catalogs, fix DNS action UI, state aggregate signature, and uci array parsing

fe-app-tachyon/locales/tachyon.ru.po

@@ -1217,6 +1217,9 @@ msgstr "Проверка верхних DNS"
 msgid "Host"
 msgstr "Хост"
 
+msgid "Hosts"
+msgstr "Хосты"
+
 msgid "Hosts Lists Update Interval"
 msgstr "Интервал обновления списков хостов"
 
@@ -1797,7 +1800,7 @@ msgid "Network interface settings"
 msgstr "Настройки сетевого интерфейса"
 
 msgid "New domains:"
-msgstr ""
+msgstr "Новых доменов:"
 
 msgid "New version %s is available for %s"
 msgstr "Доступна новая версия %s для %s"
@@ -2019,7 +2022,7 @@ msgid "Padding"
 msgstr "Padding"
 
 msgid "Parsed records:"
-msgstr ""
+msgstr "Распознано записей:"
 
 msgid "Password"
 msgstr "Пароль"
@@ -2598,10 +2601,10 @@ msgid "Skip TLS certificate verification (not recommended)"
 msgstr ""
 
 msgid "Skipped comments/invalid:"
-msgstr ""
+msgstr "Пропущено комментариев/невалидных:"
 
 msgid "Skipped loopback:"
-msgstr ""
+msgstr "Пропущено loopback:"
 
 msgid "Smart Detect"
 msgstr "Smart Detect"
@@ -2931,7 +2934,7 @@ msgid "Top level has the highest priority; lower levels are used as fallback"
 msgstr "Верхний уровень имеет наивысший приоритет; нижние уровни используются как резерв"
 
 msgid "Total lines:"
-msgstr ""
+msgstr "Всего строк:"
 
 msgid "Trace"
 msgstr "Проверить"
@@ -3096,7 +3099,7 @@ msgid "Update this subscription automatically"
 msgstr "Автоматически обновлять эту подписку"
 
 msgid "Updated/duplicates:"
-msgstr ""
+msgstr "Обновлено/дубликатов:"
 
 msgid "Uplink"
 msgstr "Исходящий"

luci-app-tachyon/htdocs/luci-static/resources/view/tachyon/section.js

@@ -9240,8 +9240,6 @@ function createSectionContent(section) {
       });
     },
   });
-  dependsOnRoutingAction(domainConditionOption);
-  domainConditionOption.depends("action", "dns");
 
   const userDomainsConditionOption = addTextConditionField(section, {
     key: "user_domains",
@@ -9253,8 +9251,6 @@ function createSectionContent(section) {
     ),
     textAnalyze: analyzeDomainSuffixText,
   });
-  dependsOnRoutingAction(userDomainsConditionOption);
-  userDomainsConditionOption.depends("action", "dns");
 
   const ipConditionOption = addTextConditionField(section, {
     key: "ip_cidr",

tachyon/files/usr/lib/components/hosts.uc

@@ -55,12 +55,15 @@ function bool_opt(section, key, default_value) {
 function enabled_hosts_sections() {
     let result = [];
     let cursor = uci.cursor();
-    cursor.foreach(CONFIG_NAME, "section", function(section) {
-        if (opt(section, ".type", "") != "section") return;
-        if (opt(section, "action", "") != "hosts") return;
-        if (!bool_opt(section, "enabled", true)) return;
-        push(result, section);
-    });
+    if (!cursor) return result;
+    try {
+        cursor.foreach(CONFIG_NAME, "section", function(section) {
+            if (opt(section, ".type", "") != "section") return;
+            if (opt(section, "action", "") != "hosts") return;
+            if (!bool_opt(section, "enabled", true)) return;
+            push(result, section);
+        });
+    } catch(e) {}
     return result;
 }
 

tachyon/files/usr/lib/core/uci.uc

@@ -254,8 +254,17 @@ function state_get_all(package_name, section_name) {
             continue;
 
         let option = substr(key, length(prefix));
-        if (option != "")
-            result[option] = substr(line, equals + 1);
+        if (option != "") {
+            let val = substr(line, equals + 1);
+            if (result[option] != null) {
+                if (type(result[option]) == "array")
+                    push(result[option], val);
+                else
+                    result[option] = [ result[option], val ];
+            } else {
+                result[option] = val;
+            }
+        }
     }
 
     return length(keys(result)) > 0 ? result : null;

tests/runtime_state_predicates.sh

@@ -1438,6 +1438,7 @@ zapret2_queue_signature=$(state_ucode zapret2-queue-signature-fixture "$WORK_DIR
 zapret2_runtime_signature=$(state_ucode zapret2-runtime-signature-fixture "$WORK_DIR/reload-state-signatures.json")
 byedpi_runtime_signature=$(state_ucode byedpi-runtime-signature-fixture "$WORK_DIR/reload-state-signatures.json")
 list_signature=$(state_ucode list-update-signature-fixture "$WORK_DIR/reload-state-signatures.json")
+hosts_list_signature=$(state_ucode hosts-list-signature-fixture "$WORK_DIR/reload-state-signatures.json")
 cron_signature=$(state_ucode cron-signature-fixture "$WORK_DIR/reload-state-signatures.json")
 urltest_enabled_sections=list_proxy urltest_custom
 dont_touch_dhcp=$(state_ucode dont-touch-dhcp-fixture "$WORK_DIR/reload-state-signatures.json")