From 079ea4f182837161cd1464cac2937ba871eeb586 Mon Sep 17 00:00:00 2001 From: action Date: Mon, 27 Jul 2026 19:14:11 +0800 Subject: [PATCH] update 2026-07-27 19:14:11 --- dae/Makefile | 2 +- luci-app-linkease/Makefile | 4 ++-- .../luasrc/controller/linkease.lua | 11 ----------- luci-app-linkeasefull/Makefile | 6 +++--- .../root/etc/uci-defaults/50_luci-linkeasefull | 4 ++++ luci-lib-linkeasefile/Makefile | 16 ++++++++++++++++ .../luci-static/linkeasefile/chunk.22632dc4.js | 0 .../luci-static/linkeasefile/chunk.324cab41.js | 0 .../luci-static/linkeasefile/chunk.4a114b4a.js | 0 .../luci-static/linkeasefile/chunk.4ea0593d.js | 0 .../luci-static/linkeasefile/chunk.6424c2fc.js | 0 .../luci-static/linkeasefile/chunk.7191676b.js | 0 .../luci-static/linkeasefile/chunk.a0a5dece.js | 0 .../luci-static/linkeasefile/chunk.a6a47e72.js | 0 .../luci-static/linkeasefile/chunk.c69499bb.js | 0 .../luci-static/linkeasefile/chunk.d52f0fe8.js | 0 .../luci-static/linkeasefile/chunk.dc0a1b58.js | 0 .../htdocs/luci-static/linkeasefile/codicon.ttf | Bin .../luci-static/linkeasefile/icons/archive.png | Bin .../luci-static/linkeasefile/icons/dir.png | Bin .../luci-static/linkeasefile/icons/doc.png | Bin .../luci-static/linkeasefile/icons/error.png | Bin .../luci-static/linkeasefile/icons/image.png | Bin .../luci-static/linkeasefile/icons/music.png | Bin .../luci-static/linkeasefile/icons/notfound.png | Bin .../luci-static/linkeasefile/icons/other.png | Bin .../luci-static/linkeasefile/icons/video.png | Bin .../htdocs/luci-static/linkeasefile/index.js | 0 .../htdocs/luci-static/linkeasefile/style.css | 0 .../luasrc/controller/linkease_file.lua | 16 +++++++++++++++- .../luasrc/view/linkease/file.htm | 0 .../root/etc/uci-defaults/50_luci-linkease-file | 4 ++++ 32 files changed, 45 insertions(+), 18 deletions(-) create mode 100755 luci-app-linkeasefull/root/etc/uci-defaults/50_luci-linkeasefull create mode 100644 luci-lib-linkeasefile/Makefile rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.22632dc4.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.324cab41.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.4a114b4a.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.4ea0593d.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.6424c2fc.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.7191676b.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.a0a5dece.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.a6a47e72.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.c69499bb.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.d52f0fe8.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/chunk.dc0a1b58.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/codicon.ttf (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/archive.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/dir.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/doc.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/error.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/image.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/music.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/notfound.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/other.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/icons/video.png (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/index.js (100%) rename {luci-app-linkease => luci-lib-linkeasefile}/htdocs/luci-static/linkeasefile/style.css (100%) rename luci-app-linkease/luasrc/controller/linkease_backend.lua => luci-lib-linkeasefile/luasrc/controller/linkease_file.lua (91%) rename {luci-app-linkease => luci-lib-linkeasefile}/luasrc/view/linkease/file.htm (100%) create mode 100755 luci-lib-linkeasefile/root/etc/uci-defaults/50_luci-linkease-file diff --git a/dae/Makefile b/dae/Makefile index 16e83f74..d8e516e6 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=64dd36796f74660421d30bfa7b935797391ca428 +PKG_SOURCE_VERSION:=22450992d428820baecfe7d25c8eca04ededd09a PKG_SOURCE_URL:=https://github.com/olicesx/dae.git PKG_MIRROR_HASH:=skip diff --git a/luci-app-linkease/Makefile b/luci-app-linkease/Makefile index b43122bf..2028107b 100644 --- a/luci-app-linkease/Makefile +++ b/luci-app-linkease/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for linkease -LUCI_DEPENDS:=+linkease +LUCI_DEPENDS:=+luci-lib-linkeasefile LUCI_PKGARCH:=all -PKG_VERSION:=2.1.70-r3 +PKG_VERSION:=2.1.70-r4 # PKG_RELEASE MUST be empty for luci.mk PKG_RELEASE:= LUCI_MINIFY_CSS:=0 diff --git a/luci-app-linkease/luasrc/controller/linkease.lua b/luci-app-linkease/luasrc/controller/linkease.lua index a71b80b8..ca1cd6cf 100644 --- a/luci-app-linkease/luasrc/controller/linkease.lua +++ b/luci-app-linkease/luasrc/controller/linkease.lua @@ -9,7 +9,6 @@ function index() entry({"admin", "services", "linkease_status"}, call("linkease_status")) - entry({"admin", "services", "linkease", "file"}, call("linkease_file_template")).leaf = true end @@ -27,13 +26,3 @@ function linkease_status() luci.http.write_json(status) end -function get_params(name) - local data = { - prefix=luci.dispatcher.build_url(unpack({"admin", "services", "linkease", name})), - } - return data -end - -function linkease_file_template() - luci.template.render("linkease/file", get_params("file")) -end diff --git a/luci-app-linkeasefull/Makefile b/luci-app-linkeasefull/Makefile index 1219d4b0..5bf69195 100644 --- a/luci-app-linkeasefull/Makefile +++ b/luci-app-linkeasefull/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for linkeasefull -LUCI_DEPENDS:=+linkeasefull +LUCI_DEPENDS:=+linkeasefull +luci-lib-linkeasefile LUCI_PKGARCH:=all -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.0.1 PKG_RELEASE:=1 -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-linkeasefull/root/etc/uci-defaults/50_luci-linkeasefull b/luci-app-linkeasefull/root/etc/uci-defaults/50_luci-linkeasefull new file mode 100755 index 00000000..048f3caf --- /dev/null +++ b/luci-app-linkeasefull/root/etc/uci-defaults/50_luci-linkeasefull @@ -0,0 +1,4 @@ +#!/bin/sh + +rm -f /tmp/luci-indexcache /tmp/luci-indexcache.* +exit 0 diff --git a/luci-lib-linkeasefile/Makefile b/luci-lib-linkeasefile/Makefile new file mode 100644 index 00000000..cdc2de69 --- /dev/null +++ b/luci-lib-linkeasefile/Makefile @@ -0,0 +1,16 @@ + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=LuCI support for linkease file +LUCI_DEPENDS:=+linkease +LUCI_PKGARCH:=all +PKG_VERSION:=2.1.70-r3 +# PKG_RELEASE MUST be empty for luci.mk +PKG_RELEASE:= +LUCI_MINIFY_CSS:=0 +LUCI_MINIFY_JS:=0 + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature + diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.22632dc4.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.22632dc4.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.22632dc4.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.22632dc4.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.324cab41.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.324cab41.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.324cab41.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.324cab41.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.4a114b4a.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.4a114b4a.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.4a114b4a.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.4a114b4a.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.4ea0593d.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.4ea0593d.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.4ea0593d.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.4ea0593d.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.6424c2fc.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.6424c2fc.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.6424c2fc.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.6424c2fc.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.7191676b.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.7191676b.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.7191676b.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.7191676b.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.a0a5dece.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.a0a5dece.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.a0a5dece.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.a0a5dece.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.a6a47e72.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.a6a47e72.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.a6a47e72.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.a6a47e72.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.c69499bb.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.c69499bb.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.c69499bb.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.c69499bb.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.d52f0fe8.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.d52f0fe8.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.d52f0fe8.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.d52f0fe8.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.dc0a1b58.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.dc0a1b58.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/chunk.dc0a1b58.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/chunk.dc0a1b58.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/codicon.ttf b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/codicon.ttf similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/codicon.ttf rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/codicon.ttf diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/archive.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/archive.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/archive.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/archive.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/dir.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/dir.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/dir.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/dir.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/doc.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/doc.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/doc.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/doc.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/error.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/error.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/error.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/error.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/image.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/image.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/image.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/image.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/music.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/music.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/music.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/music.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/notfound.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/notfound.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/notfound.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/notfound.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/other.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/other.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/other.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/other.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/icons/video.png b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/video.png similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/icons/video.png rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/icons/video.png diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/index.js b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/index.js similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/index.js rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/index.js diff --git a/luci-app-linkease/htdocs/luci-static/linkeasefile/style.css b/luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/style.css similarity index 100% rename from luci-app-linkease/htdocs/luci-static/linkeasefile/style.css rename to luci-lib-linkeasefile/htdocs/luci-static/linkeasefile/style.css diff --git a/luci-app-linkease/luasrc/controller/linkease_backend.lua b/luci-lib-linkeasefile/luasrc/controller/linkease_file.lua similarity index 91% rename from luci-app-linkease/luasrc/controller/linkease_backend.lua rename to luci-lib-linkeasefile/luasrc/controller/linkease_file.lua index 576ba42e..76bb0fc8 100644 --- a/luci-app-linkease/luasrc/controller/linkease_backend.lua +++ b/luci-lib-linkeasefile/luasrc/controller/linkease_file.lua @@ -7,13 +7,27 @@ local ltn12 = require "luci.ltn12" local table = require "table" local util = require "luci.util" -module("luci.controller.linkease_backend", package.seeall) +module("luci.controller.linkease_file", package.seeall) local BLOCKSIZE = 2048 local LINKEASE_UNIX = "/var/run/linkease.sock" function index() entry({"linkease"}, call("linkease_backend")).leaf=true + local e = entry({"admin", "services", "linkease", "file"}, call("linkease_file_template")) + e.leaf = true + e.dependent = false +end + +function get_params(name) + local data = { + prefix=luci.dispatcher.build_url(unpack({"admin", "services", "linkease", name})), + } + return data +end + +function linkease_file_template() + luci.template.render("linkease/file", get_params("file")) end local function sink_socket(sock, io_err) diff --git a/luci-app-linkease/luasrc/view/linkease/file.htm b/luci-lib-linkeasefile/luasrc/view/linkease/file.htm similarity index 100% rename from luci-app-linkease/luasrc/view/linkease/file.htm rename to luci-lib-linkeasefile/luasrc/view/linkease/file.htm diff --git a/luci-lib-linkeasefile/root/etc/uci-defaults/50_luci-linkease-file b/luci-lib-linkeasefile/root/etc/uci-defaults/50_luci-linkease-file new file mode 100755 index 00000000..048f3caf --- /dev/null +++ b/luci-lib-linkeasefile/root/etc/uci-defaults/50_luci-linkease-file @@ -0,0 +1,4 @@ +#!/bin/sh + +rm -f /tmp/luci-indexcache /tmp/luci-indexcache.* +exit 0