From: Michael Tremer Date: Sun, 5 Dec 2021 16:24:42 +0000 (+0000) Subject: Simplify class names for analytics and demo handlers X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25a2da759e43d268f537de04da28700e034ff7ed;p=people%2Fms%2Fwestferry.git Simplify class names for analytics and demo handlers Signed-off-by: Michael Tremer --- diff --git a/src/westferry/handlers/analytics.py b/src/westferry/handlers/analytics.py index 3cf785e..daa0999 100644 --- a/src/westferry/handlers/analytics.py +++ b/src/westferry/handlers/analytics.py @@ -28,7 +28,7 @@ from .. import ui from ..i18n import N_ -class AnalyticsBaseHandler(base.BaseHandler): +class BaseHandler(base.BaseHandler): @property def menu(self): _ = self.locale.translate @@ -36,13 +36,13 @@ class AnalyticsBaseHandler(base.BaseHandler): m = ui.menus.Menu(self, _("Analytics")) # Overview - m.add_handler(AnalyticsOverviewHandler) + m.add_handler(OverviewHandler) # Network - m.add_handler(AnalyticsNetworkOverviewHandler) + m.add_handler(NetworkOverviewHandler) # System - m.add_handler(AnalyticsSystemOverviewHandler) + m.add_handler(SystemOverviewHandler) return m @@ -50,7 +50,7 @@ class AnalyticsBaseHandler(base.BaseHandler): self.render("graphs.html", graphs=graphs) -class AnalyticsOverviewHandler(AnalyticsBaseHandler): +class OverviewHandler(BaseHandler): url = r"/analytics" title = N_("Overview") @@ -58,7 +58,7 @@ class AnalyticsOverviewHandler(AnalyticsBaseHandler): self.render("base.html") -class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler): +class NetworkBaseHandler(BaseHandler): @property def menu(self): _ = self.locale.translate @@ -66,21 +66,21 @@ class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler): m = ui.menus.Menu(self, _("Network")) # Back... - m.add_handler(AnalyticsOverviewHandler, title=_("Back...")) + m.add_handler(OverviewHandler, title=_("Back...")) # Overview - m.add_handler(AnalyticsNetworkOverviewHandler, title=_("Overview")) + m.add_handler(NetworkOverviewHandler, title=_("Overview")) # Connections - m.add_handler(AnalyticsNetworkConnectionsHandler) + m.add_handler(NetworkConnectionsHandler) # Fragmentation - m.add_handler(AnalyticsNetworkIPFragmentationHandler) + m.add_handler(NetworkIPFragmentationHandler) return m -class AnalyticsNetworkOverviewHandler(AnalyticsNetworkBaseHandler): +class NetworkOverviewHandler(NetworkBaseHandler): url = r"/analytics/network" title = N_("Network") @@ -88,7 +88,7 @@ class AnalyticsNetworkOverviewHandler(AnalyticsNetworkBaseHandler): self.render("base.html") -class AnalyticsNetworkConnectionsHandler(AnalyticsNetworkBaseHandler): +class NetworkConnectionsHandler(NetworkBaseHandler): url = r"/analytics/connections" title = N_("Connections") @@ -102,7 +102,7 @@ class AnalyticsNetworkConnectionsHandler(AnalyticsNetworkBaseHandler): self.render_graphs(graphs) -class AnalyticsNetworkIPFragmentationHandler(AnalyticsNetworkBaseHandler): +class NetworkIPFragmentationHandler(NetworkBaseHandler): url = r"/analytics/network/fragmentation" title = N_("Fragmentation") @@ -115,7 +115,7 @@ class AnalyticsNetworkIPFragmentationHandler(AnalyticsNetworkBaseHandler): tab.add_graph("%s-fragmentation" % proto) -class AnalyticsSystemBaseHandler(AnalyticsBaseHandler): +class SystemBaseHandler(BaseHandler): @property def menu(self): _ = self.locale.translate @@ -123,25 +123,25 @@ class AnalyticsSystemBaseHandler(AnalyticsBaseHandler): m = ui.menus.Menu(self, _("System")) # Back... - m.add_handler(AnalyticsOverviewHandler, title=_("Back...")) + m.add_handler(OverviewHandler, title=_("Back...")) # Overview - m.add_handler(AnalyticsSystemOverviewHandler, title=_("Overview")) + m.add_handler(SystemOverviewHandler, title=_("Overview")) # Most interesting items - m.add_handler(AnalyticsSystemProcessorsHandler) - m.add_handler(AnalyticsSystemMemoryHandler) - m.add_handler(AnalyticsSystemTemperaturesHandler) + m.add_handler(SystemProcessorsHandler) + m.add_handler(SystemMemoryHandler) + m.add_handler(SystemTemperaturesHandler) # Others s = m.add_menu(_("More")) - s.add_handler(AnalyticsSystemContextSwitchesHandler) - s.add_handler(AnalyticsSystemInterruptsHandler) + s.add_handler(SystemContextSwitchesHandler) + s.add_handler(SystemInterruptsHandler) return m -class AnalyticsSystemOverviewHandler(AnalyticsSystemBaseHandler): +class SystemOverviewHandler(SystemBaseHandler): url = r"/analytics/system" title = N_("System") @@ -152,7 +152,7 @@ class AnalyticsSystemOverviewHandler(AnalyticsSystemBaseHandler): tab.add_graph("loadavg") -class AnalyticsSystemProcessorsHandler(AnalyticsSystemBaseHandler): +class SystemProcessorsHandler(SystemBaseHandler): url = r"/analytics/system/processors" title = N_("Processors") @@ -169,7 +169,7 @@ class AnalyticsSystemProcessorsHandler(AnalyticsSystemBaseHandler): tab.add_graph("processor-temperature") -class AnalyticsSystemMemoryHandler(AnalyticsSystemBaseHandler): +class SystemMemoryHandler(SystemBaseHandler): url = r"/analytics/system/memory" title = N_("Memory") @@ -180,7 +180,7 @@ class AnalyticsSystemMemoryHandler(AnalyticsSystemBaseHandler): tab.add_graph("memory") -class AnalyticsSystemTemperaturesHandler(AnalyticsSystemBaseHandler): +class SystemTemperaturesHandler(SystemBaseHandler): url = r"/analytics/system/temperatures" title = N_("Temperatures") @@ -195,7 +195,7 @@ class AnalyticsSystemTemperaturesHandler(AnalyticsSystemBaseHandler): self.render_graphs(graphs) -class AnalyticsSystemContextSwitchesHandler(AnalyticsSystemBaseHandler): +class SystemContextSwitchesHandler(SystemBaseHandler): url = r"/analytics/system/context-switches" title = N_("Context Switches") @@ -209,7 +209,7 @@ class AnalyticsSystemContextSwitchesHandler(AnalyticsSystemBaseHandler): self.render_graphs(graphs) -class AnalyticsSystemInterruptsHandler(AnalyticsSystemBaseHandler): +class SystemInterruptsHandler(SystemBaseHandler): url = r"/analytics/system/interrupts" title = N_("Interrupts") diff --git a/src/westferry/handlers/base.py b/src/westferry/handlers/base.py index b73d70f..c2c49e5 100644 --- a/src/westferry/handlers/base.py +++ b/src/westferry/handlers/base.py @@ -76,14 +76,14 @@ class BaseHandler(tornado.web.RequestHandler, metaclass=HandlerRegistration): menu = ui.menus.Menu(self) # Analytics - menu.add_handler(analytics.AnalyticsOverviewHandler, title=_("Analytics")) + menu.add_handler(analytics.OverviewHandler, title=_("Analytics")) # Demo (only in debug mode) if self.backend.debug: submenu = menu.add_menu(_("Demo")) - submenu.add_handler(demo.DemoOverviewHandler) - submenu.add_handler(demo.DemoFormsHandler) + submenu.add_handler(demo.OverviewHandler) + submenu.add_handler(demo.FormsHandler) return menu diff --git a/src/westferry/handlers/demo.py b/src/westferry/handlers/demo.py index 086add7..a90f3ff 100644 --- a/src/westferry/handlers/demo.py +++ b/src/westferry/handlers/demo.py @@ -20,12 +20,11 @@ ############################################################################### from . import base -from .. import backend from .. import ui from ..i18n import N_, _ -class DemoBaseHandler(base.BaseHandler): +class BaseHandler(base.BaseHandler): @property def menu(self): _ = self.locale.translate @@ -41,7 +40,7 @@ class DemoBaseHandler(base.BaseHandler): return m -class DemoOverviewHandler(DemoBaseHandler): +class OverviewHandler(BaseHandler): url = r"/demo" title = N_("Overview") @@ -49,7 +48,7 @@ class DemoOverviewHandler(DemoBaseHandler): self.render("demo/index.html") -class DemoFormsHandler(DemoBaseHandler): +class FormsHandler(BaseHandler): url = r"/demo/forms" title = N_("Forms")