Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Classic display mode: add popup file dialog buttons (#10185)

Browse Source
reviewable/pr10188/r1
hius07 1 year ago committed by GitHub
parent eeb3c08457
commit a3d42ac344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 199 additions and 239 deletions
Show Stats Download Patch File Download Diff File

20
frontend/apps/filemanager/filemanager.lua
Unescape Escape View File

@ -315,7 +315,25 @@ function FileManager:setupLayout()
UIManager:close(self.file_dialog)
FileManagerBookInfo:show(file)
end,
}
},
})
table.insert(buttons, {
{
text = _("Book cover"),
id = "book_cover", -- used by covermenu
callback = function()
UIManager:close(self.file_dialog)
FileManagerBookInfo:onShowBookCover(file)
end,
},
{
text = _("Book description"),
id = "book_description", -- used by covermenu
callback = function()
UIManager:close(self.file_dialog)
FileManagerBookInfo:onShowBookDescription(nil, file)
end,
},
})
if Device:canExecuteScript(file) then
local function button_callback()

201
frontend/apps/filemanager/filemanagerbookinfo.lua
Unescape Escape View File

@ -34,10 +34,6 @@ function BookInfo:addToMainMenu(menu_items)
}
end
function BookInfo:isSupported(file)
return lfs.attributes(file, "mode") == "file"
end
function BookInfo:show(file, book_props)
local kv_pairs = {}
@ -69,70 +65,7 @@ function BookInfo:show(file, book_props)
-- book_props may be provided if caller already has them available
-- but it may lack "pages", that we may get from sidecar file
if not book_props or not book_props.pages then
-- check there is actually a sidecar file before calling DocSettings:open()
-- that would create an empty sidecar directory
if DocSettings:hasSidecarFile(file) then
local doc_settings = DocSettings:open(file)
if doc_settings then
if not book_props then
-- Files opened after 20170701 have a "doc_props" setting with
-- complete metadata and "doc_pages" with accurate nb of pages
book_props = doc_settings:readSetting("doc_props")
end
if not book_props then
-- File last opened before 20170701 may have a "stats" setting.
-- with partial metadata, or empty metadata if statistics plugin
-- was not enabled when book was read (we can guess that from
-- the fact that stats.page = 0)
local stats = doc_settings:readSetting("stats")
if stats and stats.pages ~= 0 then
-- Let's use them as is (which was what was done before), even if
-- incomplete, to avoid expensive book opening
book_props = stats
end
end
-- Files opened after 20170701 have an accurate "doc_pages" setting.
local doc_pages = doc_settings:readSetting("doc_pages")
if doc_pages and book_props then
book_props.pages = doc_pages
end
end
end
end
-- If still no book_props (book never opened or empty "stats"), open the
-- document to get them
if not book_props then
local document = DocumentRegistry:openDocument(file)
if document then
local loaded = true
local pages
if document.loadDocument then -- CreDocument
if not document:loadDocument(false) then -- load only metadata
-- failed loading, calling other methods would segfault
loaded = false
end
-- For CreDocument, we would need to call document:render()
-- to get nb of pages, but the nb obtained by simply calling
-- here document:getPageCount() is wrong, often 2 to 3 times
-- the nb of pages we see when opening the document (may be
-- some other cre settings should be applied before calling
-- render() ?)
else
-- for all others than crengine, we seem to get an accurate nb of pages
pages = document:getPageCount()
end
if loaded then
book_props = document:getProps()
book_props.pages = pages
end
document:close()
end
end
-- If still no book_props, fall back to empty ones
if not book_props then
book_props = {}
book_props = self:getBookProps(file, book_props)
end
local title = book_props.title
@ -203,30 +136,8 @@ function BookInfo:show(file, book_props)
-- will show the right thing, that'd we rather not mess with BD wrapping.)
table.insert(kv_pairs, { _("Description:"), description })
-- Cover image
local viewCoverImage = function()
local widget
local document = DocumentRegistry:openDocument(file)
if document then
if document.loadDocument then -- CreDocument
document:loadDocument(false) -- load only metadata
end
local cover_bb = document:getCoverPageImage()
if cover_bb then
widget = ImageViewer:new{
image = cover_bb,
with_title_bar = false,
fullscreen = true,
}
end
document:close()
end
if not widget then
widget = InfoMessage:new{
text = _("No cover image available"),
}
end
UIManager:show(widget)
self:onShowBookCover(file)
end
table.insert(kv_pairs, { _("Cover image:"), _("Tap to display"), callback=viewCoverImage })
@ -246,6 +157,66 @@ function BookInfo:show(file, book_props)
UIManager:show(widget)
end
function BookInfo:getBookProps(file, book_props)
if DocSettings:hasSidecarFile(file) then
local doc_settings = DocSettings:open(file)
if not book_props then
-- Files opened after 20170701 have a "doc_props" setting with
-- complete metadata and "doc_pages" with accurate nb of pages
book_props = doc_settings:readSetting("doc_props")
end
if not book_props then
-- File last opened before 20170701 may have a "stats" setting.
-- with partial metadata, or empty metadata if statistics plugin
-- was not enabled when book was read (we can guess that from
-- the fact that stats.page = 0)
local stats = doc_settings:readSetting("stats")
if stats and stats.pages ~= 0 then
-- Let's use them as is (which was what was done before), even if
-- incomplete, to avoid expensive book opening
book_props = stats
end
end
-- Files opened after 20170701 have an accurate "doc_pages" setting.
local doc_pages = doc_settings:readSetting("doc_pages")
if doc_pages and book_props then
book_props.pages = doc_pages
end
end
-- If still no book_props (book never opened or empty "stats"), open the document to get them
if not book_props then
local document = DocumentRegistry:openDocument(file)
if document then
local loaded = true
local pages
if document.loadDocument then -- CreDocument
if not document:loadDocument(false) then -- load only metadata
-- failed loading, calling other methods would segfault
loaded = false
end
-- For CreDocument, we would need to call document:render()
-- to get nb of pages, but the nb obtained by simply calling
-- here document:getPageCount() is wrong, often 2 to 3 times
-- the nb of pages we see when opening the document (may be
-- some other cre settings should be applied before calling
-- render() ?)
else
-- for all others than crengine, we seem to get an accurate nb of pages
pages = document:getPageCount()
end
if loaded then
book_props = document:getProps()
book_props.pages = pages
end
document:close()
end
end
-- If still no book_props, fall back to empty ones
return book_props or {}
end
function BookInfo:onShowBookInfo()
if not self.document then return end
-- Get them directly from ReaderUI's doc_settings
@ -260,9 +231,15 @@ function BookInfo:onShowBookInfo()
self:show(self.document.file, book_props)
end
function BookInfo:onShowBookDescription()
if not self.document then return end
local description = self.document:getProps().description
function BookInfo:onShowBookDescription(description, file)
if not description then
if file then
description = self:getBookProps(file).description
elseif self.document then
description = self.ui.doc_settings:readSetting("doc_props").description
or self.document:getProps().description
end
end
if description and description ~= "" then
-- Description may (often in EPUB, but not always) or may not (rarely
-- in PDF) be HTML.
@ -279,19 +256,31 @@ function BookInfo:onShowBookDescription()
end
end
function BookInfo:onShowBookCover()
if not self.document then return end
local cover_bb = self.document:getCoverPageImage()
if cover_bb then
UIManager:show(ImageViewer:new{
image = cover_bb,
with_title_bar = false,
fullscreen = true,
})
function BookInfo:onShowBookCover(file)
local document
if file then
document = DocumentRegistry:openDocument(file)
if document and document.loadDocument then -- CreDocument
document:loadDocument(false) -- load only metadata
end
else
UIManager:show(InfoMessage:new{
text = _("No cover image available."),
})
document = self.document
end
if document then
local cover_bb = document:getCoverPageImage()
if cover_bb then
local imgviewer = ImageViewer:new{
image = cover_bb,
with_title_bar = false,
fullscreen = true,
}
UIManager:show(imgviewer)
else
UIManager:show(InfoMessage:new{
text = _("No cover image available."),
})
end
document:close()
end
end

18
frontend/apps/filemanager/filemanagercollection.lua
Unescape Escape View File

@ -98,6 +98,24 @@ function FileManagerCollection:onMenuHold(item)
end,
},
})
table.insert(buttons, {
{
text = _("Book cover"),
id = "book_cover", -- used by covermenu
callback = function()
UIManager:close(self.collfile_dialog)
FileManagerBookInfo:onShowBookCover(item.file)
end,
},
{
text = _("Book description"),
id = "book_description", -- used by covermenu
callback = function()
UIManager:close(self.collfile_dialog)
FileManagerBookInfo:onShowBookDescription(nil, item.file)
end,
},
})
if Device:canExecuteScript(item.file) then
local function button_callback()

18
frontend/apps/filemanager/filemanagerhistory.lua
Unescape Escape View File

@ -132,6 +132,24 @@ function FileManagerHistory:onMenuHold(item)
end,
},
})
table.insert(buttons, {
{
text = _("Book cover"),
id = "book_cover", -- used by covermenu
callback = function()
UIManager:close(self.histfile_dialog)
FileManagerBookInfo:onShowBookCover(item.file)
end,
},
{
text = _("Book description"),
id = "book_description", -- used by covermenu
callback = function()
UIManager:close(self.histfile_dialog)
FileManagerBookInfo:onShowBookDescription(nil, item.file)
end,
},
})
self.histfile_dialog = ButtonDialogTitle:new{
title = BD.filename(item.text:match("([^/]+)$")),

181
plugins/coverbrowser.koplugin/covermenu.lua
Unescape Escape View File

@ -1,16 +1,12 @@
local BD = require("ui/bidi")
local DocSettings = require("docsettings")
local DocumentRegistry = require("document/documentregistry")
local FileManagerBookInfo = require("apps/filemanager/filemanagerbookinfo")
local ImageViewer = require("ui/widget/imageviewer")
local InfoMessage = require("ui/widget/infomessage")
local Menu = require("ui/widget/menu")
local TextViewer = require("ui/widget/textviewer")
local UIManager = require("ui/uimanager")
local filemanagerutil = require("apps/filemanager/filemanagerutil")
local logger = require("logger")
local _ = require("gettext")
local util = require("util")
local BookInfoManager = require("bookinfomanager")
@ -270,48 +266,6 @@ function CoverMenu:updateItems(select_number)
UIManager:clearRenderStack()
-- Add some new buttons to original buttons set
table.insert(orig_buttons, {
{ -- Allow user to view real size cover in ImageViewer
text = _("View full size cover"),
enabled = bookinfo.has_cover and true or false,
callback = function()
local document = DocumentRegistry:openDocument(file)
if document then
if document.loadDocument then -- needed for crengine
document:loadDocument(false) -- load only metadata
end
local cover_bb = document:getCoverPageImage()
if cover_bb then
local imgviewer = ImageViewer:new{
image = cover_bb,
with_title_bar = false,
fullscreen = true,
}
UIManager:show(imgviewer)
else
UIManager:show(InfoMessage:new{
text = _("No cover image available."),
})
end
UIManager:close(self.file_dialog)
document:close()
end
end,
},
{ -- Allow user to directly view description in TextViewer
text = _("Book description"),
enabled = bookinfo.description and true or false,
callback = function()
local description = util.htmlToPlainTextIfHtml(bookinfo.description)
local textviewer = TextViewer:new{
title = _("Description:"),
text = description,
}
UIManager:close(self.file_dialog)
UIManager:show(textviewer)
end,
},
})
table.insert(orig_buttons, {
{ -- Allow user to ignore some offending cover image
text = bookinfo.ignore_cover and _("Unignore cover") or _("Ignore cover"),
@ -389,6 +343,21 @@ function CoverMenu:updateItems(select_number)
UIManager:close(self.file_dialog)
end
button = self.file_dialog.button_table:getButtonById("book_cover")
if not bookinfo.has_cover then
button:disable()
end
button = self.file_dialog.button_table:getButtonById("book_description")
if bookinfo.description then
button.callback = function()
UIManager:close(self.file_dialog)
FileManagerBookInfo:onShowBookDescription(bookinfo.description)
end
else
button:disable()
end
UIManager:show(self.file_dialog)
return true
end
@ -424,48 +393,6 @@ function CoverMenu:onHistoryMenuHold(item)
UIManager:clearRenderStack()
-- Add some new buttons to original buttons set
table.insert(orig_buttons, {
{ -- Allow user to view real size cover in ImageViewer
text = _("View full size cover"),
enabled = bookinfo.has_cover and true or false,
callback = function()
local document = DocumentRegistry:openDocument(file)
if document then
if document.loadDocument then -- needed for crengine
document:loadDocument(false) -- load only metadata
end
local cover_bb = document:getCoverPageImage()
if cover_bb then
local imgviewer = ImageViewer:new{
image = cover_bb,
with_title_bar = false,
fullscreen = true,
}
UIManager:show(imgviewer)
else
UIManager:show(InfoMessage:new{
text = _("No cover image available."),
})
end
UIManager:close(self.histfile_dialog)
document:close()
end
end,
},
{ -- Allow user to directly view description in TextViewer
text = _("Book description"),
enabled = bookinfo.description and true or false,
callback = function()
local description = util.htmlToPlainTextIfHtml(bookinfo.description)
local textviewer = TextViewer:new{
title = _("Description:"),
text = description,
}
UIManager:close(self.histfile_dialog)
UIManager:show(textviewer)
end,
},
})
table.insert(orig_buttons, {
{ -- Allow user to ignore some offending cover image
text = bookinfo.ignore_cover and _("Unignore cover") or _("Ignore cover"),
@ -537,11 +464,27 @@ function CoverMenu:onHistoryMenuHold(item)
end
-- Replace Book information callback to use directly our bookinfo
self.histfile_dialog.button_table:getButtonById("book_information").callback = function()
button = self.histfile_dialog.button_table:getButtonById("book_information")
button.callback = function()
FileManagerBookInfo:show(file, bookinfo)
UIManager:close(self.histfile_dialog)
end
button = self.histfile_dialog.button_table:getButtonById("book_cover")
if not bookinfo.has_cover then
button:disable()
end
button = self.histfile_dialog.button_table:getButtonById("book_description")
if bookinfo.description then
button.callback = function()
UIManager:close(self.histfile_dialog)
FileManagerBookInfo:onShowBookDescription(bookinfo.description)
end
else
button:disable()
end
UIManager:show(self.histfile_dialog)
return true
end
@ -570,48 +513,6 @@ function CoverMenu:onCollectionsMenuHold(item)
UIManager:clearRenderStack()
-- Add some new buttons to original buttons set
table.insert(orig_buttons, {
{ -- Allow user to view real size cover in ImageViewer
text = _("View full size cover"),
enabled = bookinfo.has_cover and true or false,
callback = function()
local document = DocumentRegistry:openDocument(file)
if document then
if document.loadDocument then -- needed for crengine
document:loadDocument(false) -- load only metadata
end
local cover_bb = document:getCoverPageImage()
if cover_bb then
local imgviewer = ImageViewer:new{
image = cover_bb,
with_title_bar = false,
fullscreen = true,
}
UIManager:show(imgviewer)
else
UIManager:show(InfoMessage:new{
text = _("No cover image available."),
})
end
UIManager:close(self.collfile_dialog)
document:close()
end
end,
},
{ -- Allow user to directly view description in TextViewer
text = _("Book description"),
enabled = bookinfo.description and true or false,
callback = function()
local description = util.htmlToPlainTextIfHtml(bookinfo.description)
local textviewer = TextViewer:new{
title = _("Description:"),
text = description,
}
UIManager:close(self.collfile_dialog)
UIManager:show(textviewer)
end,
},
})
table.insert(orig_buttons, {
{ -- Allow user to ignore some offending cover image
text = bookinfo.ignore_cover and _("Unignore cover") or _("Ignore cover"),
@ -683,11 +584,27 @@ function CoverMenu:onCollectionsMenuHold(item)
end
-- Replace Book information callback to use directly our bookinfo
self.collfile_dialog.button_table:getButtonById("book_information").callback = function()
button = self.collfile_dialog.button_table:getButtonById("book_information")
button.callback = function()
FileManagerBookInfo:show(file, bookinfo)
UIManager:close(self.collfile_dialog)
end
button = self.collfile_dialog.button_table:getButtonById("book_cover")
if not bookinfo.has_cover then
button:disable()
end
button = self.collfile_dialog.button_table:getButtonById("book_description")
if bookinfo.description then
button.callback = function()
UIManager:close(self.collfile_dialog)
FileManagerBookInfo:onShowBookDescription(bookinfo.description)
end
else
button:disable()
end
UIManager:show(self.collfile_dialog)
return true
end

Write Preview
Loading…
Cancel
Save