ffho-config-mode-site-select: rewrite to support config-files in json-format

ffho/ffho-config-mode-site-select/files/lib/gluon/config-mode/wizard/0200-site-select.lua

@@ -1,40 +1,55 @@
 local cbi = require "luci.cbi"
 local i18n = require "luci.i18n"
 local uci = luci.model.uci.cursor()
-local site = require 'gluon.site_config'
-local config = require 'gluon.sites'
+local default = require 'gluon.site_config'
+local json =  require 'luci.json'
 
 local M = {}
 
+function get_config(file)
+  local f = io.open(file)
+  if f then
+    local config = json.decode(f:read('*a'))
+    f:close()
+    return config
+  end
+  return nil
+end
+
+
 function M.section(form)
-	local msg = i18n.translate('gluon-config-mode:site-select')
-	local s = form:section(cbi.SimpleSection, nil, msg)
-
-	local o = s:option(cbi.ListValue, "community", i18n.translate("Region"))
-	o.rmempty = false
-	o.optional = false
-
-	if uci:get_first("gluon-setup-mode", "setup_mode", "configured") == "0" then
-		o:value("")
-	else
-		o:value(site.site_code, site.site_name)
-	end
-
-	for index, tmp in pairs(config) do
-		if tmp.site_select == nil or tmp.site_select.hidden ~= 1 then
-			o:value(tmp.site_code, tmp.site_name)
-		end
-	end
+  local sites = get_config('/lib/gluon/site-select/sites.json')
+
+  local msg = i18n.translate('gluon-config-mode:site-select')
+  local s = form:section(cbi.SimpleSection, nil, msg)
+
+  local o = s:option(cbi.ListValue, "community", i18n.translate("Region"))
+  o.rmempty = false
+  o.optional = false
+
+  if uci:get_first("gluon-setup-mode", "setup_mode", "configured") == "0" then
+    o:value("")
+  else
+    o:value(default.site_code, default.site_name)
+  end
+
+  for _, site in pairs(sites) do
+    if site.site_select == nil or site.site_select.hidden ~= 1 then
+      o:value(site.site_code, site.site_name)
+    end
+  end
 end
 
 function M.handle(data)
-	if data.community ~= uci:get('currentsite', 'current', 'name') then
-		uci:set('currentsite', 'current', 'name', data.community)
-		uci:save('currentsite')
-		uci:commit('currentsite')
-
-		os.execute('sh "/lib/gluon/site-select/site-upgrade"')
-	end
+  if data.community ~= uci:get('currentsite', 'current', 'name') then
+    uci:set('currentsite', 'current', 'name', data.community)
+    uci:save('currentsite')
+    uci:commit('currentsite')
+  end
+
+  if data.community ~= default.site_code then
+    os.execute('sh "/lib/gluon/site-select/site-upgrade"')
+  end
 end
 
 return M