mirror of https://github.com/koreader/koreader
Merge remote-tracking branch 'origin/new_ui_code' into new_ui_code
commit
86a3ff6447
@ -0,0 +1,153 @@
|
||||
require "cache"
|
||||
require "ui/geometry"
|
||||
|
||||
DjvuDocument = Document:new{
|
||||
_document = false,
|
||||
-- libdjvulibre manages its own additional cache, default value is hard written in c module.
|
||||
djvulibre_cache_size = nil,
|
||||
dc_null = DrawContext.new()
|
||||
}
|
||||
|
||||
function DjvuDocument:init()
|
||||
local ok
|
||||
ok, self._document = pcall(djvu.openDocument, self.file, self.djvulibre_cache_size)
|
||||
if not ok then
|
||||
self.error_message = self.doc -- will contain error message
|
||||
return
|
||||
end
|
||||
self.is_open = true
|
||||
self.info.has_pages = true
|
||||
self:_readMetadata()
|
||||
end
|
||||
|
||||
function DjvuDocument:_readMetadata()
|
||||
self.info.number_of_pages = self._document:getPages()
|
||||
return true
|
||||
end
|
||||
|
||||
function DjvuDocument:close()
|
||||
if self.is_open then
|
||||
self.is_open = false
|
||||
self._document:close()
|
||||
end
|
||||
end
|
||||
|
||||
function DjvuDocument:getNativePageDimensions(pageno)
|
||||
local hash = "pgdim|"..self.file.."|"..pageno
|
||||
local cached = Cache:check(hash)
|
||||
if cached then
|
||||
return cached[1]
|
||||
end
|
||||
local page = self._document:openPage(pageno)
|
||||
local page_size_w, page_size_h = page:getSize(self.dc_null)
|
||||
local page_size = Geom:new{ w = page_size_w, h = page_size_h }
|
||||
Cache:insert(hash, CacheItem:new{ page_size })
|
||||
page:close()
|
||||
return page_size
|
||||
end
|
||||
|
||||
function DjvuDocument:getUsedBBox(pageno)
|
||||
--local hash = "pgubbox|"..self.file.."|"..pageno
|
||||
--local cached = Cache:check(hash)
|
||||
--if cached then
|
||||
--return cached.data
|
||||
--end
|
||||
--local page = self._document:openPage(pageno)
|
||||
local used = {}
|
||||
used.x, used.y, used.w, used.h = 0.01, 0.01, -0.01, -0.01
|
||||
--Cache:insert(hash, CacheItem:new{ used })
|
||||
--page:close()
|
||||
return used
|
||||
end
|
||||
|
||||
function DjvuDocument:getPageText(pageno)
|
||||
-- is this worth caching? not done yet.
|
||||
local page = self._document:openPage(pageno)
|
||||
local text = page:getPageText()
|
||||
page:close()
|
||||
return text
|
||||
end
|
||||
|
||||
function DjvuDocument:renderPage(pageno, rect, zoom, rotation)
|
||||
local hash = "renderpg|"..self.file.."|"..pageno.."|"..zoom.."|"..rotation
|
||||
local page_size = self:getPageDimensions(pageno, zoom, rotation)
|
||||
-- this will be the size we actually render
|
||||
local size = page_size
|
||||
-- we prefer to render the full page, if it fits into cache
|
||||
if not Cache:willAccept(size.w * size.h / 2) then
|
||||
-- whole page won't fit into cache
|
||||
DEBUG("rendering only part of the page")
|
||||
-- TODO: figure out how to better segment the page
|
||||
if not rect then
|
||||
DEBUG("aborting, since we do not have a specification for that part")
|
||||
-- required part not given, so abort
|
||||
return
|
||||
end
|
||||
-- only render required part
|
||||
hash = "renderpg|"..self.file.."|"..pageno.."|"..zoom.."|"..rotation.."|"..tostring(rect)
|
||||
size = rect
|
||||
end
|
||||
|
||||
-- prepare cache item with contained blitbuffer
|
||||
local tile = CacheItem:new{
|
||||
size = size.w * size.h / 2 + 64, -- estimation
|
||||
excerpt = size,
|
||||
pageno = pageno,
|
||||
bb = Blitbuffer.new(size.w, size.h)
|
||||
}
|
||||
|
||||
-- create a draw context
|
||||
local dc = DrawContext.new()
|
||||
|
||||
dc:setRotate(rotation)
|
||||
-- correction of rotation
|
||||
if rotation == 90 then
|
||||
dc:setOffset(page_size.w, 0)
|
||||
elseif rotation == 180 then
|
||||
dc:setOffset(page_size.w, page_size.h)
|
||||
elseif rotation == 270 then
|
||||
dc:setOffset(0, page_size.h)
|
||||
end
|
||||
dc:setZoom(zoom)
|
||||
|
||||
-- render
|
||||
local page = self._document:openPage(pageno)
|
||||
page:draw(dc, tile.bb, size.x, size.y)
|
||||
page:close()
|
||||
Cache:insert(hash, tile)
|
||||
|
||||
return tile
|
||||
end
|
||||
|
||||
-- a hint for the cache engine to paint a full page to the cache
|
||||
-- TODO: this should trigger a background operation
|
||||
function DjvuDocument:hintPage(pageno, zoom, rotation)
|
||||
self:renderPage(pageno, nil, zoom, rotation)
|
||||
end
|
||||
|
||||
function DjvuDocument:drawPage(target, x, y, rect, pageno, zoom, rotation)
|
||||
local hash_full_page = "renderpg|"..self.file.."|"..pageno.."|"..zoom.."|"..rotation
|
||||
local hash_excerpt = "renderpg|"..self.file.."|"..pageno.."|"..zoom.."|"..rotation.."|"..tostring(rect)
|
||||
local tile = Cache:check(hash_full_page)
|
||||
if not tile then
|
||||
tile = Cache:check(hash_excerpt)
|
||||
if not tile then
|
||||
DEBUG("rendering")
|
||||
tile = self:renderPage(pageno, rect, zoom, rotation)
|
||||
end
|
||||
end
|
||||
DEBUG("now painting", tile)
|
||||
target:blitFrom(tile.bb, x, y, rect.x - tile.excerpt.x, rect.y - tile.excerpt.y, rect.w, rect.h)
|
||||
end
|
||||
|
||||
function DjvuDocument:invertTextYAxel(pageno, text_table)
|
||||
local _, height = self.doc:getOriginalPageSize(pageno)
|
||||
for _,text in pairs(text_table) do
|
||||
for _,line in ipairs(text) do
|
||||
line.y0, line.y1 = (height - line.y1), (height - line.y0)
|
||||
end
|
||||
end
|
||||
return text_table
|
||||
end
|
||||
|
||||
DocumentRegistry:addProvider("djvu", "application/djvu", DjvuDocument)
|
@ -0,0 +1,57 @@
|
||||
require "ui/dialog" -- for Menu
|
||||
|
||||
FileChooser = Menu:new{
|
||||
path = ".",
|
||||
parent = nil,
|
||||
show_hidden = false,
|
||||
filter = function(filename) return true end,
|
||||
}
|
||||
|
||||
function FileChooser:init()
|
||||
self:changeToPath(self.path)
|
||||
end
|
||||
|
||||
function FileChooser:changeToPath(path)
|
||||
local dirs = {}
|
||||
local files = {}
|
||||
self.path = path
|
||||
for f in lfs.dir(self.path) do
|
||||
if self.show_hidden or not string.match(f, "^%.[^.]") then
|
||||
local filename = self.path.."/"..f
|
||||
local filemode = lfs.attributes(filename, "mode")
|
||||
if filemode == "directory" and f ~= "." and f~=".." then
|
||||
table.insert(dirs, f)
|
||||
elseif filemode == "file" then
|
||||
if self.filter(filename) then
|
||||
table.insert(files, f)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
table.sort(dirs)
|
||||
if self.path ~= "/" then table.insert(dirs, 1, "..") end
|
||||
table.sort(files)
|
||||
|
||||
self.item_table = {}
|
||||
for _, dir in ipairs(dirs) do
|
||||
table.insert(self.item_table, { text = dir.."/", path = self.path.."/"..dir })
|
||||
end
|
||||
for _, file in ipairs(files) do
|
||||
table.insert(self.item_table, { text = file, path = self.path.."/"..file })
|
||||
end
|
||||
|
||||
Menu.init(self) -- call parent's init()
|
||||
end
|
||||
|
||||
function FileChooser:onSelect()
|
||||
local selected = self.item_table[(self.page-1)*self.perpage+self.selected.y]
|
||||
if lfs.attributes(selected.path, "mode") == "directory" then
|
||||
UIManager:close(self)
|
||||
self:changeToPath(selected.path)
|
||||
UIManager:show(self)
|
||||
else
|
||||
UIManager:close(self)
|
||||
self.on_select_callback(self.item_table[self.selected.y])
|
||||
end
|
||||
return true
|
||||
end
|
Loading…
Reference in New Issue