From 3b6f521e26e38ad6d3a774c337086898ac65cc7e Mon Sep 17 00:00:00 2001
From: yparitcher <y@paritcher.com>
Date: Tue, 31 Aug 2021 21:24:03 -0400
Subject: [PATCH] Statistics: move dispatcher items to plugin

---
 frontend/dispatcher.lua              | 4 ----
 plugins/statistics.koplugin/main.lua | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/dispatcher.lua b/frontend/dispatcher.lua
index 7a50327ef..c97ced3e1 100644
--- a/frontend/dispatcher.lua
+++ b/frontend/dispatcher.lua
@@ -60,7 +60,6 @@ local settingsList = {
     wifi_off = {category="none", event="InfoWifiOff", title=_("Turn off Wi-Fi"), device=true, condition=Device:hasWifiToggle()},
     toggle_wifi = {category="none", event="ToggleWifi", title=_("Toggle Wi-Fi"), device=true, condition=Device:hasWifiToggle(), separator=true},
     reading_progress = {category="none", event="ShowReaderProgress", title=_("Reading progress"), device=true},
-    stats_calendar_view = {category="none", event="ShowCalendarView", title=_("Statistics calendar view"), device=true, separator=true},
     history = {category="none", event="ShowHist", title=_("History"), device=true},
     open_previous_document = {category="none", event="OpenLastDoc", title=_("Open previous document"), device=true},
     filemanager = {category="none", event="Home", title=_("File browser"), device=true},
@@ -115,7 +114,6 @@ local settingsList = {
     clear_location_history = {category="none", event="ClearLocationStack", arg=true, title=_("Clear location history"), rolling=true, paging=true, separator=true},
     toc = {category="none", event="ShowToc", title=_("Table of contents"), rolling=true, paging=true},
     bookmarks = {category="none", event="ShowBookmark", title=_("Bookmarks"), rolling=true, paging=true},
-    book_statistics = {category="none", event="ShowBookStats", title=_("Book statistics"), rolling=true, paging=true, separator=true},
     book_status = {category="none", event="ShowBookStatus", title=_("Book status"), rolling=true, paging=true},
     book_info = {category="none", event="ShowBookInfo", title=_("Book information"), rolling=true, paging=true},
     book_description = {category="none", event="ShowBookDescription", title=_("Book description"), rolling=true, paging=true},
@@ -201,7 +199,6 @@ local dispatcher_menu_order = {
     "open_previous_document",
     "favorites",
     "filemanager",
-    "stats_calendar_view",
 
     "dictionary_lookup",
     "wikipedia_lookup",
@@ -277,7 +274,6 @@ local dispatcher_menu_order = {
 
     "toc",
     "bookmarks",
-    "book_statistics",
 
     "book_status",
     "book_info",
diff --git a/plugins/statistics.koplugin/main.lua b/plugins/statistics.koplugin/main.lua
index de80b2904..45ab786b9 100644
--- a/plugins/statistics.koplugin/main.lua
+++ b/plugins/statistics.koplugin/main.lua
@@ -3,6 +3,7 @@ local BookStatusWidget = require("ui/widget/bookstatuswidget")
 local ConfirmBox = require("ui/widget/confirmbox")
 local DataStorage = require("datastorage")
 local Device = require("device")
+local Dispatcher = require("dispatcher")
 local DocSettings = require("docsettings")
 local FFIUtil = require("ffi/util")
 local InfoMessage = require("ui/widget/infomessage")
@@ -138,6 +139,11 @@ ReaderStatistics.default_settings = {
     calendar_browse_future_months = false,
 }
 
+function ReaderStatistics:onDispatcherRegisterActions()
+    Dispatcher:registerAction("stats_calendar_view", {category="none", event="ShowCalendarView", title=_("Statistics calendar view"), device=true, separator=true})
+    Dispatcher:registerAction("book_statistics", {category="none", event="ShowBookStats", title=_("Book statistics"), rolling=true, paging=true, separator=true})
+end
+
 function ReaderStatistics:init()
     -- Disable in PIC documents (but not the FM, as we want to be registered to the FM's menu).
     if self.ui and self.ui.document and self.ui.document.is_pic then
@@ -150,6 +156,7 @@ function ReaderStatistics:init()
     self.settings = G_reader_settings:readSetting("statistics", self.default_settings)
 
     self.ui.menu:registerToMainMenu(self)
+    self:onDispatcherRegisterActions()
     self:checkInitDatabase()
     BookStatusWidget.getStats = function()
         return self:getStatsBookStatus(self.id_curr_book, self.settings.is_enabled)