summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVon Random <von@vdrandom.org>2016-11-28 14:48:11 +0300
committerVon Random <von@vdrandom.org>2016-11-28 14:48:11 +0300
commit5616f4d575de06a48834b645d214dae9388e77c5 (patch)
treef9693883c893dffe7cd70c68a7b84f533b44dd51
parent0495bc2d797b438b99b9c3714a95206432c9bad2 (diff)
move plugins.common only class into plugins module
-rw-r--r--.gitignore4
-rw-r--r--plugins/__init__.py (renamed from plugins/common.py)0
-rw-r--r--plugins/batt.py4
-rw-r--r--plugins/date.py4
-rw-r--r--plugins/disk.py4
-rw-r--r--plugins/load.py4
-rw-r--r--plugins/mem.py4
-rw-r--r--plugins/ping.py4
-rw-r--r--vdstatus.wpr15
9 files changed, 30 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 35ba9cd..213da27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
-__pycache__
*.iml
+*.swp
+*.wpu
.idea
+__pycache__
diff --git a/plugins/common.py b/plugins/__init__.py
index b747e38..b747e38 100644
--- a/plugins/common.py
+++ b/plugins/__init__.py
diff --git a/plugins/batt.py b/plugins/batt.py
index 9cbc597..84e22b5 100644
--- a/plugins/batt.py
+++ b/plugins/batt.py
@@ -1,10 +1,10 @@
-import plugins.common
+import plugins
BATTERY_DIR = '/sys/class/power_supply/BAT0/'
-class PluginThread(plugins.common.PluginThreadCommon):
+class PluginThread(plugins.PluginThreadCommon):
def __init__(self, section, config):
super(PluginThread, self).__init__(section, config)
diff --git a/plugins/date.py b/plugins/date.py
index 72cffd5..df967f8 100644
--- a/plugins/date.py
+++ b/plugins/date.py
@@ -1,8 +1,8 @@
import time
-import plugins.common
+import plugins
-class PluginThread(plugins.common.PluginThreadCommon):
+class PluginThread(plugins.PluginThreadCommon):
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 c99dff0..887acd8 100644
--- a/plugins/disk.py
+++ b/plugins/disk.py
@@ -1,8 +1,8 @@
-import plugins.common
+import plugins
import psutil
-class PluginThread(plugins.common.PluginThreadCommon):
+class PluginThread(plugins.PluginThreadCommon):
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 a63e6e7..2da84e2 100644
--- a/plugins/load.py
+++ b/plugins/load.py
@@ -1,8 +1,8 @@
import os
-import plugins.common
+import plugins
-class PluginThread(plugins.common.PluginThreadCommon):
+class PluginThread(plugins.PluginThreadCommon):
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 acc575c..3be96a4 100644
--- a/plugins/mem.py
+++ b/plugins/mem.py
@@ -1,8 +1,8 @@
import psutil
-import plugins.common
+import plugins
-class PluginThread(plugins.common.PluginThreadCommon):
+class PluginThread(plugins.PluginThreadCommon):
def __init__(self, section, config):
super(PluginThread, self).__init__(section, config)
diff --git a/plugins/ping.py b/plugins/ping.py
index 95fdd35..1d80d58 100644
--- a/plugins/ping.py
+++ b/plugins/ping.py
@@ -1,9 +1,9 @@
import os
import random
-import plugins.common
+import plugins
-class PluginThread(plugins.common.PluginThreadCommon):
+class PluginThread(plugins.PluginThreadCommon):
def __init__(self, section, config):
super(PluginThread, self).__init__(section, config)
self.hosts = config.get(section, 'hosts').split(',')
diff --git a/vdstatus.wpr b/vdstatus.wpr
new file mode 100644
index 0000000..2494e2c
--- /dev/null
+++ b/vdstatus.wpr
@@ -0,0 +1,15 @@
+#!wing
+#!version=5.0
+##################################################################
+# Wing IDE project file #
+##################################################################
+[project attributes]
+proj.directory-list = [{'dirloc': loc('.'),
+ 'excludes': (),
+ 'filter': u'Python Files',
+ 'include_hidden': False,
+ 'recursive': True,
+ 'watch_for_changes': True}]
+proj.file-list = [loc('conf.ini'),
+ loc('README.md')]
+proj.file-type = 'shared'