diff options
| author | Von Random <von@vdrandom.org> | 2016-11-21 13:34:32 +0300 |
|---|---|---|
| committer | Von Random <von@vdrandom.org> | 2016-11-21 13:34:32 +0300 |
| commit | 0495bc2d797b438b99b9c3714a95206432c9bad2 (patch) | |
| tree | 7e9f1b17a5f630f01476e8019dc9e449f8c3e981 | |
| parent | bb9658d0536e50871e4a7ba852eec10ef82de4f3 (diff) | |
get rid of thread_id and useless logic it used
| -rw-r--r-- | plugins/batt.py | 2 | ||||
| -rw-r--r-- | plugins/date.py | 2 | ||||
| -rw-r--r-- | plugins/disk.py | 2 | ||||
| -rw-r--r-- | plugins/load.py | 2 | ||||
| -rw-r--r-- | plugins/mem.py | 2 | ||||
| -rw-r--r-- | plugins/ping.py | 2 | ||||
| -rwxr-xr-x | vdstatus | 4 |
7 files changed, 7 insertions, 9 deletions
diff --git a/plugins/batt.py b/plugins/batt.py index 861359c..9cbc597 100644 --- a/plugins/batt.py +++ b/plugins/batt.py @@ -5,7 +5,7 @@ BATTERY_DIR = '/sys/class/power_supply/BAT0/' class PluginThread(plugins.common.PluginThreadCommon): - def __init__(self, section, config, thread_id): + def __init__(self, section, config): super(PluginThread, self).__init__(section, config) def main(self): diff --git a/plugins/date.py b/plugins/date.py index 18ae91f..72cffd5 100644 --- a/plugins/date.py +++ b/plugins/date.py @@ -3,7 +3,7 @@ import plugins.common class PluginThread(plugins.common.PluginThreadCommon): - def __init__(self, section, config, thread_id): + def __init__(self, section, config): super(PluginThread, self).__init__(section, config) self.date_format = config.get(section, 'format', fallback='%c') diff --git a/plugins/disk.py b/plugins/disk.py index 0f92574..c99dff0 100644 --- a/plugins/disk.py +++ b/plugins/disk.py @@ -3,7 +3,7 @@ import psutil class PluginThread(plugins.common.PluginThreadCommon): - def __init__(self, section, config, thread_id): + def __init__(self, section, config): super(PluginThread, self).__init__(section, config) self.part = config.get(section, 'part') diff --git a/plugins/load.py b/plugins/load.py index 76059b8..a63e6e7 100644 --- a/plugins/load.py +++ b/plugins/load.py @@ -3,7 +3,7 @@ import plugins.common class PluginThread(plugins.common.PluginThreadCommon): - def __init__(self, section, config, thread_id): + def __init__(self, section, config): super(PluginThread, self).__init__(section, config) self.hide_ok = config.getboolean(section, 'hide_ok', fallback=False) diff --git a/plugins/mem.py b/plugins/mem.py index ebc0ced..acc575c 100644 --- a/plugins/mem.py +++ b/plugins/mem.py @@ -3,7 +3,7 @@ import plugins.common class PluginThread(plugins.common.PluginThreadCommon): - def __init__(self, section, config, thread_id): + def __init__(self, section, config): super(PluginThread, self).__init__(section, config) def main(self): diff --git a/plugins/ping.py b/plugins/ping.py index 26cb657..95fdd35 100644 --- a/plugins/ping.py +++ b/plugins/ping.py @@ -4,7 +4,7 @@ import plugins.common class PluginThread(plugins.common.PluginThreadCommon): - def __init__(self, section, config, thread_id): + def __init__(self, section, config): super(PluginThread, self).__init__(section, config) self.hosts = config.get(section, 'hosts').split(',') self.title = config.get(section, 'title') @@ -1,7 +1,6 @@ #!/usr/bin/python3 # TODO: handle SIGINT properly # TODO: add documentation / comments -# TODO: add a dummy plugin to use as a starting point # TODO: interactivity support import argparse import configparser @@ -36,9 +35,8 @@ class PluginRunner: self.format_output = self.format_term for section in self.config.sections(): plugin_name = self.config.get(section, 'plugin') - plugin_id = len(self.plugins_loaded) module = importlib.import_module('.' + plugin_name, 'plugins') - thread_object = module.PluginThread(section, self.config, plugin_id) + thread_object = module.PluginThread(section, self.config) self.plugins_loaded.append(thread_object) def start(self): |