renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: enforce luacheck in travis build

Browse Source
This commit is contained in:
Qingping Hou
2016-02-09 23:01:52 -08:00
parent b8ee33871f
commit 9bd2d42834
8 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/configurable.lua
View File

@@ -10,16 +10,15 @@ end
function Configurable:reset()
for key,value in pairs(self) do
if type(value) == "number" or type(value) == "string" then
self[key] = nil
self[key] = nil
end
end
end
function Configurable:hash(sep)
local hash = ""
local excluded = {multi_threads = true,}
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
end
end
@@ -31,13 +30,13 @@ function Configurable:loadDefaults(config_options)
self:reset()
for i=1,#config_options do
local options = config_options[i].options
for j=1,#config_options[i].options do
local key = config_options[i].options[j].name
for j=1,#options do
local key = options[j].name
local settings_key = config_options.prefix.."_"..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
self[key] = config_options[i].options[j].default_arg
self[key] = options[j].default_arg
end
end
end
@@ -49,7 +48,7 @@ function Configurable:loadSettings(settings, prefix)
or type(value) == "table" then
local saved_value = settings:readSetting(prefix..key)
self[key] = (saved_value == nil) and self[key] or saved_value
--Debug("Configurable:loadSettings", "key", key, "saved value",
--Debug("Configurable:loadSettings", "key", key, "saved value",
--saved_value,"Configurable.key", self[key])
end
end