From 3c647ff244b7bf003abd8cbd89f60d3c70c580ea Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 15 Feb 2016 18:08:04 -0800 Subject: [PATCH] minor: various luacheck fixes --- .travis.yml | 2 +- frontend/ui/downloadmgr.lua | 4 ++-- frontend/ui/font.lua | 4 ++-- frontend/ui/geometry.lua | 2 +- frontend/ui/networkmgr.lua | 1 - frontend/ui/opdsparser.lua | 3 +-- frontend/ui/otamanager.lua | 2 +- frontend/ui/timeval.lua | 4 ++-- frontend/ui/translator.lua | 3 ++- frontend/ui/widget/configdialog.lua | 13 ++++--------- frontend/ui/widget/keyvaluepage.lua | 2 +- frontend/ui/wikipedia.lua | 3 ++- kodev | 22 +++++++++++----------- utils/wbuilder.lua | 6 ++++-- 14 files changed, 34 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dcc6a00b..8df57383f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ script: - make all - travis_retry make testfront - luajit $(which luacheck) --no-color -q frontend | tee ./luacheck.out - - test $(grep Total ./luacheck.out | awk '{print $2}') -le 196 + - test $(grep Total ./luacheck.out | awk '{print $2}') -le 168 after_success: - make coverage diff --git a/frontend/ui/downloadmgr.lua b/frontend/ui/downloadmgr.lua index f4c27f403..685053299 100644 --- a/frontend/ui/downloadmgr.lua +++ b/frontend/ui/downloadmgr.lua @@ -9,8 +9,8 @@ local DownloadMgr = { onConfirm = function() end, } -function DownloadMgr:new(o) - local o = o or {} +function DownloadMgr:new(from_o) + local o = from_o or {} setmetatable(o, self) self.__index = self return o diff --git a/frontend/ui/font.lua b/frontend/ui/font.lua index aa58db688..ec4eff331 100644 --- a/frontend/ui/font.lua +++ b/frontend/ui/font.lua @@ -70,7 +70,7 @@ function Font:getFace(font, size) if not size then size = self.sizemap[font] end -- original size before scaling by screen DPI local orig_size = size - local size = Screen:scaleBySize(size) + size = Screen:scaleBySize(size) local hash = font..size local face_obj = self.faces[hash] @@ -81,7 +81,7 @@ function Font:getFace(font, size) realname = font end realname = self.fontdir.."/"..realname - ok, face = pcall(Freetype.newFace, realname, size) + local ok, face = pcall(Freetype.newFace, realname, size) if not ok then DEBUG("#! Font "..font.." ("..realname..") not supported: "..face) return nil diff --git a/frontend/ui/geometry.lua b/frontend/ui/geometry.lua index 29231333c..149ec0af3 100644 --- a/frontend/ui/geometry.lua +++ b/frontend/ui/geometry.lua @@ -20,7 +20,7 @@ local Geom = { } function Geom:new(o) - local o = o or {} + if not o then o = {} end setmetatable(o, self) self.__index = self return o diff --git a/frontend/ui/networkmgr.lua b/frontend/ui/networkmgr.lua index 8a495664b..8bed75ffe 100644 --- a/frontend/ui/networkmgr.lua +++ b/frontend/ui/networkmgr.lua @@ -2,7 +2,6 @@ local InfoMessage = require("ui/widget/infomessage") local ConfirmBox = require("ui/widget/confirmbox") local UIManager = require("ui/uimanager") local Device = require("device") -local DEBUG = require("dbg") local T = require("ffi/util").template local _ = require("gettext") local NetworkMgr = {} diff --git a/frontend/ui/opdsparser.lua b/frontend/ui/opdsparser.lua index 0c7854109..7883cd701 100644 --- a/frontend/ui/opdsparser.lua +++ b/frontend/ui/opdsparser.lua @@ -5,7 +5,6 @@ --]] local util = require("ffi/util") local luxl = require("luxl") -local DEBUG = require("dbg") local ffi = require("ffi") local OPDSParser = {} @@ -18,7 +17,7 @@ local unescape_map = { ["apos"] = "'" } -local gsub, char = string.gsub, string.char +local gsub = string.gsub local function unescape(str) return gsub(str, '(&(#?)([%d%a]+);)', function(orig, n, s) return unescape_map[s] or n=="#" and util.unichar(tonumber(s)) or orig diff --git a/frontend/ui/otamanager.lua b/frontend/ui/otamanager.lua index 4547cf7df..90df8f487 100644 --- a/frontend/ui/otamanager.lua +++ b/frontend/ui/otamanager.lua @@ -75,7 +75,7 @@ function OTAManager:checkUpdate() local local_zsync_file = ota_dir .. zsync_file -- download zsync file from OTA server DEBUG("downloading zsync file", ota_zsync_file) - local r, c, h = http.request{ + local _, c, _ = http.request{ url = ota_zsync_file, sink = ltn12.sink.file(io.open(local_zsync_file, "w"))} if c ~= 200 then diff --git a/frontend/ui/timeval.lua b/frontend/ui/timeval.lua index 424442dae..314903474 100644 --- a/frontend/ui/timeval.lua +++ b/frontend/ui/timeval.lua @@ -5,8 +5,8 @@ local TimeVal = { usec = 0, } -function TimeVal:new(o) - local o = o or {} +function TimeVal:new(from_o) + local o = from_o or {} if o.sec == nil then o.sec = 0 end diff --git a/frontend/ui/translator.lua b/frontend/ui/translator.lua index b29be84b0..31544c21c 100644 --- a/frontend/ui/translator.lua +++ b/frontend/ui/translator.lua @@ -55,7 +55,8 @@ function Translator:loadPage(target_lang, source_lang, text) DEBUG("request", request) http.TIMEOUT, https.TIMEOUT = 10, 10 local httpRequest = parsed.scheme == 'http' and http.request or https.request - local code, headers, status = socket.skip(1, httpRequest(request)) + -- first argument returned by skip is code + local _, headers, status = socket.skip(1, httpRequest(request)) -- raise error message when network is unavailable if headers == nil then diff --git a/frontend/ui/widget/configdialog.lua b/frontend/ui/widget/configdialog.lua index 43ff4ad97..786ec8a22 100644 --- a/frontend/ui/widget/configdialog.lua +++ b/frontend/ui/widget/configdialog.lua @@ -9,7 +9,6 @@ local HorizontalGroup = require("ui/widget/horizontalgroup") local VerticalSpan = require("ui/widget/verticalspan") local VerticalGroup = require("ui/widget/verticalgroup") local FixedTextWidget = require("ui/widget/fixedtextwidget") -local ProgressWidget = require("ui/widget/progresswidget") local ToggleSwitch = require("ui/widget/toggleswitch") local ConfirmBox = require("ui/widget/confirmbox") local ImageWidget = require("ui/widget/imagewidget") @@ -176,9 +175,6 @@ function ConfigOption:init() local item_font_size = self.options[c].item_font_size and self.options[c].item_font_size or default_item_font_size local option_height = Screen:scaleBySize(self.options[c].height and self.options[c].height or default_option_height) local item_spacing_with = self.options[c].spacing and self.options[c].spacing or default_items_spacing - local items_spacing = HorizontalSpan:new{ - width = Screen:scaleBySize(item_spacing_with) - } local enabled = true if self.options[c].enabled_func then enabled = self.options[c].enabled_func(self.config.configurable) @@ -224,16 +220,15 @@ function ConfigOption:init() -- check if current value is stored in configurable or calculated in runtime local val = self.options[c].current_func and self.options[c].current_func() or self.config.configurable[self.options[c].name] - local min_diff = nil + local min_diff if type(val) == "table" then min_diff = value_diff(val[1], self.options[c].values[1][1]) else min_diff = value_diff(val, self.options[c].values[1]) end - local diff = nil + local diff for index, val_ in pairs(self.options[c].values) do - local diff = nil if type(val) == "table" then diff = value_diff(val[1], val_[1]) else @@ -277,7 +272,7 @@ function ConfigOption:init() width = math.min(max_item_spacing, Screen:scaleBySize(item_spacing_with)) } for d = 1, #self.options[c].item_text do - local option_item = nil + local option_item if option_items_fixed then option_item = OptionTextItem:new{ FixedTextWidget:new{ @@ -584,7 +579,7 @@ function ConfigDialog:onMakeDefault(name, name_text, values, labels, position) labels[position] ), ok_callback = function() - local name = self.config_options.prefix.."_"..name + name = self.config_options.prefix.."_"..name G_reader_settings:saveSetting(name, values[position]) end, }) diff --git a/frontend/ui/widget/keyvaluepage.lua b/frontend/ui/widget/keyvaluepage.lua index e2c394f18..caaf91660 100644 --- a/frontend/ui/widget/keyvaluepage.lua +++ b/frontend/ui/widget/keyvaluepage.lua @@ -41,7 +41,7 @@ local Screen = Device.screen local ellipsis, space = "...", " " local ellipsis_width, space_width -function truncateTextByWidth(text, face, max_width, prepend_space) +local function truncateTextByWidth(text, face, max_width, prepend_space) if not ellipsis_width then ellipsis_width = RenderText:sizeUtf8Text(0, max_width, face, ellipsis).x end diff --git a/frontend/ui/wikipedia.lua b/frontend/ui/wikipedia.lua index c2e9a896f..349b96d4b 100644 --- a/frontend/ui/wikipedia.lua +++ b/frontend/ui/wikipedia.lua @@ -52,7 +52,8 @@ function Wikipedia:loadPage(text, lang, intro, plain) DEBUG("request", request) http.TIMEOUT, https.TIMEOUT = 10, 10 local httpRequest = parsed.scheme == 'http' and http.request or https.request - local code, headers, status = socket.skip(1, httpRequest(request)) + -- first argument returned by skip is code + local _, headers, status = socket.skip(1, httpRequest(request)) -- raise error message when network is unavailable if headers == nil then diff --git a/kodev b/kodev index 9fe52deba..6af4e59db 100755 --- a/kodev +++ b/kodev @@ -2,7 +2,7 @@ CURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -function assert_return_zero { +function assert_ret_zero { if [ $1 -ne 0 ]; then if [ ! -z $2 ]; then echo $2 @@ -45,43 +45,43 @@ ${SUPPORTED_TARGETS}" ;; kindle) make TARGET=kindle - assert_return_zero $? + assert_ret_zero $? ;; kobo) make TARGET=kobo - assert_return_zero $? + assert_ret_zero $? ;; kindle-legacy) make TARGET=kindle-legacy - assert_return_zero $? + assert_ret_zero $? ;; android) if [ ! -d ${CURDIR}/base/toolchain/android-toolchain ]; then make android-toolchain - assert_return_zero $? + assert_ret_zero $? fi make TARGET=android - assert_return_zero $? + assert_ret_zero $? ;; pocketbook) if [ ! -d ${CURDIR}/base/toolchain/pocketbook-toolchain ]; then make pocketbook-toolchain - assert_return_zero $? + assert_ret_zero $? fi make TARGET=pocketbook - assert_return_zero $? + assert_ret_zero $? ;; ubuntu-touch) make TARGET=ubuntu-touch - assert_return_zero $? + assert_ret_zero $? ;; win32) make TARGET=win32 - assert_return_zero $? + assert_ret_zero $? ;; *) make - assert_return_zero $? "Failed to build emulator!" + assert_ret_zero $? "Failed to build emulator!" setup_env ;; esac diff --git a/utils/wbuilder.lua b/utils/wbuilder.lua index 421725e24..eb03deea1 100755 --- a/utils/wbuilder.lua +++ b/utils/wbuilder.lua @@ -343,9 +343,11 @@ local TestInputText = InputText:new{ ----------------------------------------------------- local KeyValuePage = require("ui/widget/keyvaluepage") local kvp = KeyValuePage:new{ - title = 'Statistics', + title = 'Statistics This is a very very log item whose length should exceed the width of the men', kv_pairs = { {"1 Current period", "00:00:00"}, + {"This is a very very log item whose length should exceed the width of the menu.", "value"}, + {"2 Time to read", "00:00:00 00:00:00 00:00:00 00:00:00"}, {"2 Time to read", "00:00:00"}, {"3 Time to read", "00:00:00"}, {"4 Time to read", "00:00:00"}, @@ -377,7 +379,7 @@ local kvp = KeyValuePage:new{ --UIManager:show(TestGrid) UIManager:show(TestVisible) UIManager:show(Clock:new()) ---UIManager:show(M) +-- UIManager:show(M) --UIManager:show(Quiz) --UIManager:show(readerwindow) --UIManager:show(touch_menu)