+ <% if container_running then %>
+
+ <% else %>
+
+ <% end %>
+
+
+<%
+if container_running then
+ local port=util.trim(util.exec("/usr/libexec/istorec/nastools.sh port"))
+ if port == "" then
+ port="3003"
+ end
+-%>
+
+
+
+
+
+
+
+<% end %>
\ No newline at end of file
diff --git a/applications/luci-app-nastools/po/zh-cn/nastools.po b/applications/luci-app-nastools/po/zh-cn/nastools.po
index 9f70497..4273e45 100644
--- a/applications/luci-app-nastools/po/zh-cn/nastools.po
+++ b/applications/luci-app-nastools/po/zh-cn/nastools.po
@@ -1,9 +1,41 @@
-msgid "NasTools"
-msgstr "NasTool 工具集"
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
-msgid "Access homepage:"
-msgstr "访问主页："
+msgid "Official website:"
+msgstr "官方网站："
msgid "NasTools is a tools for resource aggregation running in NAS."
-msgstr "NasTools 汇聚了电影搜索，下载，订阅，观看等等 NAS 功能的工具集合。"
+msgstr "NasTools 是汇聚了电影搜索，下载，订阅，观看等等 NAS 功能的工具集合。"
+msgid "Config path"
+msgstr "配置文件路径"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Auto update"
+msgstr "自动更新"
+
+msgid "Service Status"
+msgstr "服务状态"
+
+msgid "NasTools status:"
+msgstr "NasTools 的状态信息如下："
+
+msgid "Setup"
+msgstr "安装配置"
+
+msgid "The following parameters will only take effect during installation or upgrade:"
+msgstr "以下参数只在安装或者升级时才会生效："
+
+msgid "Status"
+msgstr "状态"
+
+msgid "NasTools is running"
+msgstr "NasTools 运行中"
+
+msgid "NasTools is not running"
+msgstr "NasTools 未运行"
+
+msgid "Open NasTools"
+msgstr "打开 NasTools"
diff --git a/applications/luci-app-nastools/root/etc/config/nastools b/applications/luci-app-nastools/root/etc/config/nastools
index 5e8c5e1..4621b34 100644
--- a/applications/luci-app-nastools/root/etc/config/nastools
+++ b/applications/luci-app-nastools/root/etc/config/nastools
@@ -1,4 +1,4 @@
config nastools
- option 'config_path' ''
+ option 'config_path' '/root/nastools/config'
option 'http_port' '3003'
option 'auto_upgrade' '0'
diff --git a/applications/luci-app-nastools/root/usr/libexec/istorec/nastools.sh b/applications/luci-app-nastools/root/usr/libexec/istorec/nastools.sh
new file mode 100755
index 0000000..321f586
--- /dev/null
+++ b/applications/luci-app-nastools/root/usr/libexec/istorec/nastools.sh
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+ACTION=${1}
+shift 1
+
+get_image() {
+ IMAGE_NAME="jxxghp/nas-tools"
+}
+
+do_install() {
+ get_image
+ echo "docker pull ${IMAGE_NAME}"
+ docker pull ${IMAGE_NAME}
+ docker rm -f nastools
+
+ do_install_detail
+}
+
+do_install_detail() {
+ local config=`uci get nastools.@nastools[0].config_path 2>/dev/null`
+ local port=`uci get nastools.@nastools[0].http_port 2>/dev/null`
+ local auto_update=`uci get nastools.@nastools[0].auto_upgrade 2>/dev/null`
+
+ if [ -z "$config" ]; then
+ echo "config path is empty!"
+ exit 1
+ fi
+
+ [ -z "$port" ] && port=3003
+
+ local cmd="docker run --restart=unless-stopped -d \
+ --hostname nastools \
+ -v \"$config:/config\" \
+ --dns=172.17.0.1 \
+ -p $port:3000 \
+ -e UMASK=000"
+
+ local tz="`cat /tmp/TZ`"
+ [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
+
+ if [ -n "$auto_update" ]; then
+ if [ "$auto_update" = 1 ]; then
+ cmd="$cmd -e NASTOOL_AUTO_UPDATE=true"
+ else
+ cmd="$cmd -e NASTOOL_AUTO_UPDATE=false"
+ fi
+ fi
+
+ cmd="$cmd --name nastools \"$IMAGE_NAME\""
+
+ echo "$cmd"
+ eval "$cmd"
+
+}
+
+usage() {
+ echo "usage: $0 sub-command"
+ echo "where sub-command is one of:"
+ echo " install Install the nastools"
+ echo " upgrade Upgrade the nastools"
+ echo " rm/start/stop/restart Remove/Start/Stop/Restart the nastools"
+ echo " status NasTools status"
+ echo " port NasTools port"
+}
+
+case ${ACTION} in
+ "install")
+ do_install
+ ;;
+ "upgrade")
+ do_install
+ ;;
+ "rm")
+ docker rm -f nastools
+ ;;
+ "start" | "stop" | "restart")
+ docker ${ACTION} nastools
+ ;;
+ "status")
+ docker ps --all -f 'name=nastools' --format '{{.State}}'
+ ;;
+ "port")
+ docker ps --all -f 'name=nastools' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+esac
diff --git a/applications/luci-app-nastools/root/usr/share/nastools/install.sh b/applications/luci-app-nastools/root/usr/share/nastools/install.sh
deleted file mode 100755
index 06b8e4c..0000000
--- a/applications/luci-app-nastools/root/usr/share/nastools/install.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-# Author Xiaobao(xiaobao@linkease.com)
-
-ACTION=${1}
-WRLOCK=/var/lock/nastools.lock
-LOGFILE=/var/log/nastools.log
-LOGEND="XU6J03M6"
-shift 1
-
-IMAGE_NAME='jxxghp/nas-tools'
-
-check_params() {
-
- if [ -z "${WRLOCK}" ]; then
- echo "lock file not found"
- exit 1
- fi
-
- if [ -z "${LOGFILE}" ]; then
- echo "logger file not found"
- exit 1
- fi
-
-}
-
-lock_run() {
- local lock="$WRLOCK"
- exec 300>$lock
- flock -n 300 || return
- do_run
- flock -u 300
- return
-}
-
-run_action() {
- if check_params; then
- lock_run
- fi
-}
-
-do_install() {
- local CONFIG_PATH=`uci get nastools.@nastools[0].config_path 2>/dev/null`
- local HTTP_PORT=`uci get nastools.@nastools[0].http_port 2>/dev/null`
- local AUTO_UPDATE=`uci get nastools.@nastools[0].auto_upgrade 2>/dev/null`
- if [ -z "${CONFIG_PATH}" ]; then
- echo "config path is empty!" >${LOGFILE}
- exit 1
- fi
- if [ -z "${HTTP_PORT}" ]; then
- HTTP_PORT=3003
- fi
- if [ -z "${AUTO_UPDATE}" ]; then
- AUTO_UPDATE=0
- fi
- UPDATE_BOOL=false
- if [ "${AUTO_UPDATE}" = "1" ]; then
- UPDATE_BOOL=true
- fi
- echo "docker pull ${IMAGE_NAME}" >${LOGFILE}
- docker pull ${IMAGE_NAME} >>${LOGFILE} 2>&1
- docker rm -f nastools
- local mntv="/mnt:/mnt"
- mountpoint -q /mnt && mntv="$mntv:rslave"
- docker run -d \
- --name=nastools \
- --dns=172.17.0.1 \
- --hostname nastools \
- -p ${HTTP_PORT}:3000 \
- -v ${CONFIG_PATH}:/config -v ${mntv} \
- -e UMASK=000 \
- -e NASTOOL_AUTO_UPDATE=${UPDATE_BOOL} \
- --restart unless-stopped \
- $IMAGE_NAME >>${LOGFILE} 2>&1
-
- RET=$?
- if [ "${RET}" = "0" ]; then
- # mark END, remove the log file
- echo ${LOGEND} >> ${LOGFILE}
- sleep 5
- rm -f ${LOGFILE}
- else
- # reserve the log
- echo "docker run ${IMAGE_NAME} failed" >>${LOGFILE}
- echo ${LOGEND} >> ${LOGFILE}
- fi
- exit ${RET}
-}
-
-# run in lock
-do_run() {
- case ${ACTION} in
- "install")
- do_install
- ;;
- "upgrade")
- do_install
- ;;
- esac
-}
-
-usage() {
- echo "usage: wxedge sub-command"
- echo "where sub-command is one of:"
- echo " install Install the nastools"
- echo " upgrade Upgrade the nastools"
- echo " remove Remove the nastools"
-}
-
-case ${ACTION} in
- "install")
- run_action
- ;;
- "upgrade")
- run_action
- ;;
- "remove")
- docker rm -f nastools
- ;;
- *)
- usage
- ;;
-esac
-