From 8f4fae7a098ae4c285890b7e9d573ee510fe64af Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Wed, 10 Feb 2016 10:30:05 -0800 Subject: [PATCH] minore: more static check fixes --- .travis.yml | 2 +- Makefile | 2 +- frontend/ui/widget/buttontable.lua | 1 - frontend/ui/widget/confirmbox.lua | 5 +---- frontend/ui/widget/container/bottomcontainer.lua | 5 +++-- frontend/ui/widget/container/centercontainer.lua | 5 +++-- frontend/ui/widget/container/leftcontainer.lua | 5 +++-- frontend/ui/widget/container/rightcontainer.lua | 5 +++-- frontend/ui/widget/dictquicklookup.lua | 1 - frontend/ui/widget/eventlistener.lua | 4 ++-- frontend/ui/widget/opdsbrowser.lua | 16 ++++++++-------- 11 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 044de2586..12740b491 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 250 + - test $(grep Total ./luacheck.out | awk '{print $2}') -le 238 after_success: - make coverage diff --git a/Makefile b/Makefile index c1cbf572e..20c0a9d07 100644 --- a/Makefile +++ b/Makefile @@ -321,7 +321,7 @@ po: $(MAKE) -i -C l10n bootstrap pull static-check: - @if which luacheck > /dev/null; then luacheck frontend; else \ + @if which luacheck > /dev/null; then luacheck -q frontend; else \ echo "[!] luacheck not found. "\ "you can install it with 'luarocks install luacheck'"; fi diff --git a/frontend/ui/widget/buttontable.lua b/frontend/ui/widget/buttontable.lua index cd3fb0392..562edbbe3 100644 --- a/frontend/ui/widget/buttontable.lua +++ b/frontend/ui/widget/buttontable.lua @@ -5,7 +5,6 @@ local FocusManager = require("ui/widget/focusmanager") local LineWidget = require("ui/widget/linewidget") local Blitbuffer = require("ffi/blitbuffer") local Button = require("ui/widget/button") -local UIManager = require("ui/uimanager") local Geom = require("ui/geometry") local Device = require("device") local Screen = Device.screen diff --git a/frontend/ui/widget/confirmbox.lua b/frontend/ui/widget/confirmbox.lua index 2ff70e6b0..af075aaa3 100644 --- a/frontend/ui/widget/confirmbox.lua +++ b/frontend/ui/widget/confirmbox.lua @@ -7,12 +7,9 @@ local ImageWidget = require("ui/widget/imagewidget") local TextBoxWidget = require("ui/widget/textboxwidget") local HorizontalSpan = require("ui/widget/horizontalspan") local ButtonTable = require("ui/widget/buttontable") -local GestureRange = require("ui/gesturerange") local UIManager = require("ui/uimanager") local Device = require("device") -local Geom = require("ui/geometry") -local Input = require("device").input -local Screen = require("device").screen +local Screen = Device.screen local Font = require("ui/font") local DEBUG = require("dbg") local _ = require("gettext") diff --git a/frontend/ui/widget/container/bottomcontainer.lua b/frontend/ui/widget/container/bottomcontainer.lua index 123b4be29..9bc4fede9 100644 --- a/frontend/ui/widget/container/bottomcontainer.lua +++ b/frontend/ui/widget/container/bottomcontainer.lua @@ -9,10 +9,11 @@ local BottomContainer = WidgetContainer:new() function BottomContainer:paintTo(bb, x, y) local contentSize = self[1]:getSize() - if contentSize.w > self.dimen.w or contentSize.h > self.dimen.h then + -- FIXME + -- if contentSize.w > self.dimen.w or contentSize.h > self.dimen.h then -- throw error? paint to scrap buffer and blit partially? -- for now, we ignore this - end + -- end self[1]:paintTo(bb, x + math.floor((self.dimen.w - contentSize.w)/2), y + (self.dimen.h - contentSize.h)) diff --git a/frontend/ui/widget/container/centercontainer.lua b/frontend/ui/widget/container/centercontainer.lua index ff7b90034..2b080b5f5 100644 --- a/frontend/ui/widget/container/centercontainer.lua +++ b/frontend/ui/widget/container/centercontainer.lua @@ -7,10 +7,11 @@ local CenterContainer = WidgetContainer:new() function CenterContainer:paintTo(bb, x, y) local content_size = self[1]:getSize() - if content_size.w > self.dimen.w or content_size.h > self.dimen.h then + -- FIXME + -- if content_size.w > self.dimen.w or content_size.h > self.dimen.h then -- throw error? paint to scrap buffer and blit partially? -- for now, we ignore this - end + -- end local x_pos = x local y_pos = y if self.ignore ~= "height" then diff --git a/frontend/ui/widget/container/leftcontainer.lua b/frontend/ui/widget/container/leftcontainer.lua index 227845c09..8f4ac1e73 100644 --- a/frontend/ui/widget/container/leftcontainer.lua +++ b/frontend/ui/widget/container/leftcontainer.lua @@ -7,10 +7,11 @@ local LeftContainer = WidgetContainer:new() function LeftContainer:paintTo(bb, x, y) local contentSize = self[1]:getSize() - if contentSize.w > self.dimen.w or contentSize.h > self.dimen.h then + -- FIXME + -- if contentSize.w > self.dimen.w or contentSize.h > self.dimen.h then -- throw error? paint to scrap buffer and blit partially? -- for now, we ignore this - end + -- end self[1]:paintTo(bb, x , y + math.floor((self.dimen.h - contentSize.h)/2)) end diff --git a/frontend/ui/widget/container/rightcontainer.lua b/frontend/ui/widget/container/rightcontainer.lua index 51b96df1f..b92948264 100644 --- a/frontend/ui/widget/container/rightcontainer.lua +++ b/frontend/ui/widget/container/rightcontainer.lua @@ -7,10 +7,11 @@ local RightContainer = WidgetContainer:new() function RightContainer:paintTo(bb, x, y) local contentSize = self[1]:getSize() - if contentSize.w > self.dimen.w or contentSize.h > self.dimen.h then + -- FIXME + -- if contentSize.w > self.dimen.w or contentSize.h > self.dimen.h then -- throw error? paint to scrap buffer and blit partially? -- for now, we ignore this - end + -- end self[1]:paintTo(bb, x + (self.dimen.w - contentSize.w), y + math.floor((self.dimen.h - contentSize.h)/2)) diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index 0e78d35ed..76e262721 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -5,7 +5,6 @@ local CenterContainer = require("ui/widget/container/centercontainer") local LeftContainer = require("ui/widget/container/leftcontainer") local ScrollTextWidget = require("ui/widget/scrolltextwidget") local VerticalGroup = require("ui/widget/verticalgroup") -local TextBoxWidget = require("ui/widget/textboxwidget") local OverlapGroup = require("ui/widget/overlapgroup") local CloseButton = require("ui/widget/closebutton") local ButtonTable = require("ui/widget/buttontable") diff --git a/frontend/ui/widget/eventlistener.lua b/frontend/ui/widget/eventlistener.lua index c4e1d1522..88aaaeea7 100644 --- a/frontend/ui/widget/eventlistener.lua +++ b/frontend/ui/widget/eventlistener.lua @@ -7,8 +7,8 @@ will call a method "onEventName" for an event with name --]] local EventListener = {} -function EventListener:new(o) - local o = o or {} +function EventListener:new(new_o) + local o = new_o or {} setmetatable(o, self) self.__index = self if o.init then o:init() end diff --git a/frontend/ui/widget/opdsbrowser.lua b/frontend/ui/widget/opdsbrowser.lua index 0d77f0be1..0f5685a3b 100644 --- a/frontend/ui/widget/opdsbrowser.lua +++ b/frontend/ui/widget/opdsbrowser.lua @@ -168,7 +168,7 @@ end function OPDSBrowser:genItemTableFromRoot() local item_table = {} - for i, server in ipairs(self.opds_servers) do + for _, server in ipairs(self.opds_servers) do table.insert(item_table, { text = server.title, content = server.subtitle, @@ -176,7 +176,7 @@ function OPDSBrowser:genItemTableFromRoot() }) end local added_servers = G_reader_settings:readSetting("opds_servers") or {} - for i, server in ipairs(added_servers) do + for _, server in ipairs(added_servers) do table.insert(item_table, { text = server.title, content = server.subtitle, @@ -375,7 +375,7 @@ function OPDSBrowser:genItemTableFromCatalog(catalog, item_url) end local hrefs = {} if feed.link then - for i, link in ipairs(feed.link) do + for _, link in ipairs(feed.link) do if link.type:find(self.catalog_type) or link.type:find(self.search_type) then if link.rel and link.href then @@ -386,11 +386,11 @@ function OPDSBrowser:genItemTableFromCatalog(catalog, item_url) end item_table.hrefs = hrefs if feed.entry then - for i, entry in ipairs(feed.entry) do + for _, entry in ipairs(feed.entry) do local item = {} item.acquisitions = {} if entry.link then - for i, link in ipairs(entry.link) do + for _, link in ipairs(entry.link) do if link.type:find(self.catalog_type) and (not link.rel or link.rel == "subsection" or link.rel == "http://opds-spec.org/sort/popular" or link.rel == "http://opds-spec.org/sort/new") then item.url = build_href(link.href) end @@ -451,7 +451,7 @@ end function OPDSBrowser:appendCatalog(item_table_url) local new_table = self:genItemTableFromURL(item_table_url) - for i, item in ipairs(new_table) do + for _, item in ipairs(new_table) do table.insert(self.item_table, item) end self.item_table.hrefs = new_table.hrefs @@ -566,7 +566,7 @@ end function OPDSBrowser:editServerFromInput(item, fields) DEBUG("input catalog", fields) local servers = {} - for i, server in ipairs(G_reader_settings:readSetting("opds_servers") or {}) do + for _, server in ipairs(G_reader_settings:readSetting("opds_servers") or {}) do if server.title == item.text or server.url == item.url then server.title = fields[1] server.url = (fields[2]:match("^%a+://") and fields[2] or "http://" .. fields[2]) @@ -620,7 +620,7 @@ end function OPDSBrowser:deleteOPDSServer(item) DEBUG("delete", item) local servers = {} - for i, server in ipairs(G_reader_settings:readSetting("opds_servers") or {}) do + for _, server in ipairs(G_reader_settings:readSetting("opds_servers") or {}) do if server.title ~= item.text or server.url ~= item.url then table.insert(servers, server) end