renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FileManager: don't load already loaded plugins (#6958)

Browse Source 
FileManager:init is called by FileManager:reinit, which caused duplicate
loads. Those can't be useful, (for example to re-load a modified plugin
on runtime), as PluginLoader:loadPlugins memoizes loaded plugins.
This commit is contained in:
jperon
2020-12-07 20:29:03 +01:00
committed by GitHub
parent c20ad8f5e9
commit 53a7067c24
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/apps/filemanager/filemanager.lua
View File

@@ -479,19 +479,22 @@ function FileManager:init()
table.insert(self, DeviceListener:new{ ui = self })
-- koreader plugins
for _,plugin_module in ipairs(PluginLoader:loadPlugins()) do
if not plugin_module.is_doc_only then
local ok, plugin_or_err = PluginLoader:createPluginInstance(
plugin_module, { ui = self, })
-- Keep references to the modules which do not register into menu.
if ok then
local name = plugin_module.name
if name then self[name] = plugin_or_err end
table.insert(self, plugin_or_err)
logger.info("FM loaded plugin", name,
"at", plugin_module.path)
if not self._plugins_loaded then
for _,plugin_module in ipairs(PluginLoader:loadPlugins()) do
if not plugin_module.is_doc_only then
local ok, plugin_or_err = PluginLoader:createPluginInstance(
plugin_module, { ui = self, })
-- Keep references to the modules which do not register into menu.
if ok then
local name = plugin_module.name
if name then self[name] = plugin_or_err end
table.insert(self, plugin_or_err)
logger.info("FM loaded plugin", name,
"at", plugin_module.path)
end
end
end
self._plugins_loaded = true
end
if Device:hasWifiToggle() then