|
|
@ -17,7 +17,6 @@ end
|
|
|
|
|
|
|
|
|
|
|
|
function Configurable:hash(sep)
|
|
|
|
function Configurable:hash(sep)
|
|
|
|
local hash = ""
|
|
|
|
local hash = ""
|
|
|
|
local excluded = {multi_threads = true,}
|
|
|
|
|
|
|
|
for key,value in pairs(self) do
|
|
|
|
for key,value in pairs(self) do
|
|
|
|
if type(value) == "number" or type(value) == "string" then
|
|
|
|
if type(value) == "number" or type(value) == "string" then
|
|
|
|
hash = hash..sep..value
|
|
|
|
hash = hash..sep..value
|
|
|
@ -31,13 +30,13 @@ function Configurable:loadDefaults(config_options)
|
|
|
|
self:reset()
|
|
|
|
self:reset()
|
|
|
|
for i=1,#config_options do
|
|
|
|
for i=1,#config_options do
|
|
|
|
local options = config_options[i].options
|
|
|
|
local options = config_options[i].options
|
|
|
|
for j=1,#config_options[i].options do
|
|
|
|
for j=1,#options do
|
|
|
|
local key = config_options[i].options[j].name
|
|
|
|
local key = options[j].name
|
|
|
|
local settings_key = config_options.prefix.."_"..key
|
|
|
|
local settings_key = config_options.prefix.."_"..key
|
|
|
|
local default = G_reader_settings:readSetting(settings_key)
|
|
|
|
local default = G_reader_settings:readSetting(settings_key)
|
|
|
|
self[key] = default or config_options[i].options[j].default_value
|
|
|
|
self[key] = default or options[j].default_value
|
|
|
|
if not self[key] then
|
|
|
|
if not self[key] then
|
|
|
|
self[key] = config_options[i].options[j].default_arg
|
|
|
|
self[key] = options[j].default_arg
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|