averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

style(util): rename tablelength to tableSize

Browse Source
This commit is contained in:
Qingping Hou
2016-01-28 22:37:46 -08:00
parent fab1f9572f
commit e19f73bdba
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/apps/reader/modules/readerfooter.lua
View File

@@ -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

3
frontend/util.lua
View File

@@ -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

4
plugins/statistics.koplugin/main.lua
View File

@@ -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