💐 Sync 2026-06-16 03:30:28

This commit is contained in:
github-actions[bot] committed 2026-06-16 03:30:28 +08:00
1 parent 0bea1f7c0f
commit d60c7dbae7
149 files changed
+13 -23537

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-daede
PKG_VERSION:=1.12.0
PKG_RELEASE:=10
PKG_RELEASE:=11
PKG_MAINTAINER:=kenzok8
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -13,6 +13,16 @@ case "$PKG" in
;;
esac
# run from a /tmp copy so upgrading luci-app-daede (which replaces this script)
# can't corrupt the in-flight upgrade
case "$0" in
/tmp/.daede-upd-*) ;;
*)
_self="/tmp/.daede-upd-$$"
cp "$0" "$_self" 2>/dev/null && exec sh "$_self" "$@"
;;
esac
LOCK="/tmp/luci-app-daede.pkg-${PKG}.lock"
LOG="/tmp/luci-app-daede.pkg-${PKG}.log"
@@ -33,7 +43,7 @@ fi
(
exec >"$LOG" 2>&1
trap 'rm -f "$LOCK"' EXIT INT TERM
trap 'rm -f "$LOCK"; [ "${0#/tmp/.daede-upd-}" != "$0" ] && rm -f "$0"' EXIT INT TERM
echo "$(date '+%F %T') begin upgrade: $PKG"
@@ -1,22 +0,0 @@
const assert = require('assert');
const airportSync = require('../htdocs/luci-static/resources/view/daede/airport-sync.js');
assert.strictEqual(airportSync.backendGroupName('fs-cloud', 'dae', 'airport_123'), 'fs-cloud');
assert.strictEqual(airportSync.backendGroupName('fs-cloud', 'daed', 'airport_123'), 'fs-cloud');
assert.strictEqual(airportSync.backendGroupName('白月光', 'daed', 'airport_123'), '白月光');
assert.strictEqual(airportSync.backendGroupName('白月光', 'dae', 'airport_123'), 'airport123');
assert.strictEqual(airportSync.backendGroupName('', 'dae', 'airport_123'), 'airport123');
assert.strictEqual(airportSync.isGroupNameValid('fs-cloud', 'dae'), true);
assert.strictEqual(airportSync.isGroupNameValid('白月光', 'dae'), false);
assert.strictEqual(airportSync.isGroupNameValid('白月光', 'daed'), true);
const managed = { group_id: 'group-1', name: 'Airport 1' };
assert.strictEqual(airportSync.findManagedGroup([
{ id: 'group-1', name: 'Airport 1' },
{ id: 'group-2', name: 'Airport 2' }
], managed).id, 'group-1');
assert.strictEqual(airportSync.findManagedGroup([
{ id: 'group-1', name: 'Unrelated group' }
], managed), null);
console.log('airport group name tests passed');
@@ -1,20 +0,0 @@
const assert = require('assert');
const airportSync = require('../htdocs/luci-static/resources/view/daede/airport-sync.js');
// dae: derived names must come out as valid dae group names (no manual fix).
assert.strictEqual(airportSync.sanitizeGroupName('sub.example.com', 'dae'), 'sub_example_com');
assert.strictEqual(airportSync.sanitizeGroupName('My Airport', 'dae'), 'My_Airport');
assert.strictEqual(airportSync.sanitizeGroupName('机场_1', 'dae'), '_1');
assert.strictEqual(airportSync.sanitizeGroupName('....', 'dae'), 'airport');
assert.strictEqual(airportSync.sanitizeGroupName('', 'dae'), '');
// whatever dae sanitize returns (non-empty) must pass the group-name validator.
['sub.example.com', 'My Airport', '机场_1', '1up.cloud', 'a.b.c.d'].forEach(function(raw) {
const out = airportSync.sanitizeGroupName(raw, 'dae');
assert.strictEqual(airportSync.isGroupNameValid(out, 'dae'), true, 'invalid dae name from: ' + raw + ' -> ' + out);
});
// daed: any non-empty name is allowed, keep it as-is (incl. CJK and dots).
assert.strictEqual(airportSync.sanitizeGroupName('白月光', 'daed'), '白月光');
assert.strictEqual(airportSync.sanitizeGroupName('sub.example.com', 'daed'), 'sub.example.com');
console.log('airport sanitize name tests passed');