From 59c17ef4203a30051d4be48a829d9388bf495b30 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 15 Feb 2016 01:33:48 -0800 Subject: [PATCH] minor: more luacheck fixes --- .travis.yml | 2 +- frontend/apps/reader/modules/readertoc.lua | 4 +--- frontend/apps/reader/modules/readertypeset.lua | 2 -- frontend/apps/reader/modules/readerview.lua | 5 ++--- frontend/apps/reader/modules/readerwikipedia.lua | 4 ++-- frontend/device/kobo/nickel_conf.lua | 2 +- frontend/device/pocketbook/powerd.lua | 2 +- frontend/document/credocument.lua | 4 +--- frontend/document/djvudocument.lua | 4 ---- frontend/document/document.lua | 8 ++++---- frontend/ui/widget/widget.lua | 4 ++-- 11 files changed, 15 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07f148612..81f5928d6 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 220 + - test $(grep Total ./luacheck.out | awk '{print $2}') -le 196 after_success: - make coverage diff --git a/frontend/apps/reader/modules/readertoc.lua b/frontend/apps/reader/modules/readertoc.lua index 0837d2092..a9011e147 100644 --- a/frontend/apps/reader/modules/readertoc.lua +++ b/frontend/apps/reader/modules/readertoc.lua @@ -9,7 +9,6 @@ local Screen = require("device").screen local Device = require("device") local Event = require("ui/event") local Font = require("ui/font") -local DEBUG = require("dbg") local _ = require("gettext") local ReaderToc = InputContainer:new{ @@ -143,7 +142,7 @@ function ReaderToc:getTocTicks(level) depth = v.depth end else - local depth = nil + local depth if level > 0 then depth = level else @@ -261,7 +260,6 @@ end function ReaderToc:onShowToc() self:fillToc() - local max_depth = self:getMaxDepth() -- build menu items if #self.toc > 0 and not self.toc[1].text then for _,v in ipairs(self.toc) do diff --git a/frontend/apps/reader/modules/readertypeset.lua b/frontend/apps/reader/modules/readertypeset.lua index cc3c77c2d..3f3fa33f5 100644 --- a/frontend/apps/reader/modules/readertypeset.lua +++ b/frontend/apps/reader/modules/readertypeset.lua @@ -4,7 +4,6 @@ local lfs = require("libs/libkoreader-lfs") local UIManager = require("ui/uimanager") local Screen = require("device").screen local Event = require("ui/event") -local DEBUG = require("dbg") local T = require("ffi/util").template local _ = require("gettext") @@ -100,7 +99,6 @@ end function ReaderTypeset:setStyleSheet(new_css) if new_css ~= self.css then - --DEBUG("setting css to ", new_css) self.css = new_css self.ui.document:setStyleSheet(new_css) self.ui:handleEvent(Event:new("UpdatePos")) diff --git a/frontend/apps/reader/modules/readerview.lua b/frontend/apps/reader/modules/readerview.lua index e76a71f75..3a4e6b634 100644 --- a/frontend/apps/reader/modules/readerview.lua +++ b/frontend/apps/reader/modules/readerview.lua @@ -185,7 +185,7 @@ function ReaderView:screenToPageTransform(pos) end else pos.page = self.ui.document:getCurrentPage() - local last_y = self.ui.document:getCurrentPos() + -- local last_y = self.ui.document:getCurrentPos() DEBUG("document has no pages at", pos) return pos end @@ -293,8 +293,8 @@ function ReaderView:getCurrentPageList() end function ReaderView:getScrollPagePosition(pos) + local x_p, y_p local x_s, y_s = pos.x, pos.y - local x_p, y_p = nil, nil for _, state in ipairs(self.page_states) do if y_s < state.visible_area.h + state.offset.y then y_p = (state.visible_area.y + y_s - state.offset.y) / state.zoom @@ -482,7 +482,6 @@ end This method is supposed to be only used by ReaderPaging --]] function ReaderView:recalculate() - local page_size = nil if self.ui.document.info.has_pages and self.state.page then self.page_area = self:getPageArea( self.state.page, diff --git a/frontend/apps/reader/modules/readerwikipedia.lua b/frontend/apps/reader/modules/readerwikipedia.lua index 241351c09..4236085a4 100644 --- a/frontend/apps/reader/modules/readerwikipedia.lua +++ b/frontend/apps/reader/modules/readerwikipedia.lua @@ -1,7 +1,6 @@ local ReaderDictionary = require("apps/reader/modules/readerdictionary") local Translator = require("ui/translator") local Wikipedia = require("ui/wikipedia") -local Screen = require("device").screen local DEBUG = require("dbg") local _ = require("gettext") @@ -29,7 +28,8 @@ function ReaderWikipedia:onLookupWikipedia(word, box) -- seems lower case phrase has higher hit rate word = string.lower(word) local results = {} - local ok, pages = pcall(Wikipedia.wikintro, Wikipedia, word, lang) + local pages + ok, pages = pcall(Wikipedia.wikintro, Wikipedia, word, lang) if ok and pages then for pageid, page in pairs(pages) do local result = { diff --git a/frontend/device/kobo/nickel_conf.lua b/frontend/device/kobo/nickel_conf.lua index 8845a5b85..976045273 100644 --- a/frontend/device/kobo/nickel_conf.lua +++ b/frontend/device/kobo/nickel_conf.lua @@ -104,7 +104,7 @@ function NickelConf.frontLightLevel.set(new_intensity) kobo_conf:close() end - kobo_conf_w = assert(io.open(kobo_conf_path, "w")) + local kobo_conf_w = assert(io.open(kobo_conf_path, "w")) for i, line in ipairs(lines) do kobo_conf_w:write(line, "\n") end diff --git a/frontend/device/pocketbook/powerd.lua b/frontend/device/pocketbook/powerd.lua index 564c8914e..49ab9d838 100644 --- a/frontend/device/pocketbook/powerd.lua +++ b/frontend/device/pocketbook/powerd.lua @@ -1,6 +1,6 @@ local BasePowerD = require("device/generic/powerd") local ffi = require("ffi") -local inkview = ffi.load("inkview") +-- local inkview = ffi.load("inkview") ffi.cdef[[ int IsCharging(); diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua index 6eddb3c0f..f8c9b3990 100644 --- a/frontend/document/credocument.lua +++ b/frontend/document/credocument.lua @@ -1,11 +1,9 @@ local CreOptions = require("ui/data/creoptions") local Document = require("document/document") -local Configurable = require("configurable") local Blitbuffer = require("ffi/blitbuffer") local lfs = require("libs/libkoreader-lfs") local DataStorage = require("datastorage") local Geom = require("ui/geometry") -local Device = require("device") local Screen = require("device").screen local Font = require("ui/font") local DEBUG = require("dbg") @@ -190,7 +188,7 @@ function CreDocument:getTextFromPositions(pos0, pos1) local text_range = self._document:getTextFromPositions(pos0.x, pos0.y, pos1.x, pos1.y) DEBUG("CreDocument: get text range", text_range) if text_range then - local line_boxes = self:getScreenBoxesFromPositions(text_range.pos0, text_range.pos1) + -- local line_boxes = self:getScreenBoxesFromPositions(text_range.pos0, text_range.pos1) return { text = text_range.text, pos0 = text_range.pos0, diff --git a/frontend/document/djvudocument.lua b/frontend/document/djvudocument.lua index 50581ec67..c85fc582f 100644 --- a/frontend/document/djvudocument.lua +++ b/frontend/document/djvudocument.lua @@ -1,10 +1,6 @@ -local Geom = require("ui/geometry") -local Cache = require("cache") -local CacheItem = require("cacheitem") local KoptOptions = require("ui/data/koptoptions") local Document = require("document/document") local DrawContext = require("ffi/drawcontext") -local Configurable = require("configurable") local DjvuDocument = Document:new{ _document = false, diff --git a/frontend/document/document.lua b/frontend/document/document.lua index 32e049bbc..5536fa8d7 100644 --- a/frontend/document/document.lua +++ b/frontend/document/document.lua @@ -33,8 +33,8 @@ local Document = { is_edited = false, } -function Document:new(o) - local o = o or {} +function Document:new(from_o) + local o = from_o or {} setmetatable(o, self) self.__index = self if o._init then o:_init() end @@ -205,7 +205,7 @@ function Document:getUsedBBoxDimensions(pageno, zoom, rotation) if bbox.y0 < 0 then bbox.y0 = 0 end if bbox.x1 < 0 then bbox.x1 = 0 end if bbox.y1 < 0 then bbox.y1 = 0 end - local ubbox_dimen = nil + local ubbox_dimen if (bbox.x0 >= bbox.x1) or (bbox.y0 >= bbox.y1) then -- if document's bbox info is corrupted, we use the page size ubbox_dimen = self:getPageDimensions(pageno, zoom, rotation) @@ -282,7 +282,7 @@ function Document:renderPage(pageno, rect, zoom, rotation, gamma, render_mode) end -- prepare cache item with contained blitbuffer - local tile = TileCacheItem:new{ + tile = TileCacheItem:new{ persistent = true, size = size.w * size.h + 64, -- estimation excerpt = size, diff --git a/frontend/ui/widget/widget.lua b/frontend/ui/widget/widget.lua index 29f55a88a..5cb1ad8da 100644 --- a/frontend/ui/widget/widget.lua +++ b/frontend/ui/widget/widget.lua @@ -18,8 +18,8 @@ Use this method to define a class that's inherited from current class. It only setup the metabale (or prototype chain) and will not initiatie a real instance, i.e. call self:init() --]] -function Widget:extend(o) - local o = o or {} +function Widget:extend(from_o) + local o = from_o or {} setmetatable(o, self) self.__index = self return o