From c94a7b66e4e3e84743c8077a6790d80710365578 Mon Sep 17 00:00:00 2001
From: janson <janson@gmail.com>
Date: Thu, 10 Nov 2022 16:26:38 +0800
Subject: [PATCH] better for nastools

---
 .../root/etc/config/jellyfin                  |  2 +-
 applications/luci-app-nastools/Makefile       |  2 +-
 .../luasrc/model/cbi/nastools.lua             | 10 ++++
 .../luasrc/model/nastools.lua                 | 54 +++++++++++++++++++
 .../root/etc/config/nastools                  |  2 +-
 5 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 applications/luci-app-nastools/luasrc/model/nastools.lua

diff --git a/applications/luci-app-jellyfin/root/etc/config/jellyfin b/applications/luci-app-jellyfin/root/etc/config/jellyfin
index fb3c345..daff1db 100644
--- a/applications/luci-app-jellyfin/root/etc/config/jellyfin
+++ b/applications/luci-app-jellyfin/root/etc/config/jellyfin
@@ -3,5 +3,5 @@ config jellyfin
 	option 'port' '8096'
 	option 'image' 'default'
 	option 'media_path' ''
-	option 'config_path' '/root/Config/Jellyfin'
+	option 'config_path' ''
 	option 'cache_path' ''
diff --git a/applications/luci-app-nastools/Makefile b/applications/luci-app-nastools/Makefile
index 282fb4c..b3c3d74 100644
--- a/applications/luci-app-nastools/Makefile
+++ b/applications/luci-app-nastools/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.1.1-20221012
+PKG_VERSION:=1.1.1-20221110
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for nastools
diff --git a/applications/luci-app-nastools/luasrc/model/cbi/nastools.lua b/applications/luci-app-nastools/luasrc/model/cbi/nastools.lua
index f8c791e..c8e88da 100644
--- a/applications/luci-app-nastools/luasrc/model/cbi/nastools.lua
+++ b/applications/luci-app-nastools/luasrc/model/cbi/nastools.lua
@@ -3,6 +3,7 @@ LuCI - Lua Configuration Interface
 ]]--
 
 local taskd = require "luci.model.tasks"
+local nastools_model = require "luci.model.nastools"
 local m, s, o
 
 m = taskd.docker_map("nastools", "nastools", "/usr/libexec/istorec/nastools.sh",
@@ -22,10 +23,19 @@ o.rmempty = false
 o.default = "3003"
 o.datatype = "port"
 
+local blocks = nastools_model.blocks()
+local home = nastools_model.home()
+
 o = s:option(Value, "config_path", translate("Config path").."<b>*</b>")
 o.rmempty = false
 o.datatype = "string"
 
+local paths, default_path = nastools_model.find_paths(blocks, home, "Configs")
+for _, val in pairs(paths) do
+  o:value(val, val)
+end
+o.default = default_path
+
 o = s:option(Flag, "auto_upgrade", translate("Auto update"))
 o.default = 1
 o.rmempty = false
diff --git a/applications/luci-app-nastools/luasrc/model/nastools.lua b/applications/luci-app-nastools/luasrc/model/nastools.lua
new file mode 100644
index 0000000..310060d
--- /dev/null
+++ b/applications/luci-app-nastools/luasrc/model/nastools.lua
@@ -0,0 +1,54 @@
+local util  = require "luci.util"
+local jsonc = require "luci.jsonc"
+
+local nastools = {}
+
+nastools.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
+
+nastools.home = function()
+  local uci = require "luci.model.uci".cursor()
+  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
+
+nastools.find_paths = function(blocks, home_dirs, path_name)
+  local default_path = ''
+  local configs = {}
+
+  default_path = home_dirs[path_name] .. "/NasTools"
+  if #blocks == 0 then
+    table.insert(configs, default_path)
+  else
+    for _, val in pairs(blocks) do 
+      table.insert(configs, val .. "/" .. path_name .. "/NasTools")
+    end
+    local without_conf_dir = "/root/" .. path_name .. "/NasTools"
+    if default_path == without_conf_dir then
+      default_path = configs[1]
+    end
+  end
+
+  return configs, default_path
+end
+
+return nastools
diff --git a/applications/luci-app-nastools/root/etc/config/nastools b/applications/luci-app-nastools/root/etc/config/nastools
index 4621b34..5e8c5e1 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' '/root/nastools/config'
+	option 'config_path' ''
 	option 'http_port' '3003'
 	option 'auto_upgrade' '0'