From ecc05ae671eb52928c721e46855ee481f23aa760 Mon Sep 17 00:00:00 2001
From: janson <janson@gmail.com>
Date: Sun, 6 Nov 2022 17:48:46 +0800
Subject: [PATCH 1/3] add luci-app-plex

---
 applications/luci-app-plex/Makefile           |  18 ++++
 .../luci-app-plex/luasrc/controller/plex.lua  |   7 ++
 .../luci-app-plex/luasrc/model/cbi/plex.lua   |  44 ++++++++
 .../luci-app-plex/luasrc/model/plex.lua       |  23 ++++
 .../luci-app-plex/luasrc/view/plex/status.htm |  31 ++++++
 applications/luci-app-plex/po/zh-cn/plex.po   |  41 +++++++
 .../luci-app-plex/root/etc/config/plex        |   4 +
 .../root/usr/libexec/istorec/plex.sh          | 101 ++++++++++++++++++
 8 files changed, 269 insertions(+)
 create mode 100644 applications/luci-app-plex/Makefile
 create mode 100755 applications/luci-app-plex/luasrc/controller/plex.lua
 create mode 100644 applications/luci-app-plex/luasrc/model/cbi/plex.lua
 create mode 100644 applications/luci-app-plex/luasrc/model/plex.lua
 create mode 100644 applications/luci-app-plex/luasrc/view/plex/status.htm
 create mode 100644 applications/luci-app-plex/po/zh-cn/plex.po
 create mode 100644 applications/luci-app-plex/root/etc/config/plex
 create mode 100755 applications/luci-app-plex/root/usr/libexec/istorec/plex.sh

diff --git a/applications/luci-app-plex/Makefile b/applications/luci-app-plex/Makefile
new file mode 100644
index 0000000..851ae7c
--- /dev/null
+++ b/applications/luci-app-plex/Makefile
@@ -0,0 +1,18 @@
+
+
+include $(TOPDIR)/rules.mk
+
+PKG_VERSION:=1.0.0-20221106
+PKG_RELEASE:=
+
+LUCI_TITLE:=LuCI support for Plex
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+docker +luci-lib-taskd
+
+define Package/luci-app-plex/conffiles
+/etc/config/plex
+endef
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-plex/luasrc/controller/plex.lua b/applications/luci-app-plex/luasrc/controller/plex.lua
new file mode 100755
index 0000000..23a6e6a
--- /dev/null
+++ b/applications/luci-app-plex/luasrc/controller/plex.lua
@@ -0,0 +1,7 @@
+
+module("luci.controller.heimdall", package.seeall)
+
+function index()
+  entry({"admin", "services", "heimdall"}, alias("admin", "services", "heimdall", "config"), _("Heimdall"), 30).dependent = true
+  entry({"admin", "services", "heimdall", "config"}, cbi("heimdall"))
+end
diff --git a/applications/luci-app-plex/luasrc/model/cbi/plex.lua b/applications/luci-app-plex/luasrc/model/cbi/plex.lua
new file mode 100644
index 0000000..2d4ac86
--- /dev/null
+++ b/applications/luci-app-plex/luasrc/model/cbi/plex.lua
@@ -0,0 +1,44 @@
+--[[
+LuCI - Lua Configuration Interface
+]]--
+
+local taskd = require "luci.model.tasks"
+local m, s, o
+
+m = taskd.docker_map("plex", "plex", "/usr/libexec/istorec/plex.sh",
+	translate("Plex"),
+	translate("Plex is an elegant solution to organise all your web applications.")
+		.. translate("Official website:") .. ' <a href=\"https://www.plex.tv/\" target=\"_blank\">https://www.plex.tv/</a>')
+
+s = m:section(SimpleSection, translate("Service Status"), translate("Plex status:"))
+s:append(Template("plex/status"))
+
+s = m:section(TypedSection, "plex", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:"))
+s.addremove=false
+s.anonymous=true
+
+o = s:option(Flag, "hostnet", translate("Host network"), translate("Plex running in host network, for DLNA application, port is always 32400 if enabled"))
+o.default = 0
+o.rmempty = false
+
+o = s:option(Value, "claim_token", translate("Plex Claim").."<b>*</b>")
+o.rmempty = false
+o.datatype = "string"
+
+o = s:option(Value, "port", translate("Port").."<b>*</b>")
+o.rmempty = false
+o.default = "32400"
+o.datatype = "port"
+o:depends("hostnet", 0)
+
+o = s:option(Value, "config_path", translate("Config path").."<b>*</b>")
+o.rmempty = false
+o.datatype = "string"
+
+o = s:option(Value, "media_path", translate("Media path"))
+o.datatype = "string"
+
+o = s:option(Value, "cache_path", translate("Transcode cache path"), translate("Default use 'transcodes' in 'config path' if not set, please make sure there has enough space"))
+o.datatype = "string"
+
+return m
diff --git a/applications/luci-app-plex/luasrc/model/plex.lua b/applications/luci-app-plex/luasrc/model/plex.lua
new file mode 100644
index 0000000..80335bc
--- /dev/null
+++ b/applications/luci-app-plex/luasrc/model/plex.lua
@@ -0,0 +1,23 @@
+local util  = require "luci.util"
+local jsonc = require "luci.jsonc"
+
+local plex_model = {}
+
+plex_model.blocks = function()
+  local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r")
+  local vals = {}
+  if f then
+    local ret = f:read("*all")
+    f:close()
+    local obj = jsonc.parse(ret)
+    for _, val in pairs(obj["blockdevices"]) do
+      local fsize = val["fssize"]
+      if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then
+        -- fsize > 1G
+        vals[#vals+1] = val["mountpoint"]
+      end
+    end
+  end
+  return vals
+end
+
diff --git a/applications/luci-app-plex/luasrc/view/plex/status.htm b/applications/luci-app-plex/luasrc/view/plex/status.htm
new file mode 100644
index 0000000..b5afa1b
--- /dev/null
+++ b/applications/luci-app-plex/luasrc/view/plex/status.htm
@@ -0,0 +1,31 @@
+<%
+local util  = require "luci.util"
+local container_status = util.trim(util.exec("/usr/libexec/istorec/plex.sh status"))
+local container_install = (string.len(container_status) > 0)
+local container_running = container_status == "running"
+-%>
+<div class="cbi-value">
+    <label class="cbi-value-title"><%:Status%></label>
+    <div class="cbi-value-field">
+        <% if container_running then %>
+        <button class="cbi-button cbi-button-success" disabled="true"><%:Plex is running%></button>
+        <% else %>
+        <button class="cbi-button cbi-button-negative" disabled="true"><%:Plex is not running%></button>
+        <% end %>
+    </div>
+</div>
+<%
+if container_running then
+    local port=util.trim(util.exec("/usr/libexec/istorec/plex.sh port"))
+    if port == "" then
+        port="32400"
+    end
+-%>
+<div class="cbi-value cbi-value-last">
+    <label class="cbi-value-title">&nbsp;</label>
+    <div class="cbi-value-field">
+
+    <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Plex%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
+    </div>
+</div>
+<% end %>
diff --git a/applications/luci-app-plex/po/zh-cn/plex.po b/applications/luci-app-plex/po/zh-cn/plex.po
new file mode 100644
index 0000000..ccd5049
--- /dev/null
+++ b/applications/luci-app-plex/po/zh-cn/plex.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Official website:"
+msgstr "官方网站："
+
+msgid "Plex is an streaming media service and a client–server media player platform, made by Plex, Inc."
+msgstr "Plex 是一个多媒体串流平台。"
+
+msgid "Config path"
+msgstr "配置文件路径"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "HTTP Port"
+msgstr "HTTP 端口"
+
+msgid "Service Status"
+msgstr "服务状态"
+
+msgid "Plex status:"
+msgstr "Plex 的状态信息如下："
+
+msgid "Setup"
+msgstr "安装配置"
+
+msgid "The following parameters will only take effect during installation or upgrade:"
+msgstr "以下参数只在安装或者升级时才会生效："
+
+msgid "Status"
+msgstr "状态"
+
+msgid "Plex is running"
+msgstr "Plex 运行中"
+
+msgid "Plex is not running"
+msgstr "Plex 未运行"
+
+msgid "Open Plex"
+msgstr "打开 Plex"
diff --git a/applications/luci-app-plex/root/etc/config/plex b/applications/luci-app-plex/root/etc/config/plex
new file mode 100644
index 0000000..554dbd2
--- /dev/null
+++ b/applications/luci-app-plex/root/etc/config/plex
@@ -0,0 +1,4 @@
+config heimdall
+	option 'http_port' '8088'
+	option 'https_port' '8089'
+	option 'config_path' '/root/heimdall/config'
diff --git a/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh b/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
new file mode 100755
index 0000000..07c53b5
--- /dev/null
+++ b/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
@@ -0,0 +1,101 @@
+#!/bin/sh
+# Author Xiaobao(xiaobao@linkease.com)
+
+ACTION=${1}
+shift 1
+
+do_install() {
+  local hostnet=`uci get plex.@plex[0].hostnet 2>/dev/null`
+  local claim_token==`uci get plex.@plex[0].claim_token 2>/dev/null`
+  local port=`uci get plex.@plex[0].port 2>/dev/null`
+  local image_name=`uci get plex.@plex[0].image_name 2>/dev/null`
+  local config=`uci get plex.@plex[0].config_path 2>/dev/null`
+  local media=`uci get plex.@plex[0].media_path 2>/dev/null`
+  local cache=`uci get plex.@plex[0].cache_path 2>/dev/null`
+
+  [-z "$image_name" ] && image_name="plexinc/pms-docker:latest"
+  echo "docker pull ${image_name}"
+  docker pull ${image_name}
+  docker rm -f plex
+
+  if [ -z "$config" ]; then
+      echo "config path is empty!"
+      exit 1
+  fi
+
+  [ -z "$port" ] && port=32400
+
+  local cmd="docker run --restart=unless-stopped -d -e PLEX_CLAIM="$claim_token" -v \"$config:/config\" "
+
+  if [ -d /dev/dri ]; then
+    cmd="$cmd\
+    --device /dev/dri:/dev/dri \
+    --privileged "
+  fi
+
+  if [ "$hostnet" = 1 ]; then
+    cmd="$cmd\
+    --dns=127.0.0.1 \
+    --network=host "
+  else
+    cmd="$cmd\
+    --dns=172.17.0.1 \
+    -p 3005:3005/tcp \
+    -p 8324:8324/tcp \
+    -p 32469:32469/tcp \
+    -p 1900:1900/udp \
+    -p 32410:32410/udp \
+    -p 32412:32412/udp \
+    -p 32413:32413/udp \
+    -p 32414:32414/udp \
+    -p $port:32400 "
+  fi
+
+  local tz="`cat /tmp/TZ`"
+  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
+
+  [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\""
+  [ -z "$media" ] || cmd="$cmd -v \"$media:/media\""
+
+  cmd="$cmd -v /mnt:/mnt"
+  mountpoint -q /mnt && cmd="$cmd:rslave"
+  cmd="$cmd --name plex \"$IMAGE_NAME\""
+
+  echo "$cmd"
+  eval "$cmd"
+}
+
+usage() {
+  echo "usage: $0 sub-command"
+  echo "where sub-command is one of:"
+  echo "      install                Install the plex"
+  echo "      upgrade                Upgrade the plex"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart the plex"
+  echo "      status                 Heimdall status"
+  echo "      port                   Heimdall port"
+}
+
+case ${ACTION} in
+  "install")
+    do_install
+  ;;
+  "upgrade")
+    do_install
+  ;;
+  "rm")
+    docker rm -f plex
+  ;;
+  "start" | "stop" | "restart")
+    docker ${ACTION} plex
+  ;;
+  "status")
+    docker ps --all -f 'name=plex' --format '{{.State}}'
+  ;;
+  "port")
+    docker ps --all -f 'name=plex' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+  ;;
+  *)
+    usage
+    exit 1
+  ;;
+esac

From b536df07a2ba7d860feec2ca2ce8cf949e917982 Mon Sep 17 00:00:00 2001
From: janson <janson@gmail.com>
Date: Mon, 7 Nov 2022 11:06:12 +0800
Subject: [PATCH 2/3] plex implement ok

---
 .../luci-app-plex/luasrc/controller/plex.lua  |  6 ++--
 .../luci-app-plex/luasrc/model/cbi/plex.lua   | 23 ++++++++++++
 .../luci-app-plex/luasrc/model/plex.lua       | 35 +++++++++++++++++--
 .../luci-app-plex/root/etc/config/plex        | 11 +++---
 .../root/usr/libexec/istorec/plex.sh          |  2 +-
 applications/luci-app-plex/simple-install.sh  | 16 +++++++++
 6 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100755 applications/luci-app-plex/simple-install.sh

diff --git a/applications/luci-app-plex/luasrc/controller/plex.lua b/applications/luci-app-plex/luasrc/controller/plex.lua
index 23a6e6a..0eea159 100755
--- a/applications/luci-app-plex/luasrc/controller/plex.lua
+++ b/applications/luci-app-plex/luasrc/controller/plex.lua
@@ -1,7 +1,7 @@
 
-module("luci.controller.heimdall", package.seeall)
+module("luci.controller.plex", package.seeall)
 
 function index()
-  entry({"admin", "services", "heimdall"}, alias("admin", "services", "heimdall", "config"), _("Heimdall"), 30).dependent = true
-  entry({"admin", "services", "heimdall", "config"}, cbi("heimdall"))
+  entry({"admin", "services", "plex"}, alias("admin", "services", "plex", "config"), _("Plex"), 30).dependent = true
+  entry({"admin", "services", "plex", "config"}, cbi("plex"))
 end
diff --git a/applications/luci-app-plex/luasrc/model/cbi/plex.lua b/applications/luci-app-plex/luasrc/model/cbi/plex.lua
index 2d4ac86..a1146f9 100644
--- a/applications/luci-app-plex/luasrc/model/cbi/plex.lua
+++ b/applications/luci-app-plex/luasrc/model/cbi/plex.lua
@@ -3,6 +3,7 @@ LuCI - Lua Configuration Interface
 ]]--
 
 local taskd = require "luci.model.tasks"
+local plex_model = require "luci.model.plex"
 local m, s, o
 
 m = taskd.docker_map("plex", "plex", "/usr/libexec/istorec/plex.sh",
@@ -31,14 +32,36 @@ o.default = "32400"
 o.datatype = "port"
 o:depends("hostnet", 0)
 
+o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
+o.rmempty = false
+o.datatype = "string"
+o:value("plexinc/pms-docker:latest", "plexinc/pms-docker:latest")
+o:value("plexinc/pms-docker:1.29.1.6316-f4cdfea9c", "plexinc/pms-docker:1.29.1.6316-f4cdfea9c")
+o.default = "plexinc/pms-docker:latest"
+
+local blocks = plex_model.blocks()
+local home = plex_model.home()
+
 o = s:option(Value, "config_path", translate("Config path").."<b>*</b>")
 o.rmempty = false
 o.datatype = "string"
 
+local paths, default_path = plex_model.find_paths(blocks, home, "config")
+for _, val in pairs(paths) do
+  o:value(val, val)
+end
+o.default = default_path
+
 o = s:option(Value, "media_path", translate("Media path"))
 o.datatype = "string"
+o.default = plex_model.media_path(home)
 
 o = s:option(Value, "cache_path", translate("Transcode cache path"), translate("Default use 'transcodes' in 'config path' if not set, please make sure there has enough space"))
 o.datatype = "string"
+local paths, default_path = plex_model.find_paths(blocks, home, "transcodes")
+for _, val in pairs(paths) do
+  o:value(val, val)
+end
+o.default = default_path
 
 return m
diff --git a/applications/luci-app-plex/luasrc/model/plex.lua b/applications/luci-app-plex/luasrc/model/plex.lua
index 80335bc..b6fcafb 100644
--- a/applications/luci-app-plex/luasrc/model/plex.lua
+++ b/applications/luci-app-plex/luasrc/model/plex.lua
@@ -1,9 +1,9 @@
 local util  = require "luci.util"
 local jsonc = require "luci.jsonc"
 
-local plex_model = {}
+local plex = {}
 
-plex_model.blocks = function()
+plex.blocks = function()
   local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r")
   local vals = {}
   if f then
@@ -21,3 +21,34 @@ plex_model.blocks = function()
   return vals
 end
 
+plex.home = function()
+  local uci = require "luci.model.uci".cursor()
+  local data = uci:get_first("linkease", "linkease", "local_home", "/root")
+  return data
+end
+
+plex.find_paths = function(blocks, home, path_name)
+  local default_path = ''
+  local configs = {}
+  if #blocks == 0 then
+    default_path = home .. "/Programs/plex/" .. path_name
+    table.insert(configs, default_path)
+  else
+    for _, val in pairs(blocks) do 
+      table.insert(configs, val .. "/Programs/plex/" .. path_name)
+    end
+    default_path = configs[1]
+  end
+
+  return configs, default_path
+end
+
+plex.media_path = function(home)
+  if home == "/root" then
+    return ""
+  else
+    return home .. "/Downloads"
+  end
+end
+
+return plex
diff --git a/applications/luci-app-plex/root/etc/config/plex b/applications/luci-app-plex/root/etc/config/plex
index 554dbd2..73ff9c4 100644
--- a/applications/luci-app-plex/root/etc/config/plex
+++ b/applications/luci-app-plex/root/etc/config/plex
@@ -1,4 +1,7 @@
-config heimdall
-	option 'http_port' '8088'
-	option 'https_port' '8089'
-	option 'config_path' '/root/heimdall/config'
+config plex
+	option 'hostnet' '0'
+	option 'claim_token' ''
+	option 'port' '32400'
+	option 'image_name' 'plexinc/pms-docker:latest'
+	option 'config_path' ''
+
diff --git a/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh b/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
index 07c53b5..cecc31e 100755
--- a/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
+++ b/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
@@ -13,7 +13,7 @@ do_install() {
   local media=`uci get plex.@plex[0].media_path 2>/dev/null`
   local cache=`uci get plex.@plex[0].cache_path 2>/dev/null`
 
-  [-z "$image_name" ] && image_name="plexinc/pms-docker:latest"
+  [ -z "$image_name" ] && image_name="plexinc/pms-docker:latest"
   echo "docker pull ${image_name}"
   docker pull ${image_name}
   docker rm -f plex
diff --git a/applications/luci-app-plex/simple-install.sh b/applications/luci-app-plex/simple-install.sh
new file mode 100755
index 0000000..b0eb224
--- /dev/null
+++ b/applications/luci-app-plex/simple-install.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# run in router
+APPNAME=$1
+
+if [ -z "${APPNAME}" ]; then
+  APPNAME=plex
+fi
+
+mkdir -p /usr/lib/lua/luci/view/${APPNAME}
+cp ./luasrc/controller/${APPNAME}.lua /usr/lib/lua/luci/controller/
+cp ./luasrc/view/${APPNAME}/* /usr/lib/lua/luci/view/${APPNAME}/
+cp -rf ./luasrc/model/* /usr/lib/lua/luci/model/
+cp -rf ./root/* /
+rm -rf /tmp/luci-*
+

From 1f377cf0b7f6991560535d0a1bc3763b226faad5 Mon Sep 17 00:00:00 2001
From: janson <janson@gmail.com>
Date: Wed, 9 Nov 2022 09:06:31 +0800
Subject: [PATCH 3/3] plex implements

---
 .../luci-app-plex/luasrc/model/cbi/plex.lua   | 10 +++---
 .../luci-app-plex/luasrc/model/plex.lua       | 28 ++++++++--------
 .../luci-app-plex/root/etc/config/plex        |  2 +-
 .../root/usr/libexec/istorec/plex.sh          | 32 ++++++++++---------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/applications/luci-app-plex/luasrc/model/cbi/plex.lua b/applications/luci-app-plex/luasrc/model/cbi/plex.lua
index a1146f9..de78cee 100644
--- a/applications/luci-app-plex/luasrc/model/cbi/plex.lua
+++ b/applications/luci-app-plex/luasrc/model/cbi/plex.lua
@@ -14,7 +14,7 @@ m = taskd.docker_map("plex", "plex", "/usr/libexec/istorec/plex.sh",
 s = m:section(SimpleSection, translate("Service Status"), translate("Plex status:"))
 s:append(Template("plex/status"))
 
-s = m:section(TypedSection, "plex", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:"))
+s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:"))
 s.addremove=false
 s.anonymous=true
 
@@ -22,8 +22,7 @@ o = s:option(Flag, "hostnet", translate("Host network"), translate("Plex running
 o.default = 0
 o.rmempty = false
 
-o = s:option(Value, "claim_token", translate("Plex Claim").."<b>*</b>")
-o.rmempty = false
+o = s:option(Value, "claim_token", translate("Plex Claim"))
 o.datatype = "string"
 
 o = s:option(Value, "port", translate("Port").."<b>*</b>")
@@ -46,7 +45,7 @@ o = s:option(Value, "config_path", translate("Config path").."<b>*</b>")
 o.rmempty = false
 o.datatype = "string"
 
-local paths, default_path = plex_model.find_paths(blocks, home, "config")
+local paths, default_path = plex_model.find_paths(blocks, home, "Configs")
 for _, val in pairs(paths) do
   o:value(val, val)
 end
@@ -54,11 +53,10 @@ o.default = default_path
 
 o = s:option(Value, "media_path", translate("Media path"))
 o.datatype = "string"
-o.default = plex_model.media_path(home)
 
 o = s:option(Value, "cache_path", translate("Transcode cache path"), translate("Default use 'transcodes' in 'config path' if not set, please make sure there has enough space"))
 o.datatype = "string"
-local paths, default_path = plex_model.find_paths(blocks, home, "transcodes")
+local paths, default_path = plex_model.find_paths(blocks, home, "Caches")
 for _, val in pairs(paths) do
   o:value(val, val)
 end
diff --git a/applications/luci-app-plex/luasrc/model/plex.lua b/applications/luci-app-plex/luasrc/model/plex.lua
index b6fcafb..b693b68 100644
--- a/applications/luci-app-plex/luasrc/model/plex.lua
+++ b/applications/luci-app-plex/luasrc/model/plex.lua
@@ -23,32 +23,32 @@ end
 
 plex.home = function()
   local uci = require "luci.model.uci".cursor()
-  local data = uci:get_first("linkease", "linkease", "local_home", "/root")
-  return data
+  local home_dirs = {}
+  home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root")
+  home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs")
+  home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["main_dir"].."/Downloads")
+  home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches")
+  return home_dirs
 end
 
-plex.find_paths = function(blocks, home, path_name)
+plex.find_paths = function(blocks, home_dirs, path_name)
   local default_path = ''
   local configs = {}
+
+  default_path = home_dirs[path_name] .. "/Plex"
   if #blocks == 0 then
-    default_path = home .. "/Programs/plex/" .. path_name
     table.insert(configs, default_path)
   else
     for _, val in pairs(blocks) do 
-      table.insert(configs, val .. "/Programs/plex/" .. path_name)
+      table.insert(configs, val .. "/" .. path_name .. "/Plex")
+    end
+    local without_conf_dir = "/root/" .. path_name .. "/Plex"
+    if default_path == without_conf_dir then
+      default_path = configs[1]
     end
-    default_path = configs[1]
   end
 
   return configs, default_path
 end
 
-plex.media_path = function(home)
-  if home == "/root" then
-    return ""
-  else
-    return home .. "/Downloads"
-  end
-end
-
 return plex
diff --git a/applications/luci-app-plex/root/etc/config/plex b/applications/luci-app-plex/root/etc/config/plex
index 73ff9c4..80deba1 100644
--- a/applications/luci-app-plex/root/etc/config/plex
+++ b/applications/luci-app-plex/root/etc/config/plex
@@ -1,4 +1,4 @@
-config plex
+config main
 	option 'hostnet' '0'
 	option 'claim_token' ''
 	option 'port' '32400'
diff --git a/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh b/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
index cecc31e..3ea0866 100755
--- a/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
+++ b/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh
@@ -5,13 +5,13 @@ ACTION=${1}
 shift 1
 
 do_install() {
-  local hostnet=`uci get plex.@plex[0].hostnet 2>/dev/null`
-  local claim_token==`uci get plex.@plex[0].claim_token 2>/dev/null`
-  local port=`uci get plex.@plex[0].port 2>/dev/null`
-  local image_name=`uci get plex.@plex[0].image_name 2>/dev/null`
-  local config=`uci get plex.@plex[0].config_path 2>/dev/null`
-  local media=`uci get plex.@plex[0].media_path 2>/dev/null`
-  local cache=`uci get plex.@plex[0].cache_path 2>/dev/null`
+  local hostnet=`uci get plex.@main[0].hostnet 2>/dev/null`
+  local claim_token==`uci get plex.@main[0].claim_token 2>/dev/null`
+  local port=`uci get plex.@main[0].port 2>/dev/null`
+  local image_name=`uci get plex.@main[0].image_name 2>/dev/null`
+  local config=`uci get plex.@main[0].config_path 2>/dev/null`
+  local media=`uci get plex.@main[0].media_path 2>/dev/null`
+  local cache=`uci get plex.@main[0].cache_path 2>/dev/null`
 
   [ -z "$image_name" ] && image_name="plexinc/pms-docker:latest"
   echo "docker pull ${image_name}"
@@ -25,7 +25,7 @@ do_install() {
 
   [ -z "$port" ] && port=32400
 
-  local cmd="docker run --restart=unless-stopped -d -e PLEX_CLAIM="$claim_token" -v \"$config:/config\" "
+  local cmd="docker run --restart=unless-stopped -d -h PlexServer -v \"$config:/config\" "
 
   if [ -d /dev/dri ]; then
     cmd="$cmd\
@@ -43,7 +43,6 @@ do_install() {
     -p 3005:3005/tcp \
     -p 8324:8324/tcp \
     -p 32469:32469/tcp \
-    -p 1900:1900/udp \
     -p 32410:32410/udp \
     -p 32412:32412/udp \
     -p 32413:32413/udp \
@@ -54,12 +53,14 @@ do_install() {
   local tz="`cat /tmp/TZ`"
   [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
 
-  [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\""
-  [ -z "$media" ] || cmd="$cmd -v \"$media:/media\""
+  [ -z "$claim_token" ] || cmd="$cmd -e \"PLEX_CLAIM=$claim_token\""
+
+  [ -z "$cache" ] || cmd="$cmd -v \"$cache:/transcode\""
+  [ -z "$media" ] || cmd="$cmd -v \"$media:/data\""
 
   cmd="$cmd -v /mnt:/mnt"
   mountpoint -q /mnt && cmd="$cmd:rslave"
-  cmd="$cmd --name plex \"$IMAGE_NAME\""
+  cmd="$cmd --name plex \"$image_name\""
 
   echo "$cmd"
   eval "$cmd"
@@ -71,8 +72,8 @@ usage() {
   echo "      install                Install the plex"
   echo "      upgrade                Upgrade the plex"
   echo "      rm/start/stop/restart  Remove/Start/Stop/Restart the plex"
-  echo "      status                 Heimdall status"
-  echo "      port                   Heimdall port"
+  echo "      status                 Plex status"
+  echo "      port                   Plex port"
 }
 
 case ${ACTION} in
@@ -92,7 +93,8 @@ case ${ACTION} in
     docker ps --all -f 'name=plex' --format '{{.State}}'
   ;;
   "port")
-    docker ps --all -f 'name=plex' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+    local port=`uci get plex.@main[0].port 2>/dev/null`
+    echo $port
   ;;
   *)
     usage