From f21fea13939f55ef688ac19ec30cf46696e21495 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sat, 5 Apr 2014 18:53:22 +0400 Subject: [PATCH] fix bug with none type value --- sources/ptm/contents/code/dataengine.py | 8 +++----- sources/ptm/contents/code/main.py | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sources/ptm/contents/code/dataengine.py b/sources/ptm/contents/code/dataengine.py index f524cfb..be3d8d0 100644 --- a/sources/ptm/contents/code/dataengine.py +++ b/sources/ptm/contents/code/dataengine.py @@ -85,8 +85,7 @@ class DataEngine: interval = ptm['vars']['app']['interval'] names = ptm['names'] updatedData = {'name':None, 'type':None, 'value':None} - if True: - #try: + try: if (sourceName == "cpu/system/TotalLoad"): updatedData['name'] = "cpu" updatedData['type'] = -1 @@ -240,9 +239,8 @@ class DataEngine: updatedData['value'] = "%s%02i%s" % (updatedData['value'].split('$mm')[0], minutes, updatedData['value'].split('$mm')[1]) if (updatedData['value'].split('$m')[0] != updatedData['value']): updatedData['value'] = "%s%2i%s" % (updatedData['value'].split('$m')[0], minutes, updatedData['value'].split('$m')[1]) - #except: - #pass - + except: + pass return updatedData diff --git a/sources/ptm/contents/code/main.py b/sources/ptm/contents/code/main.py index 0e750f3..7259229 100644 --- a/sources/ptm/contents/code/main.py +++ b/sources/ptm/contents/code/main.py @@ -497,6 +497,8 @@ class pyTextWidget(plasmascript.Applet): def dataUpdated(self, sourceName, data): """function to update label""" updatedData = self.dataengine.dataUpdated(str(sourceName), data, self.ptm) + if (updatedData['value'] == None): + return # update falues where is needed if (updatedData['type'] != None): self.ptm['values'][updatedData['name']][updatedData['type']] = updatedData['value'] @@ -515,6 +517,7 @@ class pyTextWidget(plasmascript.Applet): if (len(self.ptm['tooltip']['values'][updatedData['name']]) > self.ptm['vars']['tooltip']['num']): self.ptm['tooltip']['values'][updatedData['name']] = self.ptm['tooltip']['values'][updatedData['name']][1:] if ((updatedData['name'] in ['cpu', 'cpuclock']) and (updatedData['type'] == -1)): + print (updatedData['value']) self.ptm['tooltip']['values'][updatedData['name']].append(updatedData['value']) elif ((updatedData['name'] == "mem") and (updatedData['type'] == "app")): self.ptm['tooltip']['values'][updatedData['name']].append(updatedData['value'])