style(util): rename tablelength to tableSize

pull/1783/head
Qingping Hou 8 years ago
parent fab1f9572f
commit e19f73bdba

@ -249,7 +249,7 @@ function ReaderFooter:getDataFromStatistics(title, pages)
local statistics_data = self.ui.doc_settings:readSetting("stats")
local sec = 'na'
if statistics_data and statistics_data.performance_in_pages then
local read_pages = util.tablelength(statistics_data.performance_in_pages)
local read_pages = util.tableSize(statistics_data.performance_in_pages)
local average_time_per_page = statistics_data.total_time_in_sec / read_pages
sec = util.secondsToClock(pages * average_time_per_page, true)
end

@ -46,7 +46,7 @@ function util.gsplit(str, pattern, capture)
end)
end
--https://gist.github.com/jesseadams/791673
-- https://gist.github.com/jesseadams/791673
function util.secondsToClock(seconds, withoutSeconds)
seconds = tonumber(seconds)
if seconds == 0 or seconds ~= seconds then
@ -66,7 +66,8 @@ function util.secondsToClock(seconds, withoutSeconds)
end
end
function util.tablelength(T)
-- returns number of keys in a table
function util.tableSize(T)
local count = 0
for _ in pairs(T) do count = count + 1 end
return count

@ -235,7 +235,7 @@ function ReaderStatistics:updateCurrentStat()
dates[os.date("%Y-%m-%d", k)] = ""
end
local read_pages = util.tablelength(self.data.performance_in_pages)
local read_pages = util.tableSize(self.data.performance_in_pages)
local current_page = self.ui.document:getCurrentPage()
local average_time_per_page = self.data.total_time_in_sec / read_pages
@ -244,7 +244,7 @@ function ReaderStatistics:updateCurrentStat()
table.insert(stats, { text = _("Total time"), mandatory = util.secondsToClock(self.data.total_time_in_sec, false) })
table.insert(stats, { text = _("Total highlights"), mandatory = self.data.highlights })
table.insert(stats, { text = _("Total notes"), mandatory = self.data.notes })
table.insert(stats, { text = _("Total days"), mandatory = util.tablelength(dates) })
table.insert(stats, { text = _("Total days"), mandatory = util.tableSize(dates) })
table.insert(stats, { text = _("Average time per page"), mandatory = util.secondsToClock(average_time_per_page, false) })
table.insert(stats, { text = _("Read pages/Total pages"), mandatory = read_pages .. "/" .. self.data.pages })
return stats

Loading…
Cancel
Save