[Fix] Don't load disabled plugins (#4169)

frontend/pluginloader.lua

@@ -70,6 +70,10 @@ function PluginLoader:loadPlugins()
             -- valid koreader plugin directory
             if mode == "directory" and entry:find(".+%.koplugin$") then
                 local mainfile = plugin_root.."/main.lua"
+                local metafile = plugin_root.."/_meta.lua"
+                if plugins_disabled and plugins_disabled[entry:sub(1, -10)] then
+                    mainfile = metafile
+                end
                 package.path = string.format("%s/?.lua;%s", plugin_root, package_path)
                 package.cpath = string.format("%s/lib/?.so;%s", plugin_root, package_cpath)
                 local ok, plugin_module = pcall(dofile, mainfile)
@@ -81,6 +85,10 @@ function PluginLoader:loadPlugins()
                     if (plugins_disabled and plugins_disabled[entry:sub(1, -10)]) then
                         table.insert(self.disabled_plugins, plugin_module)
                     else
+                        local ok_meta, plugin_metamodule = pcall(dofile, metafile)
+                        if ok_meta and plugin_metamodule then
+                            for k,v in pairs(plugin_metamodule) do plugin_module[k] = v end
+                        end
                         sandboxPluginEventHandlers(plugin_module)
                         table.insert(self.enabled_plugins, plugin_module)
                     end

plugins/SSH.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = 'SSH',
+    fullname = _("SSH"),
+    description = _([[Connect and transfer files to the device using SSH.]]),
+}

plugins/SSH.koplugin/main.lua

@@ -20,8 +20,6 @@ end
 
 local SSH = WidgetContainer:new{
     name = 'SSH',
-    fullname = _("SSH"),
-    description = _([[Connect and transfer files to the device using SSH.]]),
     is_doc_only = false,
 }
 

plugins/autofrontlight.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "autofrontlight",
+    fullname = _("Auto frontlight"),
+    description = _([[Automatically turns the frontlight on and off once brightness in the environment reaches a certain level.]]),
+}

plugins/autofrontlight.koplugin/main.lua

@@ -89,8 +89,6 @@ AutoFrontlight:init()
 
 local AutoFrontlightWidget = WidgetContainer:new{
     name = "autofrontlight",
-    fullname = _("Auto frontlight"),
-    description = _([[Automatically turns the frontlight on and off once brightness in the environment reaches a certain level.]]),
 }
 
 function AutoFrontlightWidget:init()

plugins/autosuspend.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "autosuspend",
+    fullname = _("Auto suspend"),
+    description = _([[Suspends the device after a period of inactivity.]]),
+}

plugins/autosuspend.koplugin/main.lua

@@ -112,8 +112,6 @@ AutoSuspend:init()
 
 local AutoSuspendWidget = WidgetContainer:new{
     name = "autosuspend",
-    fullname = _("Auto suspend"),
-    description = _([[Suspends the device after a period of inactivity.]]),
 }
 
 function AutoSuspendWidget:onInputEvent()

plugins/backgroundrunner.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "backgroundrunner",
+    fullname = _("Background runner"),
+    description = _([[Service to other plugins: allows tasks to run regularly in the background.]]),
+}

plugins/backgroundrunner.koplugin/main.lua

@@ -239,8 +239,6 @@ BackgroundRunner:_schedule()
 
 local BackgroundRunnerWidget = WidgetContainer:new{
     name = "backgroundrunner",
-    fullname = _("Background runner"),
-    description = _([[Service to other plugins: allows tasks to run regularly in the background.]]),
     runner = BackgroundRunner,
 }
 

plugins/batterystat.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "batterystat",
+    fullname = _("Battery statistics"),
+    description = _([[Collects and displays battery statistics.]]),
+}

plugins/batterystat.koplugin/main.lua

@@ -282,8 +282,6 @@ BatteryStat:init()
 
 local BatteryStatWidget = WidgetContainer:new{
     name = "batterystat",
-    fullname = _("Battery statistics"),
-    description = _([[Collects and displays battery statistics.]]),
 }
 
 function BatteryStatWidget:init()

plugins/calibrecompanion.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "calibrecompanion",
+    fullname = _("Calibre companion"),
+    description = _([[Send documents from calibre library directly to device via Wi-Fi connection]]),
+}

plugins/calibrecompanion.koplugin/main.lua

@@ -23,8 +23,6 @@ require("ffi/zeromq_h")
 --]]
 local CalibreCompanion = InputContainer:new{
     name = "calibrecompanion",
-    fullname = _("Calibre companion"),
-    description = _([[Send documents from calibre library directly to device via Wi-Fi connection]]),
     -- calibre companion local port
     port = 8134,
     -- calibre broadcast ports used to find calibre server

plugins/coverbrowser.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "coverbrowser",
+    fullname = _("Cover browser"),
+    description = _([[Alternative display modes for file browser and history.]]),
+}

plugins/coverbrowser.koplugin/main.lua

@@ -43,8 +43,6 @@ local history_display_mode = false -- not initialized yet
 
 local CoverBrowser = InputContainer:new{
     name = "coverbrowser",
-    fullname = _("Cover browser"),
-    description = _([[Alternative display modes for file browser and history.]]),
 }
 
 function CoverBrowser:init()

plugins/evernote.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "evernote",
+    fullname = _("Evernote"),
+    description = _([[Exports hightlights and notes to the Evernote cloud.]]),
+}

plugins/evernote.koplugin/main.lua

@@ -18,8 +18,6 @@ local realpath = require("ffi/util").realpath
 
 local EvernoteExporter = InputContainer:new{
     name = "evernote",
-    fullname = _("Evernote"),
-    description = _([[Exports hightlights and notes to the Evernote cloud.]]),
     login_title = _("Login to Evernote"),
     notebook_name = _("KOReader Notes"),
     evernote_domain = nil,

plugins/goodreads.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "goodreads",
+    fullname = _("Goodreads"),
+    description = _([[Allows browsing and searching the Goodreads database of books.]]),
+}

plugins/goodreads.koplugin/main.lua

@@ -10,8 +10,6 @@ local NetworkMgr = require("ui/network/manager")
 
 local Goodreads = InputContainer:new {
     name = "goodreads",
-    fullname = _("Goodreads"),
-    description = _([[Allows browsing and searching the Goodreads database of books.]]),
     goodreads_key = "",
     goodreads_secret = "",
 }

plugins/hello.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = 'hello',
+    fullname = _("Hello"),
+    description = _([[This is a debugging plugin.]]),
+}

plugins/hello.koplugin/main.lua

@@ -10,8 +10,6 @@ local _ = require("gettext")
 
 local Hello = WidgetContainer:new{
     name = 'hello',
-    fullname = _("Hello"),
-    description = _([[This is a debugging plugin.]]),
     is_doc_only = false,
 }
 

plugins/keepalive.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "keepalive",
+    fullname = _("Keep alive"),
+    description = _([[Keeps the device awake to prevent automatic Wi-Fi disconnects.]]),
+}

plugins/keepalive.koplugin/main.lua

@@ -61,8 +61,6 @@ end
 
 local KeepAlive = WidgetContainer:new{
     name = "keepalive",
-    fullname = _("Keep alive"),
-    description = _([[Keeps the device awake to prevent automatic Wi-Fi disconnects.]]),
 }
 
 function KeepAlive:init()

plugins/kobolight.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = 'kobolight',
+    fullname = _("Frontlight gesture controller"),
+    description = _([[Controls the frontlight with gestures on the left border of screen.]]),
+}

plugins/kobolight.koplugin/main.lua

@@ -22,8 +22,6 @@ local swipe_touch_zone_ratio_warmth = { x = 7/8, y = 1/8, w = 1/8, h = 7/8, }
 
 local KoboLight = WidgetContainer:new{
     name = 'kobolight',
-    fullname = _("Frontlight gesture controller"),
-    description = _([[Controls the frontlight with gestures on the left border of screen.]]),
     gestureScale = nil,  -- initialized in self:resetLayout()
 }
 

plugins/kosync.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "kosync",
+    fullname = _("Progress sync"),
+    description = _([[Synchronizes your reading progess to a server across your KOReader devices.]]),
+}

plugins/kosync.koplugin/main.lua

@@ -20,8 +20,6 @@ end
 
 local KOSync = InputContainer:new{
     name = "kosync",
-    fullname = _("Progress sync"),
-    description = _([[Synchronizes your reading progess to a server across your KOReader devices.]]),
     is_doc_only = true,
     title = _("Register/login to KOReader server"),
 

plugins/newsdownloader.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "newsdownloader",
+    fullname = _("News downloader"),
+    description = _([[Retrieves RSS and Atom news entries and saves them as HTML files.]]),
+}

plugins/newsdownloader.koplugin/main.lua

@@ -17,8 +17,6 @@ local T = FFIUtil.template
 
 local NewsDownloader = WidgetContainer:new{
     name = "newsdownloader",
-    fullname = _("News downloader"),
-    description = _([[Retrieves RSS and Atom news entries and saves them as HTML files.]]),
 }
 
 local initialized = false

plugins/perceptionexpander.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "perceptionexpander",
+    fullname = _("Perception expander"),
+    description = _([[Improves your reading speed with the help of two vertical lines over the text.]]),
+}

plugins/perceptionexpander.koplugin/main.lua

@@ -16,8 +16,6 @@ local Blitbuffer = require("ffi/blitbuffer")
 local PerceptionExpander = Widget:extend{
     is_enabled = nil,
     name = "perceptionexpander",
-    fullname = _("Perception expander"),
-    description = _([[Improves your reading speed with the help of two vertical lines over the text.]]),
     page_counter = 0,
     shift_each_pages = 100,
     margin = 0.1,

plugins/readtimer.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "readtimer",
+    fullname = _("Read timer"),
+    description = _([[Shows an alarm after a specified amount of time.]]),
+}

plugins/readtimer.koplugin/main.lua

@@ -7,8 +7,6 @@ local _ = require("gettext")
 
 local ReadTimer = WidgetContainer:new{
     name = "readtimer",
-    fullname = _("Read timer"),
-    description = _([[Shows an alarm after a specified amount of time.]]),
     time = 0,  -- The expected time of alarm if enabled, or 0.
 }
 

plugins/send2ebook.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "send2ebook",
+    fullname = _("Send to eBook"),
+    description = _([[Receives articles sent with the Send2Ebook PC/Android application.]]),
+}

plugins/send2ebook.koplugin/main.lua

@@ -17,8 +17,6 @@ local T = FFIUtil.template
 
 local Send2Ebook = WidgetContainer:new{
     name = "send2ebook",
-    fullname = _("Send to eBook"),
-    description = _([[Receives articles sent with the Send2Ebook PC/Android application.]]),
 }
 
 local initialized = false

plugins/statistics.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "statistics",
+    fullname = _("Reader statistics"),
+    description = _([[Keeps and displays your reading statistics.]]),
+}

plugins/statistics.koplugin/main.lua

@@ -29,8 +29,6 @@ local DEFAULT_MAX_READ_SEC = 120
 
 local ReaderStatistics = Widget:extend{
     name = "statistics",
-    fullname = _("Reader statistics"),
-    description = _([[Keeps and displays your reading statistics.]]),
     page_min_read_sec = DEFAULT_MIN_READ_SEC,
     page_max_read_sec = DEFAULT_MAX_READ_SEC,
     start_current_period = 0,

plugins/systemstat.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "systemstat",
+    fullname = _("System statistics"),
+    description = _([[Shows system statistics.]]),
+}

plugins/systemstat.koplugin/main.lua

@@ -240,8 +240,6 @@ SystemStat:init()
 
 local SystemStatWidget = WidgetContainer:new{
     name = "systemstat",
-    fullname = _("System statistics"),
-    description = _([[Shows system statistics.]]),
 }
 
 function SystemStatWidget:init()

plugins/terminal.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "terminal",
+    fullname = _("Terminal"),
+    description = _([[Executes simple commands and shows their output.]]),
+}

plugins/terminal.koplugin/main.lua

@@ -11,8 +11,6 @@ local Screen = require("device").screen
 
 local Terminal = WidgetContainer:new{
     name = "terminal",
-    fullname = _("Terminal"),
-    description = _([[Executes simple commands and shows their output.]]),
     dump_file = util.realpath(DataStorage:getDataDir()) .. "/terminal_output.txt",
     command = "",
 }

plugins/texteditor.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "texteditor",
+    fullname = _("Text editor"),
+    description = _([[A basic text editor for making small changes to plain text files.]]),
+}

plugins/texteditor.koplugin/main.lua

@@ -18,8 +18,6 @@ local T = ffiutil.template
 
 local TextEditor = WidgetContainer:new{
     name = "texteditor",
-    fullname = _("Text editor"),
-    description = _([[A basic text editor for making small changes to plain text files.]]),
     settings_file = DataStorage:getSettingsDir() .. "/text_editor.lua",
     settings = nil, -- loaded only when needed
     -- how many to display in menu (10x3 pages minus our 3 default menu items):

plugins/timesync.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "timesync",
+    fullname = _("Time sync"),
+    description = _([[Synchronizes the device time with NTP servers.]]),
+}

plugins/timesync.koplugin/main.lua

@@ -19,8 +19,6 @@ local NetworkMgr = require("ui/network/manager")
 
 local TimeSync = WidgetContainer:new{
     name = "timesync",
-    fullname = _("Time sync"),
-    description = _([[Synchronizes the device time with NTP servers.]]),
 }
 
 local function currentTime()

plugins/zsync.koplugin/_meta.lua

@@ -0,0 +1,6 @@
+local _ = require("gettext")
+return {
+    name = "zsync",
+    fullname = _("Zsync"),
+    description = _([[Devices in the same Wi-Fi network can transfer documents between each other directly.]]),
+}

plugins/zsync.koplugin/main.lua

@@ -15,8 +15,6 @@ int rmdir(const char *);
 require("ffi/zeromq_h")
 local ZSync = InputContainer:new{
     name = "zsync",
-    fullname = _("Zsync"),
-    description = _([[Devices in the same Wi-Fi network can transfer documents between each other directly.]]),
     is_doc_only = true,
 }