From e7377cd20e352bf762cbf5d0cee09505c6df7b6a Mon Sep 17 00:00:00 2001 From: poire-z Date: Mon, 29 Jan 2018 09:46:50 +0100 Subject: [PATCH] Dict & wiki history: use filename when no book title (#3635) --- frontend/apps/reader/modules/readerdictionary.lua | 6 ++++++ frontend/apps/reader/modules/readerwikipedia.lua | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/frontend/apps/reader/modules/readerdictionary.lua b/frontend/apps/reader/modules/readerdictionary.lua index ec0513cf1..f07c0b3b0 100644 --- a/frontend/apps/reader/modules/readerdictionary.lua +++ b/frontend/apps/reader/modules/readerdictionary.lua @@ -611,6 +611,12 @@ function ReaderDictionary:stardictLookup(word, dict_names, fuzzy_search, box, li if not self.disable_lookup_history then local book_title = self.ui.doc_settings and self.ui.doc_settings:readSetting("doc_props").title or _("Dictionary lookup") + if book_title == "" then -- no or empty metadata title + if self.ui.document and self.ui.document.file then + local directory, filename = util.splitFilePathName(self.ui.document.file) -- luacheck: no unused + book_title = util.splitFileNameSuffix(filename) + end + end lookup_history:addTableItem("lookup_history", { book_title = book_title, time = os.time(), diff --git a/frontend/apps/reader/modules/readerwikipedia.lua b/frontend/apps/reader/modules/readerwikipedia.lua index ad2305281..59bcb7ba5 100644 --- a/frontend/apps/reader/modules/readerwikipedia.lua +++ b/frontend/apps/reader/modules/readerwikipedia.lua @@ -379,6 +379,12 @@ function ReaderWikipedia:lookupWikipedia(word, box, get_fullpage, forced_lang) if not self.disable_history then local book_title = self.ui.doc_settings and self.ui.doc_settings:readSetting("doc_props").title or _("Wikipedia lookup") + if book_title == "" then -- no or empty metadata title + if self.ui.document and self.ui.document.file then + local directory, filename = util.splitFilePathName(self.ui.document.file) -- luacheck: no unused + book_title = util.splitFileNameSuffix(filename) + end + end wikipedia_history:addTableItem("wikipedia_history", { book_title = book_title, time = os.time(),