2017-08-17 17:34:36 +00:00
|
|
|
local DocumentRegistry = require("document/documentregistry")
|
2019-06-28 02:46:16 +00:00
|
|
|
local DocSettings = require("docsettings")
|
2017-08-17 17:34:36 +00:00
|
|
|
local FileManagerBookInfo = require("apps/filemanager/filemanagerbookinfo")
|
|
|
|
local ImageViewer = require("ui/widget/imageviewer")
|
2019-03-14 12:59:32 +00:00
|
|
|
local InfoMessage = require("ui/widget/infomessage")
|
2017-08-17 17:34:36 +00:00
|
|
|
local Menu = require("ui/widget/menu")
|
|
|
|
local TextViewer = require("ui/widget/textviewer")
|
|
|
|
local UIManager = require("ui/uimanager")
|
|
|
|
local logger = require("logger")
|
|
|
|
local _ = require("gettext")
|
|
|
|
|
|
|
|
local BookInfoManager = require("bookinfomanager")
|
|
|
|
|
|
|
|
-- This is a kind of "base class" for both MosaicMenu and ListMenu.
|
|
|
|
-- It implements the common code shared by these, mostly the non-UI
|
|
|
|
-- work : the updating of items and the management of backgrouns jobs.
|
|
|
|
--
|
|
|
|
-- Here are defined the common overriden methods of Menu:
|
|
|
|
-- :updateItems(select_number)
|
|
|
|
-- :onCloseWidget()
|
|
|
|
--
|
|
|
|
-- MosaicMenu or ListMenu should implement specific UI methods:
|
|
|
|
-- :_recalculateDimen()
|
|
|
|
-- :_updateItemsBuildUI()
|
|
|
|
-- This last method is called in the middle of :updateItems() , and
|
|
|
|
-- should fill self.item_group with some specific UI layout. It may add
|
|
|
|
-- not found item to self.items_to_update for us to update() them
|
|
|
|
-- regularly.
|
|
|
|
|
2018-03-14 17:14:52 +00:00
|
|
|
-- Store these as local, to be set by some object and re-used by
|
|
|
|
-- another object (as we plug the methods below to different objects,
|
|
|
|
-- we can't store them in 'self' if we want another one to use it)
|
|
|
|
local current_path = nil
|
|
|
|
local current_cover_specs = false
|
|
|
|
|
2017-08-17 17:34:36 +00:00
|
|
|
-- Simple holder of methods that will replace those
|
|
|
|
-- in the real Menu class or instance
|
|
|
|
local CoverMenu = {}
|
|
|
|
|
|
|
|
function CoverMenu:updateItems(select_number)
|
|
|
|
-- As done in Menu:updateItems()
|
|
|
|
local old_dimen = self.dimen and self.dimen:copy()
|
|
|
|
-- self.layout must be updated for focusmanager
|
|
|
|
self.layout = {}
|
|
|
|
self.item_group:free() -- avoid memory leaks by calling free() on all our sub-widgets
|
|
|
|
self.item_group:clear()
|
|
|
|
-- strange, best here if resetLayout() are done after _recalculateDimen(),
|
|
|
|
-- unlike what is done in menu.lua
|
|
|
|
self:_recalculateDimen()
|
|
|
|
self.page_info:resetLayout()
|
|
|
|
self.return_button:resetLayout()
|
|
|
|
-- default to select the first item
|
|
|
|
if not select_number then
|
|
|
|
select_number = 1
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Reset the list of items not found in db that will need to
|
|
|
|
-- be updated by a scheduled action
|
|
|
|
self.items_to_update = {}
|
|
|
|
-- Cancel any previous (now obsolete) scheduled update
|
|
|
|
if self.items_update_action then
|
|
|
|
UIManager:unschedule(self.items_update_action)
|
|
|
|
self.items_update_action = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Force garbage collecting before drawing a new page.
|
|
|
|
-- It's not really needed from a memory usage point of view, we did
|
|
|
|
-- all the free() where necessary, and koreader memory usage seems
|
|
|
|
-- stable when file browsing only (15-25 MB).
|
|
|
|
-- But I witnessed some freezes after browsing a lot when koreader's main
|
|
|
|
-- process was using 100% cpu (and some slow downs while drawing soon before
|
|
|
|
-- the freeze, like the full refresh happening before the final drawing of
|
|
|
|
-- new text covers), while still having a small memory usage (20/30 Mb)
|
|
|
|
-- that I suspect may be some garbage collecting happening at one point
|
|
|
|
-- and getting stuck...
|
|
|
|
-- With this, garbage collecting may be more deterministic, and it has
|
|
|
|
-- no negative impact on user experience.
|
|
|
|
collectgarbage()
|
|
|
|
collectgarbage()
|
|
|
|
|
|
|
|
-- Specific UI building implementation (defined in some other module)
|
Enable HW dithering in a few key places (#4541)
* Enable HW dithering on supported devices (Clara HD, Forma; Oasis 2, PW4)
* FileManager and co. (where appropriate, i.e., when covers are shown)
* Book Status
* Reader, where appropriate:
* CRe: on pages whith image content (for over 7.5% of the screen area, should hopefully leave stuff like bullet points or small scene breaks alone).
* Other engines: on user-request (in the gear tab of the bottom menu), via the new "Dithering" knob (will only appear on supported devices).
* ScreenSaver
* ImageViewer
* Minimize repaints when flash_ui is enabled (by, almost everywhere, only repainting the flashing element, and not the toplevel window which hosts it).
(The first pass of this involved fixing a few Button instances whose show_parent was wrong, in particular, chevrons in the FM & TopMenu).
* Hunted down a few redundant repaints (unneeded setDirty("all") calls),
either by switching the widget to nil when only a refresh was needed, and not a repaint,
or by passing the appropritate widget to setDirty.
(Note to self: Enable *verbose* debugging to catch broken setDirty calls via its post guard).
There were also a few instances of 'em right behind a widget close.
* Don't repaint the underlying widget when initially showing TopMenu & ConfigDialog.
We unfortunately do need to do it when switching tabs, because of their variable heights.
* On Kobo, disabled the extra and completely useless full refresh before suspend/reboot/poweroff, as well as on resume. No more double refreshes!
* Fix another debug guard in Kobo sysfs_light
* Switch ImageWidget & ImageViewer mostly to "ui" updates, which will be better suited to image content pretty much everywhere, REAGL or not.
PS: (Almost :100: commits! :D)
2019-02-07 00:14:37 +00:00
|
|
|
self._has_cover_images = false
|
2017-08-17 17:34:36 +00:00
|
|
|
self:_updateItemsBuildUI()
|
|
|
|
|
2018-03-14 17:14:52 +00:00
|
|
|
-- Set the local variables with the things we know
|
2019-03-13 18:05:50 +00:00
|
|
|
-- These are used only by extractBooksInDirectory(), which should
|
|
|
|
-- use the cover_specs set for FileBrowser, and not those from History.
|
|
|
|
-- Hopefully, we get self.path=nil when called fro History
|
|
|
|
if self.path then
|
|
|
|
current_path = self.path
|
|
|
|
current_cover_specs = self.cover_specs
|
|
|
|
end
|
2018-03-14 17:14:52 +00:00
|
|
|
|
2017-08-17 17:34:36 +00:00
|
|
|
-- As done in Menu:updateItems()
|
2018-04-06 09:53:11 +00:00
|
|
|
self:updatePageInfo(select_number)
|
2017-08-17 17:34:36 +00:00
|
|
|
|
2018-08-01 15:02:34 +00:00
|
|
|
if self.show_path then
|
|
|
|
self.path_text.text = self:truncatePath(self.path)
|
|
|
|
end
|
Enable HW dithering in a few key places (#4541)
* Enable HW dithering on supported devices (Clara HD, Forma; Oasis 2, PW4)
* FileManager and co. (where appropriate, i.e., when covers are shown)
* Book Status
* Reader, where appropriate:
* CRe: on pages whith image content (for over 7.5% of the screen area, should hopefully leave stuff like bullet points or small scene breaks alone).
* Other engines: on user-request (in the gear tab of the bottom menu), via the new "Dithering" knob (will only appear on supported devices).
* ScreenSaver
* ImageViewer
* Minimize repaints when flash_ui is enabled (by, almost everywhere, only repainting the flashing element, and not the toplevel window which hosts it).
(The first pass of this involved fixing a few Button instances whose show_parent was wrong, in particular, chevrons in the FM & TopMenu).
* Hunted down a few redundant repaints (unneeded setDirty("all") calls),
either by switching the widget to nil when only a refresh was needed, and not a repaint,
or by passing the appropritate widget to setDirty.
(Note to self: Enable *verbose* debugging to catch broken setDirty calls via its post guard).
There were also a few instances of 'em right behind a widget close.
* Don't repaint the underlying widget when initially showing TopMenu & ConfigDialog.
We unfortunately do need to do it when switching tabs, because of their variable heights.
* On Kobo, disabled the extra and completely useless full refresh before suspend/reboot/poweroff, as well as on resume. No more double refreshes!
* Fix another debug guard in Kobo sysfs_light
* Switch ImageWidget & ImageViewer mostly to "ui" updates, which will be better suited to image content pretty much everywhere, REAGL or not.
PS: (Almost :100: commits! :D)
2019-02-07 00:14:37 +00:00
|
|
|
self.show_parent.dithered = self._has_cover_images
|
|
|
|
UIManager:setDirty(self.show_parent, function()
|
2017-08-17 17:34:36 +00:00
|
|
|
local refresh_dimen =
|
|
|
|
old_dimen and old_dimen:combine(self.dimen)
|
|
|
|
or self.dimen
|
2019-04-12 15:57:22 +00:00
|
|
|
return "ui", refresh_dimen, self.show_parent.dithered
|
2017-08-17 17:34:36 +00:00
|
|
|
end)
|
|
|
|
|
|
|
|
-- As additionally done in FileChooser:updateItems()
|
|
|
|
if self.path_items then
|
|
|
|
self.path_items[self.path] = (self.page - 1) * self.perpage + (select_number or 1)
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Deal with items not found in db
|
|
|
|
if #self.items_to_update > 0 then
|
|
|
|
-- Prepare for background info extraction job
|
|
|
|
local files_to_index = {} -- table of {filepath, cover_specs}
|
|
|
|
for i=1, #self.items_to_update do
|
|
|
|
table.insert(files_to_index, {
|
|
|
|
filepath = self.items_to_update[i].filepath,
|
|
|
|
cover_specs = self.items_to_update[i].cover_specs
|
|
|
|
})
|
|
|
|
end
|
|
|
|
-- Launch it at nextTick, so UIManager can render us smoothly
|
|
|
|
UIManager:nextTick(function()
|
|
|
|
local launched = BookInfoManager:extractInBackground(files_to_index)
|
|
|
|
if not launched then -- fork failed (never experienced that, but let's deal with it)
|
|
|
|
-- Cancel scheduled update, as it won't get any result
|
|
|
|
if self.items_update_action then
|
|
|
|
UIManager:unschedule(self.items_update_action)
|
|
|
|
self.items_update_action = nil
|
|
|
|
end
|
|
|
|
UIManager:show(InfoMessage:new{
|
|
|
|
text = _("Start-up of background extraction job failed.\nPlease restart KOReader or your device.")
|
|
|
|
})
|
|
|
|
end
|
|
|
|
end)
|
|
|
|
|
|
|
|
-- Scheduled update action
|
|
|
|
self.items_update_action = function()
|
|
|
|
logger.dbg("Scheduled items update:", #self.items_to_update, "waiting")
|
|
|
|
local is_still_extracting = BookInfoManager:isExtractingInBackground()
|
|
|
|
local i = 1
|
|
|
|
while i <= #self.items_to_update do -- process and clean in-place
|
|
|
|
local item = self.items_to_update[i]
|
|
|
|
item:update()
|
|
|
|
if item.bookinfo_found then
|
|
|
|
logger.dbg(" found", item.text)
|
Enable HW dithering in a few key places (#4541)
* Enable HW dithering on supported devices (Clara HD, Forma; Oasis 2, PW4)
* FileManager and co. (where appropriate, i.e., when covers are shown)
* Book Status
* Reader, where appropriate:
* CRe: on pages whith image content (for over 7.5% of the screen area, should hopefully leave stuff like bullet points or small scene breaks alone).
* Other engines: on user-request (in the gear tab of the bottom menu), via the new "Dithering" knob (will only appear on supported devices).
* ScreenSaver
* ImageViewer
* Minimize repaints when flash_ui is enabled (by, almost everywhere, only repainting the flashing element, and not the toplevel window which hosts it).
(The first pass of this involved fixing a few Button instances whose show_parent was wrong, in particular, chevrons in the FM & TopMenu).
* Hunted down a few redundant repaints (unneeded setDirty("all") calls),
either by switching the widget to nil when only a refresh was needed, and not a repaint,
or by passing the appropritate widget to setDirty.
(Note to self: Enable *verbose* debugging to catch broken setDirty calls via its post guard).
There were also a few instances of 'em right behind a widget close.
* Don't repaint the underlying widget when initially showing TopMenu & ConfigDialog.
We unfortunately do need to do it when switching tabs, because of their variable heights.
* On Kobo, disabled the extra and completely useless full refresh before suspend/reboot/poweroff, as well as on resume. No more double refreshes!
* Fix another debug guard in Kobo sysfs_light
* Switch ImageWidget & ImageViewer mostly to "ui" updates, which will be better suited to image content pretty much everywhere, REAGL or not.
PS: (Almost :100: commits! :D)
2019-02-07 00:14:37 +00:00
|
|
|
self.show_parent.dithered = item._has_cover_image
|
2017-08-17 17:34:36 +00:00
|
|
|
local refreshfunc = function()
|
|
|
|
if item.refresh_dimen then
|
|
|
|
-- MosaicMenuItem may exceed its own dimen in its paintTo
|
|
|
|
-- with its "description" hint
|
Enable HW dithering in a few key places (#4541)
* Enable HW dithering on supported devices (Clara HD, Forma; Oasis 2, PW4)
* FileManager and co. (where appropriate, i.e., when covers are shown)
* Book Status
* Reader, where appropriate:
* CRe: on pages whith image content (for over 7.5% of the screen area, should hopefully leave stuff like bullet points or small scene breaks alone).
* Other engines: on user-request (in the gear tab of the bottom menu), via the new "Dithering" knob (will only appear on supported devices).
* ScreenSaver
* ImageViewer
* Minimize repaints when flash_ui is enabled (by, almost everywhere, only repainting the flashing element, and not the toplevel window which hosts it).
(The first pass of this involved fixing a few Button instances whose show_parent was wrong, in particular, chevrons in the FM & TopMenu).
* Hunted down a few redundant repaints (unneeded setDirty("all") calls),
either by switching the widget to nil when only a refresh was needed, and not a repaint,
or by passing the appropritate widget to setDirty.
(Note to self: Enable *verbose* debugging to catch broken setDirty calls via its post guard).
There were also a few instances of 'em right behind a widget close.
* Don't repaint the underlying widget when initially showing TopMenu & ConfigDialog.
We unfortunately do need to do it when switching tabs, because of their variable heights.
* On Kobo, disabled the extra and completely useless full refresh before suspend/reboot/poweroff, as well as on resume. No more double refreshes!
* Fix another debug guard in Kobo sysfs_light
* Switch ImageWidget & ImageViewer mostly to "ui" updates, which will be better suited to image content pretty much everywhere, REAGL or not.
PS: (Almost :100: commits! :D)
2019-02-07 00:14:37 +00:00
|
|
|
return "ui", item.refresh_dimen, self.show_parent.dithered
|
2017-08-17 17:34:36 +00:00
|
|
|
else
|
Enable HW dithering in a few key places (#4541)
* Enable HW dithering on supported devices (Clara HD, Forma; Oasis 2, PW4)
* FileManager and co. (where appropriate, i.e., when covers are shown)
* Book Status
* Reader, where appropriate:
* CRe: on pages whith image content (for over 7.5% of the screen area, should hopefully leave stuff like bullet points or small scene breaks alone).
* Other engines: on user-request (in the gear tab of the bottom menu), via the new "Dithering" knob (will only appear on supported devices).
* ScreenSaver
* ImageViewer
* Minimize repaints when flash_ui is enabled (by, almost everywhere, only repainting the flashing element, and not the toplevel window which hosts it).
(The first pass of this involved fixing a few Button instances whose show_parent was wrong, in particular, chevrons in the FM & TopMenu).
* Hunted down a few redundant repaints (unneeded setDirty("all") calls),
either by switching the widget to nil when only a refresh was needed, and not a repaint,
or by passing the appropritate widget to setDirty.
(Note to self: Enable *verbose* debugging to catch broken setDirty calls via its post guard).
There were also a few instances of 'em right behind a widget close.
* Don't repaint the underlying widget when initially showing TopMenu & ConfigDialog.
We unfortunately do need to do it when switching tabs, because of their variable heights.
* On Kobo, disabled the extra and completely useless full refresh before suspend/reboot/poweroff, as well as on resume. No more double refreshes!
* Fix another debug guard in Kobo sysfs_light
* Switch ImageWidget & ImageViewer mostly to "ui" updates, which will be better suited to image content pretty much everywhere, REAGL or not.
PS: (Almost :100: commits! :D)
2019-02-07 00:14:37 +00:00
|
|
|
return "ui", item[1].dimen, self.show_parent.dithered
|
2017-08-17 17:34:36 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
UIManager:setDirty(self.show_parent, refreshfunc)
|
|
|
|
table.remove(self.items_to_update, i)
|
|
|
|
else
|
|
|
|
logger.dbg(" not yet found", item.text)
|
|
|
|
i = i + 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if #self.items_to_update > 0 then -- re-schedule myself
|
|
|
|
if is_still_extracting then -- we have still chances to get new stuff
|
|
|
|
logger.dbg("re-scheduling items update:", #self.items_to_update, "still waiting")
|
|
|
|
UIManager:scheduleIn(1, self.items_update_action)
|
|
|
|
else
|
|
|
|
logger.dbg("Not all items found, but background extraction has stopped, not re-scheduling")
|
|
|
|
end
|
|
|
|
else
|
|
|
|
logger.dbg("items update completed")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
UIManager:scheduleIn(1, self.items_update_action)
|
|
|
|
end
|
|
|
|
|
|
|
|
-- (We may not need to do the following if we extend onFileHold
|
|
|
|
-- code in filemanager.lua to check for existence and call a
|
|
|
|
-- method: self:getAdditionalButtons() to add our buttons
|
|
|
|
-- to its own set.)
|
|
|
|
|
|
|
|
-- We want to add some buttons to the onFileHold popup. This function
|
|
|
|
-- is dynamically created by FileManager:init(), and we don't want
|
|
|
|
-- to override this... So, here, when we see the onFileHold function,
|
|
|
|
-- we replace it by ours.
|
|
|
|
-- (FileManager may replace file_chooser.onFileHold after we've been called once, so we need
|
|
|
|
-- to replace it again if it is not ours)
|
|
|
|
if not self.onFileHold_ours -- never replaced
|
|
|
|
or self.onFileHold ~= self.onFileHold_ours then -- it is no more ours
|
2017-10-21 17:55:29 +00:00
|
|
|
-- We need to do it at nextTick, once FileManager has instantiated
|
|
|
|
-- its FileChooser completely
|
|
|
|
UIManager:nextTick(function()
|
|
|
|
-- Store original function, so we can call it
|
|
|
|
self.onFileHold_orig = self.onFileHold
|
|
|
|
|
|
|
|
-- Replace it with ours
|
|
|
|
-- This causes luacheck warning: "shadowing upvalue argument 'self' on line 34".
|
|
|
|
-- Ignoring it (as done in filemanager.lua for the same onFileHold)
|
|
|
|
self.onFileHold = function(self, file) -- luacheck: ignore
|
|
|
|
-- Call original function: it will create a ButtonDialogTitle
|
|
|
|
-- and store it as self.file_dialog, and UIManager:show() it.
|
|
|
|
self.onFileHold_orig(self, file)
|
|
|
|
|
|
|
|
local bookinfo = BookInfoManager:getBookInfo(file)
|
|
|
|
if not bookinfo then
|
|
|
|
-- If no bookinfo (yet) about this file, let the original dialog be
|
|
|
|
return true
|
|
|
|
end
|
2017-08-17 17:34:36 +00:00
|
|
|
|
2017-10-21 17:55:29 +00:00
|
|
|
-- Remember some of this original ButtonDialogTitle properties
|
|
|
|
local orig_title = self.file_dialog.title
|
|
|
|
local orig_title_align = self.file_dialog.title_align
|
|
|
|
local orig_buttons = self.file_dialog.buttons
|
|
|
|
-- Close original ButtonDialogTitle (it has not yet been painted
|
|
|
|
-- on screen, so we won't see it)
|
2017-08-17 17:34:36 +00:00
|
|
|
UIManager:close(self.file_dialog)
|
2018-06-02 16:10:55 +00:00
|
|
|
-- And clear the rendering stack to avoid inheriting its dirty/refresh queue
|
|
|
|
UIManager:clearRenderStack()
|
2017-08-17 17:34:36 +00:00
|
|
|
|
2017-10-21 17:55:29 +00:00
|
|
|
-- Replace Book information callback to use directly our bookinfo
|
2018-03-16 23:28:37 +00:00
|
|
|
orig_buttons[4][3].callback = function()
|
2017-10-21 17:55:29 +00:00
|
|
|
FileManagerBookInfo:show(file, bookinfo)
|
|
|
|
UIManager:close(self.file_dialog)
|
|
|
|
end
|
|
|
|
|
2019-06-28 02:46:16 +00:00
|
|
|
-- Fudge the "Purge .sdr" button ([1][3]) callback to also trash the cover_info_cache
|
|
|
|
local orig_purge_callback = orig_buttons[1][3].callback
|
|
|
|
orig_buttons[1][3].callback = function()
|
|
|
|
-- Wipe the cache
|
2019-06-28 18:25:44 +00:00
|
|
|
if self.cover_info_cache and self.cover_info_cache[file] then
|
2019-06-28 02:46:16 +00:00
|
|
|
self.cover_info_cache[file] = nil
|
|
|
|
end
|
|
|
|
-- And then purge the sidecar folder as expected
|
|
|
|
orig_purge_callback()
|
|
|
|
end
|
|
|
|
|
2017-10-21 17:55:29 +00:00
|
|
|
-- Add some new buttons to original buttons set
|
2019-06-28 02:46:16 +00:00
|
|
|
table.insert(orig_buttons, {
|
|
|
|
{ -- Mark the book as read/unread
|
|
|
|
text_func = function()
|
|
|
|
-- If the book has a cache entry, it means it has a sidecar file, and it *may* have the info we need.
|
|
|
|
local status
|
2019-06-28 18:25:44 +00:00
|
|
|
if self.cover_info_cache and self.cover_info_cache[file] then
|
2019-06-28 02:46:16 +00:00
|
|
|
local _, _, c_status = unpack(self.cover_info_cache[file])
|
|
|
|
status = c_status
|
|
|
|
end
|
|
|
|
-- NOTE: status may still be nil if the BookStatus widget was never opened in this book.
|
|
|
|
-- For our purposes, we assume this means reading or on hold, which is just fine.
|
|
|
|
-- NOTE: This also means we assume "on hold" means reading, meaning it'll be flipped to "finished",
|
|
|
|
-- which I'm personally okay with, too.
|
|
|
|
-- c.f., BookStatusWidget:generateSwitchGroup for the three possible constant values.
|
|
|
|
return status == "complete" and _("Mark as reading") or _("Mark as read")
|
|
|
|
end,
|
|
|
|
enabled = true,
|
|
|
|
callback = function()
|
|
|
|
local status
|
2019-06-28 18:25:44 +00:00
|
|
|
if self.cover_info_cache and self.cover_info_cache[file] then
|
2019-06-28 02:46:16 +00:00
|
|
|
local c_pages, c_percent_finished, c_status = unpack(self.cover_info_cache[file])
|
|
|
|
status = c_status == "complete" and "reading" or "complete"
|
|
|
|
-- Update the cache, even if it had a nil status before
|
|
|
|
self.cover_info_cache[file] = {c_pages, c_percent_finished, status}
|
|
|
|
else
|
|
|
|
-- We assumed earlier an empty status meant "reading", so, flip that to "complete"
|
|
|
|
status = "complete"
|
|
|
|
end
|
|
|
|
|
|
|
|
-- In case the book doesn't have a sidecar file, this'll create it
|
|
|
|
local docinfo = DocSettings:open(file)
|
|
|
|
if docinfo.data.summary and docinfo.data.summary.status then
|
|
|
|
-- Book already had the full BookStatus table in its sidecar, easy peasy!
|
|
|
|
docinfo.data.summary.status = status
|
|
|
|
else
|
|
|
|
-- No BookStatus table, create a minimal one...
|
|
|
|
if docinfo.data.summary then
|
|
|
|
-- Err, a summary table with no status entry? Should never happen...
|
|
|
|
local summary = { status = status }
|
|
|
|
-- Append the status entry to the existing summary...
|
|
|
|
require("util").tableMerge(docinfo.data.summary, summary)
|
|
|
|
else
|
|
|
|
-- No summary table at all, create a minimal one
|
|
|
|
local summary = { status = status }
|
|
|
|
docinfo:saveSetting("summary", summary)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
docinfo:flush()
|
|
|
|
|
|
|
|
UIManager:close(self.file_dialog)
|
|
|
|
self:updateItems()
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
-- Move the "Convert" button ([4][2]) to the left of the "Mark as..." button [5][1] we've just added
|
|
|
|
table.insert(orig_buttons[5], 1, table.remove(orig_buttons[4], 2))
|
|
|
|
|
|
|
|
-- Keep on adding new buttons
|
2017-10-21 17:55:29 +00:00
|
|
|
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
|
2019-03-14 12:59:32 +00:00
|
|
|
if document.loadDocument then -- needed for crengine
|
|
|
|
document:loadDocument(false) -- load only metadata
|
|
|
|
end
|
2017-10-21 17:55:29 +00:00
|
|
|
local cover_bb = document:getCoverPageImage()
|
2019-03-14 12:59:32 +00:00
|
|
|
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
|
2017-10-21 17:55:29 +00:00
|
|
|
UIManager:close(self.file_dialog)
|
|
|
|
DocumentRegistry:closeDocument(file)
|
|
|
|
end
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
{ -- Allow user to directly view description in TextViewer
|
|
|
|
text = bookinfo.description and _("View book description") or _("No book description"),
|
|
|
|
enabled = bookinfo.description and true or false,
|
|
|
|
callback = function()
|
|
|
|
local description = require("util").htmlToPlainTextIfHtml(bookinfo.description)
|
|
|
|
local textviewer = TextViewer:new{
|
|
|
|
title = bookinfo.title,
|
|
|
|
text = description,
|
2017-08-17 17:34:36 +00:00
|
|
|
}
|
|
|
|
UIManager:close(self.file_dialog)
|
2019-06-28 02:46:16 +00:00
|
|
|
UIManager:show(textviewer)
|
2017-10-21 17:55:29 +00:00
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
table.insert(orig_buttons, {
|
|
|
|
{ -- Allow user to ignore some offending cover image
|
|
|
|
text = bookinfo.ignore_cover and _("Unignore cover") or _("Ignore cover"),
|
|
|
|
enabled = bookinfo.has_cover and true or false,
|
|
|
|
callback = function()
|
|
|
|
BookInfoManager:setBookInfoProperties(file, {
|
|
|
|
["ignore_cover"] = not bookinfo.ignore_cover and 'Y' or false,
|
|
|
|
})
|
|
|
|
UIManager:close(self.file_dialog)
|
|
|
|
self:updateItems()
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
{ -- Allow user to ignore some bad metadata (filename will be used instead)
|
|
|
|
text = bookinfo.ignore_meta and _("Unignore metadata") or _("Ignore metadata"),
|
|
|
|
enabled = bookinfo.has_meta and true or false,
|
|
|
|
callback = function()
|
|
|
|
BookInfoManager:setBookInfoProperties(file, {
|
|
|
|
["ignore_meta"] = not bookinfo.ignore_meta and 'Y' or false,
|
|
|
|
})
|
|
|
|
UIManager:close(self.file_dialog)
|
|
|
|
self:updateItems()
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
table.insert(orig_buttons, {
|
|
|
|
{ -- Allow a new extraction (multiple interruptions, book replaced)...
|
|
|
|
text = _("Refresh cached book information"),
|
|
|
|
enabled = bookinfo and true or false,
|
|
|
|
callback = function()
|
2019-06-28 02:46:16 +00:00
|
|
|
-- Wipe the cache
|
2019-06-28 18:25:44 +00:00
|
|
|
if self.cover_info_cache and self.cover_info_cache[file] then
|
2019-06-28 02:46:16 +00:00
|
|
|
self.cover_info_cache[file] = nil
|
|
|
|
end
|
2017-10-21 17:55:29 +00:00
|
|
|
BookInfoManager:deleteBookInfo(file)
|
|
|
|
UIManager:close(self.file_dialog)
|
|
|
|
self:updateItems()
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
2017-08-17 17:34:36 +00:00
|
|
|
|
2017-10-21 17:55:29 +00:00
|
|
|
-- Create the new ButtonDialogTitle, and let UIManager show it
|
|
|
|
local ButtonDialogTitle = require("ui/widget/buttondialogtitle")
|
|
|
|
self.file_dialog = ButtonDialogTitle:new{
|
|
|
|
title = orig_title,
|
|
|
|
title_align = orig_title_align,
|
|
|
|
buttons = orig_buttons,
|
|
|
|
}
|
|
|
|
UIManager:show(self.file_dialog)
|
|
|
|
return true
|
|
|
|
end
|
2017-08-17 17:34:36 +00:00
|
|
|
|
2017-10-21 17:55:29 +00:00
|
|
|
-- Remember our function
|
|
|
|
self.onFileHold_ours = self.onFileHold
|
|
|
|
end)
|
2017-08-17 17:34:36 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Similar to onFileHold setup just above, but for History,
|
|
|
|
-- which is plugged in main.lua _FileManagerHistory_updateItemTable()
|
|
|
|
function CoverMenu:onHistoryMenuHold(item)
|
|
|
|
-- Call original function: it will create a ButtonDialog
|
|
|
|
-- and store it as self.histfile_dialog, and UIManager:show() it.
|
|
|
|
self.onMenuHold_orig(self, item)
|
|
|
|
local file = item.file
|
|
|
|
|
|
|
|
local bookinfo = BookInfoManager:getBookInfo(file)
|
|
|
|
if not bookinfo then
|
|
|
|
-- If no bookinfo (yet) about this file, let the original dialog be
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
2017-09-22 16:24:38 +00:00
|
|
|
-- Remember some of this original ButtonDialogTitle properties
|
|
|
|
local orig_title = self.histfile_dialog.title
|
|
|
|
local orig_title_align = self.histfile_dialog.title_align
|
2017-08-17 17:34:36 +00:00
|
|
|
local orig_buttons = self.histfile_dialog.buttons
|
|
|
|
-- Close original ButtonDialog (it has not yet been painted
|
|
|
|
-- on screen, so we won't see it)
|
|
|
|
UIManager:close(self.histfile_dialog)
|
2018-06-02 16:10:55 +00:00
|
|
|
UIManager:clearRenderStack()
|
2017-08-17 17:34:36 +00:00
|
|
|
|
|
|
|
-- Replace Book information callback to use directly our bookinfo
|
2017-09-22 16:24:38 +00:00
|
|
|
orig_buttons[2][2].callback = function()
|
2017-08-17 17:34:36 +00:00
|
|
|
FileManagerBookInfo:show(file, bookinfo)
|
|
|
|
UIManager:close(self.histfile_dialog)
|
|
|
|
end
|
2017-09-22 16:24:38 +00:00
|
|
|
|
|
|
|
-- Remove last button ("Clear history of deleted files"), we'll
|
|
|
|
-- add it back after our buttons
|
|
|
|
local last_button = table.remove(orig_buttons)
|
2017-08-17 17:34:36 +00:00
|
|
|
|
|
|
|
-- 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
|
2019-03-14 12:59:32 +00:00
|
|
|
if document.loadDocument then -- needed for crengine
|
|
|
|
document:loadDocument(false) -- load only metadata
|
|
|
|
end
|
2017-08-17 17:34:36 +00:00
|
|
|
local cover_bb = document:getCoverPageImage()
|
2019-03-14 12:59:32 +00:00
|
|
|
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
|
2017-08-17 17:34:36 +00:00
|
|
|
UIManager:close(self.histfile_dialog)
|
|
|
|
DocumentRegistry:closeDocument(file)
|
|
|
|
end
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
{ -- Allow user to directly view description in TextViewer
|
|
|
|
text = bookinfo.description and _("View book description") or _("No book description"),
|
|
|
|
enabled = bookinfo.description and true or false,
|
|
|
|
callback = function()
|
|
|
|
local description = require("util").htmlToPlainTextIfHtml(bookinfo.description)
|
|
|
|
local textviewer = TextViewer:new{
|
|
|
|
title = bookinfo.title,
|
|
|
|
text = description,
|
|
|
|
}
|
|
|
|
UIManager:close(self.histfile_dialog)
|
2019-06-28 02:46:16 +00:00
|
|
|
UIManager:show(textviewer)
|
2017-08-17 17:34:36 +00:00
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
table.insert(orig_buttons, {
|
|
|
|
{ -- Allow user to ignore some offending cover image
|
|
|
|
text = bookinfo.ignore_cover and _("Unignore cover") or _("Ignore cover"),
|
|
|
|
enabled = bookinfo.has_cover and true or false,
|
|
|
|
callback = function()
|
|
|
|
BookInfoManager:setBookInfoProperties(file, {
|
|
|
|
["ignore_cover"] = not bookinfo.ignore_cover and 'Y' or false,
|
|
|
|
})
|
|
|
|
UIManager:close(self.histfile_dialog)
|
|
|
|
self:updateItems()
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
{ -- Allow user to ignore some bad metadata (filename will be used instead)
|
|
|
|
text = bookinfo.ignore_meta and _("Unignore metadata") or _("Ignore metadata"),
|
|
|
|
enabled = bookinfo.has_meta and true or false,
|
|
|
|
callback = function()
|
|
|
|
BookInfoManager:setBookInfoProperties(file, {
|
|
|
|
["ignore_meta"] = not bookinfo.ignore_meta and 'Y' or false,
|
|
|
|
})
|
|
|
|
UIManager:close(self.histfile_dialog)
|
|
|
|
self:updateItems()
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
table.insert(orig_buttons, {
|
|
|
|
{ -- Allow a new extraction (multiple interruptions, book replaced)...
|
|
|
|
text = _("Refresh cached book information"),
|
|
|
|
enabled = bookinfo and true or false,
|
|
|
|
callback = function()
|
|
|
|
BookInfoManager:deleteBookInfo(file)
|
|
|
|
UIManager:close(self.histfile_dialog)
|
|
|
|
self:updateItems()
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
2017-09-22 16:24:38 +00:00
|
|
|
table.insert(orig_buttons, {}) -- separator
|
|
|
|
-- Put back "Clear history of deleted files"
|
|
|
|
table.insert(orig_buttons, last_button)
|
2017-08-17 17:34:36 +00:00
|
|
|
|
|
|
|
-- Create the new ButtonDialog, and let UIManager show it
|
2017-09-22 16:24:38 +00:00
|
|
|
local ButtonDialogTitle = require("ui/widget/buttondialogtitle")
|
|
|
|
self.histfile_dialog = ButtonDialogTitle:new{
|
|
|
|
title = orig_title,
|
|
|
|
title_align = orig_title_align,
|
2017-08-17 17:34:36 +00:00
|
|
|
buttons = orig_buttons,
|
|
|
|
}
|
|
|
|
UIManager:show(self.histfile_dialog)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function CoverMenu:onCloseWidget()
|
|
|
|
-- Due to close callback in FileManagerHistory:onShowHist, we may be called
|
|
|
|
-- multiple times (witnessed that with print(debug.traceback())
|
|
|
|
|
|
|
|
-- Stop background job if any (so that full cpu is available to reader)
|
|
|
|
logger.dbg("CoverMenu:onCloseWidget: terminating jobs if needed")
|
|
|
|
BookInfoManager:terminateBackgroundJobs()
|
|
|
|
BookInfoManager:closeDbConnection() -- sqlite connection no more needed
|
2017-09-30 16:02:35 +00:00
|
|
|
BookInfoManager:cleanUp() -- clean temporary resources
|
2017-08-17 17:34:36 +00:00
|
|
|
|
|
|
|
-- Cancel any still scheduled update
|
|
|
|
if self.items_update_action then
|
|
|
|
logger.dbg("CoverMenu:onCloseWidget: unscheduling items_update_action")
|
|
|
|
UIManager:unschedule(self.items_update_action)
|
|
|
|
self.items_update_action = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Propagate a call to free() to all our sub-widgets, to release memory used by their _bb
|
|
|
|
self.item_group:free()
|
|
|
|
|
2017-10-21 17:55:29 +00:00
|
|
|
-- Clean any short term cache (used by ListMenu to cache some DocSettings info)
|
|
|
|
self.cover_info_cache = nil
|
|
|
|
|
2017-08-17 17:34:36 +00:00
|
|
|
-- Force garbage collecting when leaving too
|
|
|
|
collectgarbage()
|
|
|
|
collectgarbage()
|
|
|
|
|
|
|
|
-- Call original Menu:onCloseWidget (no subclass seems to override it)
|
|
|
|
Menu.onCloseWidget(self)
|
|
|
|
end
|
|
|
|
|
2018-03-14 17:14:52 +00:00
|
|
|
function CoverMenu:tapPlus()
|
|
|
|
-- Call original function: it will create a ButtonDialogTitle
|
|
|
|
-- and store it as self.file_dialog, and UIManager:show() it.
|
|
|
|
CoverMenu._FileManager_tapPlus_orig(self)
|
|
|
|
|
|
|
|
-- Remember some of this original ButtonDialogTitle properties
|
|
|
|
local orig_title = self.file_dialog.title
|
|
|
|
local orig_title_align = self.file_dialog.title_align
|
|
|
|
local orig_buttons = self.file_dialog.buttons
|
|
|
|
-- Close original ButtonDialogTitle (it has not yet been painted
|
|
|
|
-- on screen, so we won't see it)
|
|
|
|
UIManager:close(self.file_dialog)
|
2018-06-02 16:10:55 +00:00
|
|
|
UIManager:clearRenderStack()
|
2018-03-14 17:14:52 +00:00
|
|
|
|
|
|
|
-- Add a new button to original buttons set
|
|
|
|
table.insert(orig_buttons, {}) -- separator
|
|
|
|
table.insert(orig_buttons, {
|
|
|
|
{
|
|
|
|
text = _("Extract and cache book information"),
|
|
|
|
callback = function()
|
|
|
|
UIManager:close(self.file_dialog)
|
|
|
|
local Trapper = require("ui/trapper")
|
|
|
|
Trapper:wrap(function()
|
|
|
|
BookInfoManager:extractBooksInDirectory(current_path, current_cover_specs)
|
|
|
|
end)
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
-- Create the new ButtonDialogTitle, and let UIManager show it
|
|
|
|
local ButtonDialogTitle = require("ui/widget/buttondialogtitle")
|
|
|
|
self.file_dialog = ButtonDialogTitle:new{
|
|
|
|
title = orig_title,
|
|
|
|
title_align = orig_title_align,
|
|
|
|
buttons = orig_buttons,
|
|
|
|
}
|
|
|
|
UIManager:show(self.file_dialog)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
2017-08-17 17:34:36 +00:00
|
|
|
return CoverMenu
|