renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1754 from houqp/fixstats

Browse Source 
fix(ReaderFooter:getDataFromStatistics): return na if book has no stats history
This commit is contained in:
Huang Xin
2015-12-23 22:54:54 +08:00
parent be00e43daa 41240464ca
commit bbde70fb3d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,11 +242,13 @@ end
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 average_time_per_page = statistics_data.total_time_in_sec / read_pages
return title .. util.secondsToClock(pages * average_time_per_page, true)
sec = util.secondsToClock(pages * average_time_per_page, true)
end
return title .. sec
end

7
frontend/apps/reader/readerui.lua
View File

@@ -327,7 +327,12 @@ function ReaderUI:showReader(file)
local co = coroutine.create(function()
self:doShowReader(file)
end)
coroutine.resume(co)
local ok, err = coroutine.resume(co)
if err ~= nil then
print '[!] doShowReader coroutine crashed:'
print(debug.traceback(co, err, 1))
UIManager._running = false
end
end)
end