OpenWrt/kenzok8-passwall
1
0
Fork 0
mirror of https://github.com/kenzok8/openwrt-packages.git synced 2025-01-07 03:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2022-08-29 20:20:12

Browse Source
This commit is contained in:
github-actions[bot] 2022-08-29 20:20:12 +08:00
parent e3dd871834
commit 82d6f07f33
7 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
luci-app-store/Makefile
View File

@ -8,10 +8,10 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI based ipk store
LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua +mount-utils +luci-lib-taskd
LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.16)
LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.17)
LUCI_PKGARCH:=all
PKG_VERSION:=0.1.12-4
PKG_VERSION:=0.1.12-5
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=

2
luci-app-store/luasrc/view/store/main.htm
View File

@ -49,7 +49,7 @@
<%
local taskd = require "luci.model.tasks"
local status = taskd.status("istore")
if status.running then
if status.running or status.exit_code ~= 404 then
-%>
window.istore_log(true);
<%

2
luci-lib-taskd/Makefile
View File

@ -11,7 +11,7 @@ LUCI_DEPENDS:=+luci-lib-xterm +taskd
LUCI_EXTRA_DEPENDS:=taskd (>=1.0.3-1)
LUCI_PKGARCH:=all
PKG_VERSION:=1.0.16
PKG_VERSION:=1.0.17
PKG_RELEASE:=
PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>

15
luci-lib-taskd/htdocs/luci-static/resources/tasks/tasks.js
View File

@ -22,11 +22,8 @@
}
oReq.onload = function (oEvent) {
if (oReq.status == 403) {
if (confirm($gettext("Lost login status, retry?"))) {
setTimeout(retry, 0);
} else {
reject(oEvent);
}
alert($gettext("Lost login status"));
location.href = location.href;
} else if (oReq.status == 404) {
reject(oEvent);
} else {
@ -112,9 +109,9 @@
title_view.title = title;
title_view.innerText = title;
if (!data.running) {
container.classList.add('tasks_stopped')
container.classList.add('tasks_stopped');
if (data.exit_code) {
container.classList.add('tasks_failed')
container.classList.add('tasks_failed');
}
}
// last pull
@ -161,9 +158,9 @@
title_view.innerText = task_id + ' (' + $gettext("Fetch log failed, retrying...") + ')';
setTimeout(()=>pulllog(true), 1000);
} else if (err.target.status == 403 || err.target.status == 404) {
title_view.innerText += ' (' + $gettext(err.target.status == 403?"Lost login status":"Task does not exist or has been deleted") + ')';
title_view.innerText = task_id + ' (' + $gettext(err.target.status == 403?"Lost login status":"Task does not exist or has been deleted") + ')';
container.querySelector(".dialog-icon-close").hidden = true;
container.classList.add('tasks_unknown');
container.classList.add('tasks_unknown');
} else {
console.error(err);
}

2
luci-lib-taskd/luasrc/model/tasks.lua
View File

@ -35,7 +35,7 @@ taskd.status = function (task_id)
if task_id == "" then
data = {}
else
data = {running=false, exit_code=255}
data = {running=false, exit_code=404}
end
end
if task_id ~= "" then

1
luci-lib-taskd/luasrc/view/tasks/embed.htm
View File

@ -10,7 +10,6 @@
tr("Stopped at:")
tr("Finished at:")
tr("Failed at:")
tr("Lost login status, retry?")
tr("Lost login status")
tr("Fetch log failed, retrying...")
tr("Task does not exist or has been deleted")

3
luci-lib-taskd/src/po/zh-cn/lib-tasks.po
View File

@ -10,9 +10,6 @@ msgstr "完成于："
msgid "Failed at:"
msgstr "失败于："
msgid "Lost login status, retry?"
msgstr "丢失登陆状态，是否重试？"
msgid "Lost login status"
msgstr "丢失登陆状态"