From dfbda76b9b46957823eef50eb5acb76740b461a0 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Sat, 11 Apr 2020 02:04:35 +0800
Subject: [PATCH] luci-app-diskman: bump to v0.2.10

---
 package/ctcgfw/luci-app-diskman/Makefile                   | 2 +-
 .../luci-app-diskman/luasrc/model/cbi/diskman/disks.lua    | 2 ++
 .../luasrc/model/cbi/diskman/partition.lua                 | 2 +-
 package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua   | 4 ++--
 .../luasrc/view/diskman/cbi/format_button.htm              | 7 +++++++
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/format_button.htm

diff --git a/package/ctcgfw/luci-app-diskman/Makefile b/package/ctcgfw/luci-app-diskman/Makefile
index 8a5870bcd7..c1ef35c2c8 100644
--- a/package/ctcgfw/luci-app-diskman/Makefile
+++ b/package/ctcgfw/luci-app-diskman/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-diskman
-PKG_VERSION:=v0.2.9
+PKG_VERSION:=v0.2.10
 PKG_RELEASE:=beta
 PKG_MAINTAINER:=lisaac <https://github.com/lisaac/luci-app-diskman>
 PKG_LICENSE:=AGPL-3.0
diff --git a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
index 068cd101da..c209df0aa6 100644
--- a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
+++ b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/disks.lua
@@ -204,6 +204,7 @@ btn_umount.write = function(self, section, value)
   end
 end
 
+if dm.command.mdadm or dm.command.btrfs then
 local creation_section = m:section(TypedSection, "_creation")
 creation_section.cfgsections=function()
   return {translate("Creation")}
@@ -321,5 +322,6 @@ if dm.command.btrfs then
     luci.http.redirect(luci.dispatcher.build_url("admin/system/diskman"))
   end
 end
+end
 
 return m
diff --git a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua
index 3ec5196257..348a617a6c 100644
--- a/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua
+++ b/package/ctcgfw/luci-app-diskman/luasrc/model/cbi/diskman/partition.lua
@@ -196,7 +196,7 @@ if not disk_info.p_table:match("Raid") then
     if disk_info.partitions[section].mount_point == "-" and disk_info.partitions[section].number ~= -1 and disk_info.partitions[section].type ~= "extended" then
       self.template = "diskman/cbi/format_button"
       self.inputstyle = "reset"
-      self.inputtitle = disk_info.partitions[section].fs:match("^%s+$") and translate("Format") or disk_info.partitions[section].fs
+      self.inputtitle = disk_info.partitions[section].fs == "raw" and translate("Format") or disk_info.partitions[section].fs
       Button.render(self, section, scope)
       -- self:reset_values()
       -- self.keylist = {}
diff --git a/package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua b/package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua
index 73fa8aa454..27698cf28d 100644
--- a/package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua
+++ b/package/ctcgfw/luci-app-diskman/luasrc/model/diskman.lua
@@ -185,7 +185,7 @@ local get_parted_info = function(device)
         partition_temp["name"] = device.."p"..partition_temp["number"]
       end
       if partition_temp["number"] > 0 and partition_temp["fs"] == "" and d.command.lsblk then
-        partition_temp["fs"] = luci.util.exec(d.command.lsblk .. " /dev/"..device.. tostring(partition_temp["number"]) .. " -no fstype")
+        partition_temp["fs"] = luci.util.exec(d.command.lsblk .. " /dev/"..device.. tostring(partition_temp["number"]) .. " -no fstype"):match("([^%s]+)") or ""
       end
       partition_temp["fs"] = partition_temp["fs"] == "" and "raw" or partition_temp["fs"]
       partition_temp["sec_start"] = partition_temp["sec_start"] and partition_temp["sec_start"]:sub(1,-2)
@@ -459,7 +459,7 @@ d.get_format_cmd = function()
     exfat = { cmd = "mkexfat", option = "-f" },
     hfsplus = { cmd = "mkhfs", option = "-f" },
     ntfs = { cmd = "mkntfs", option = "-f" },
-    swap = { cmd = "mkswap", option = "-f" },
+    swap = { cmd = "mkswap", option = "" },
     btrfs = { cmd = "mkfs.btrfs", option = "-f" }
   }
   result = {}
diff --git a/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/format_button.htm b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/format_button.htm
new file mode 100644
index 0000000000..18e306e27f
--- /dev/null
+++ b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/cbi/format_button.htm
@@ -0,0 +1,7 @@
+<%+cbi/valueheader%>
+	<% if self:cfgvalue(section) ~= false then %>
+    <input class="cbi-button cbi-button-<%=self.inputstyle or "button" %>" onclick="event.preventDefault();partition_format('<%=self.partitions[section].name%>', '<%=self.format_cmd%>', '<%=self.inputtitle%>');" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> <% if self.view_disabled then %> disabled <% end %>/>
+	<% else %>
+		-
+	<% end %>
+<%+cbi/valuefooter%>