mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
fadee1f5dc
Basically: * Use `extend` for class definitions * Use `new` for object instantiations That includes some minor code cleanups along the way: * Updated `Widget`'s docs to make the semantics clearer. * Removed `should_restrict_JIT` (it's been dead code since https://github.com/koreader/android-luajit-launcher/pull/283) * Minor refactoring of LuaSettings/LuaData/LuaDefaults/DocSettings to behave (mostly, they are instantiated via `open` instead of `new`) like everything else and handle inheritance properly (i.e., DocSettings is now a proper LuaSettings subclass). * Default to `WidgetContainer` instead of `InputContainer` for stuff that doesn't actually setup key/gesture events. * Ditto for explicit `*Listener` only classes, make sure they're based on `EventListener` instead of something uselessly fancier. * Unless absolutely necessary, do not store references in class objects, ever; only values. Instead, always store references in instances, to avoid both sneaky inheritance issues, and sneaky GC pinning of stale references. * ReaderUI: Fix one such issue with its `active_widgets` array, with critical implications, as it essentially pinned *all* of ReaderUI's modules, including their reference to the `Document` instance (i.e., that was a big-ass leak). * Terminal: Make sure the shell is killed on plugin teardown. * InputText: Fix Home/End/Del physical keys to behave sensibly. * InputContainer/WidgetContainer: If necessary, compute self.dimen at paintTo time (previously, only InputContainers did, which might have had something to do with random widgets unconcerned about input using it as a baseclass instead of WidgetContainer...). * OverlapGroup: Compute self.dimen at *init* time, because for some reason it needs to do that, but do it directly in OverlapGroup instead of going through a weird WidgetContainer method that it was the sole user of. * ReaderCropping: Under no circumstances should a Document instance member (here, self.bbox) risk being `nil`ed! * Kobo: Minor code cleanups.
73 lines
1.8 KiB
Lua
73 lines
1.8 KiB
Lua
local Device = require("device")
|
|
|
|
local command
|
|
--- @todo (hzj-jie): Does pocketbook provide ntpdate?
|
|
if Device:isKobo() then
|
|
command = "ntpd -q -n -p pool.ntp.org"
|
|
elseif Device:isCervantes() or Device:isKindle() or Device:isPocketBook() then
|
|
command = "ntpdate pool.ntp.org"
|
|
else
|
|
return { disabled = true, }
|
|
end
|
|
|
|
local InfoMessage = require("ui/widget/infomessage")
|
|
local UIManager = require("ui/uimanager")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
local T = require("ffi/util").template
|
|
local _ = require("gettext")
|
|
local NetworkMgr = require("ui/network/manager")
|
|
|
|
local TimeSync = WidgetContainer:extend{
|
|
name = "timesync",
|
|
}
|
|
|
|
local function currentTime()
|
|
local std_out = io.popen("date")
|
|
if std_out then
|
|
local result = std_out:read("*line")
|
|
std_out:close()
|
|
if result ~= nil then
|
|
return T(_("New time is %1."), result)
|
|
end
|
|
end
|
|
return _("Time synchronized.")
|
|
end
|
|
|
|
local function syncNTP()
|
|
local info = InfoMessage:new{
|
|
text = _("Synchronizing time. This may take several seconds.")
|
|
}
|
|
UIManager:show(info)
|
|
UIManager:forceRePaint()
|
|
local txt
|
|
if os.execute(command) ~= 0 then
|
|
txt = _("Failed to retrieve time from server. Please check your network configuration.")
|
|
else
|
|
txt = currentTime()
|
|
end
|
|
os.execute("hwclock -u -w")
|
|
UIManager:close(info)
|
|
UIManager:show(InfoMessage:new{
|
|
text = txt,
|
|
timeout = 3,
|
|
})
|
|
end
|
|
|
|
local menuItem = {
|
|
text = _("Synchronize time"),
|
|
keep_menu_open = true,
|
|
callback = function()
|
|
NetworkMgr:runWhenOnline(function() syncNTP() end)
|
|
end
|
|
}
|
|
|
|
function TimeSync:init()
|
|
self.ui.menu:registerToMainMenu(self)
|
|
end
|
|
|
|
function TimeSync:addToMainMenu(menu_items)
|
|
menu_items.synchronize_time = menuItem
|
|
end
|
|
|
|
return TimeSync
|