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

Add datetime.lua

Browse Source 
Move date and time related functions from util.lua
(and the statistics plugin) to a new datetime.lua.
This commit is contained in:
zwim
2022-11-17 05:53:35 +01:00
committed by Frans de Jonge
parent 2e5284051a
commit 192a243b4d
20 changed files with 564 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,8 +20,8 @@ local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local datetime = require("datetime")
local logger = require("logger")
local util = require("util")
local T = require("ffi/util").template
local _ = require("gettext")
local C_ = _.pgettext
@@ -229,7 +229,7 @@ local footerTextGeneratorMap = {
time = function(footer)
local symbol_type = footer.settings.item_prefix
local prefix = symbol_prefix[symbol_type].time
local clock = util.secondsToHour(os.time(), G_reader_settings:isTrue("twelve_hour_clock"))
local clock = datetime.secondsToHour(os.time(), G_reader_settings:isTrue("twelve_hour_clock"))
if not prefix then
return clock
else
@@ -2098,7 +2098,7 @@ function ReaderFooter:getDataFromStatistics(title, pages)
local average_time_per_page = self:getAvgTimePerPage()
local user_duration_format = G_reader_settings:readSetting("duration_format", "classic")
if average_time_per_page then
sec = util.secondsToClockDuration(user_duration_format, pages * average_time_per_page, true)
sec = datetime.secondsToClockDuration(user_duration_format, pages * average_time_per_page, true)
end
return title .. sec
end