do not spawn new processes all the time

Signed-off-by: Mattias Andrée <maandree@operamail.com>

3 files changed, 10 insertions, 8 deletions

diff --git a/TODO b/TODO
index f3cdf55..3ce6734 100644
--- a/TODO
+++ b/TODO
@@ -33,6 +33,7 @@ List of plugins to implement:
      /proc/net/sockstat
      /proc/net/sockstat6
      /proc/net/wireless
+     /proc/sysvipc
 
 Demo plugins:
 
diff --git a/src/plugins/clock.py b/src/plugins/clock.py
index 129269c..fc99ca4 100644
--- a/src/plugins/clock.py
+++ b/src/plugins/clock.py
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import time
+from datetime import datetime, timezone
 
 from util import *
 
@@ -47,10 +48,9 @@ class Clock:
         @param  utc:bool       Show time in UTC, otherwise local time
         @param  sync_to:float  The time parameter to sync to, the number of seconds between the reads
         '''
-        self.format = format
+        self.format = format if not utc else format.replace('%Z', 'UTC')
         self.utc = utc
         self.sync_to = sync_to
-        self.command = ['date'] + (['--utc'] if utc else []) + ['+' + format]
     
     
     def read(self):
@@ -59,7 +59,10 @@ class Clock:
         
         @return  :str  The time and date in the format specified at construction
         '''
-        return spawn_read(*(self.command))
+        if not self.utc:
+            return time.strftime(self.format)
+        else:
+            datetime.fromtimestamp(time.time(), tz = timezone.utc).strftime(self.format))
     
     
     def sync(self):
diff --git a/src/plugins/uname.py b/src/plugins/uname.py
index 6b05a96..19c8fca 100644
--- a/src/plugins/uname.py
+++ b/src/plugins/uname.py
@@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import os
+
 from util import *
 
 
@@ -40,11 +42,7 @@ class Uname:
         Constructor
         '''
         u = lambda s : None if s == 'unknown' else s
-        self.kernel_name       = spawn_read('uname', '-s')
-        self.nodename          = spawn_read('uname', '-n')
-        self.kernel_release    = spawn_read('uname', '-r')
-        self.kernel_version    = spawn_read('uname', '-v')
-        self.machine           = spawn_read('uname', '-m')
+        (self.kernel_name, self.nodename, self.kernel_release, self.kernel_version, self.machine) = os.uname()
         self.processor         = u(spawn_read('uname', '-p'))
         self.hardware_platform = u(spawn_read('uname', '-i'))
         self.operating_system  = spawn_read('uname', '-o')