mirror of
https://github.com/koreader/koreader
synced 2024-11-16 06:12:56 +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.
81 lines
2.1 KiB
Lua
81 lines
2.1 KiB
Lua
local Blitbuffer = require("ffi/blitbuffer")
|
|
local CacheItem = require("cacheitem")
|
|
local Persist = require("persist")
|
|
local logger = require("logger")
|
|
|
|
local TileCacheItem = CacheItem:extend{}
|
|
|
|
function TileCacheItem:onFree()
|
|
logger.dbg("TileCacheItem: free blitbuffer", self.bb)
|
|
self.bb:free()
|
|
end
|
|
|
|
--- @note: Perhaps one day we'll be able to teach bitser or string.buffer about custom structs with pointers to buffers,
|
|
--- so we won't have to do the BB tostring/fromstring dance anymore...
|
|
function TileCacheItem:totable()
|
|
local t = {
|
|
size = self.size,
|
|
pageno = self.pageno,
|
|
excerpt = self.excerpt,
|
|
created_ts = self.created_ts,
|
|
persistent = self.persistent,
|
|
doc_path = self.doc_path,
|
|
bb = {
|
|
w = self.bb.w,
|
|
h = self.bb.h,
|
|
stride = tonumber(self.bb.stride),
|
|
fmt = self.bb:getType(),
|
|
rotation = self.bb:getRotation(),
|
|
inverse = self.bb:getInverse(),
|
|
data = Blitbuffer.tostring(self.bb),
|
|
},
|
|
}
|
|
|
|
return t
|
|
end
|
|
|
|
function TileCacheItem:dump(filename)
|
|
logger.dbg("Dumping tile cache to", filename, self.excerpt)
|
|
|
|
local cache_file = Persist:new{
|
|
path = filename,
|
|
codec = "zstd",
|
|
}
|
|
|
|
local ok, size = cache_file:save(self:totable())
|
|
if ok then
|
|
return size
|
|
else
|
|
logger.warn("Failed to dump tile cache")
|
|
return nil
|
|
end
|
|
end
|
|
|
|
function TileCacheItem:fromtable(t)
|
|
self.size = t.size
|
|
self.pageno = t.pageno
|
|
self.excerpt = t.excerpt
|
|
self.created_ts = t.created_ts
|
|
self.persistent = t.persistent
|
|
self.doc_path = t.doc_path
|
|
self.bb = Blitbuffer.fromstring(t.bb.w, t.bb.h, t.bb.fmt, t.bb.data, t.bb.stride, t.bb.rotation, t.bb.inverse)
|
|
end
|
|
|
|
function TileCacheItem:load(filename)
|
|
local cache_file = Persist:new{
|
|
path = filename,
|
|
codec = "zstd",
|
|
}
|
|
|
|
local t = cache_file:load(filename)
|
|
if t then
|
|
self:fromtable(t)
|
|
|
|
logger.dbg("Loaded tile cache from", filename, self)
|
|
else
|
|
logger.warn("Failed to load tile cache from", filename)
|
|
end
|
|
end
|
|
|
|
return TileCacheItem
|