From 4c59e7e8922436f7fdbf69e49a3a359871670c44 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 24 May 2013 19:48:10 +0400 Subject: [PATCH] New release 1.3.2: * optimization and refactoring * gpu* and hddtemp now read from ext-sysmon DataEngine Extended SystemMonitor DataEngine: initial release 1.0: + add gpu source + add gputemp source + add hddtemp source + add install script --- README | 1 + extsysmon-1.0.zip | Bin 0 -> 1831 bytes extsysmon/contents/code/main.py | 95 ++++++ extsysmon/metadata.desktop | 20 ++ install_extsysmon.sh | 3 + .../pytextmonitor-1.3.1-unstable.plasmoid | Bin pytextmonitor-1.3.2.plasmoid | Bin 0 -> 15432 bytes source/contents/code/config.py | 2 +- .../code/{configaccepted.py => configdef.py} | 112 +++++-- source/contents/code/configwindow.py | 2 +- source/contents/code/dataengine.py | 314 ++++++++++-------- source/contents/code/gpuchecker.py | 38 --- source/contents/code/gputempchecker.py | 35 -- source/contents/code/hddtempchecker.py | 29 -- source/contents/code/main.py | 119 ++----- source/contents/code/reinit.py | 72 ++-- source/contents/code/util.py | 12 +- source/metadata.desktop | 8 +- 18 files changed, 447 insertions(+), 415 deletions(-) create mode 100644 extsysmon-1.0.zip create mode 100644 extsysmon/contents/code/main.py create mode 100644 extsysmon/metadata.desktop create mode 100755 install_extsysmon.sh rename pytextmonitor-1.3.1-unstable.plasmoid => old_versions/pytextmonitor-1.3.1-unstable.plasmoid (100%) create mode 100644 pytextmonitor-1.3.2.plasmoid rename source/contents/code/{configaccepted.py => configdef.py} (54%) delete mode 100644 source/contents/code/gpuchecker.py delete mode 100644 source/contents/code/gputempchecker.py delete mode 100644 source/contents/code/hddtempchecker.py diff --git a/README b/README index 0ec3a52..feb15de 100644 --- a/README +++ b/README @@ -26,3 +26,4 @@ For edited output you must open Settings window and setup output format in lines Label order will changed if you change slider position. HTML tags in label work normally. Attention: you don't may set to show $cpu in swap label for example. $cpu will work only in cpu label. +Attention: gpu, gputemp and hddtemp labels require extsysmon dataengine! diff --git a/extsysmon-1.0.zip b/extsysmon-1.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..9ceb676d76566da1235847daa3267b2d8e31ec8c GIT binary patch literal 1831 zcmWIWW@h1H0D(;!JDk7_D8b1f!;qYxSCX1nQmh{u!pXq=V9&h3bNl86mR4{xFtWU0 zW?*1R0V)oF8)2G@Y6Ks$5y|-}sStCnn$8cr2Ei8Mik)*Z+}&z`t|rXRN-sO>XVO2a~utr%R|FyR&k|kEatR z`0hS>Y+H2s_Bj&uf6jhmy~VU|Zj?|)+Vj-sGt24^~Etv7z{j#3QrOkC3o{JwA ziXBR*)3g4z(SVuJe_QK4*SEXXfUkq2vtWn(X*a#%2#HB2M0smu zV#F`(pKemLvf5HyUB~E@+c(9DOXPk3cFelV_TX_4znZZ9r>7}N98wj&9h}Q2<}f`B zzG$7w9r`t6*0V+2vvvg>J9Q~t@RYcfG}Eo@!!vjT=GUluDaNjA^J$)NpkCo?gx7Vk zka-KdX0$Miv2^?|RMDJ2@j%A*+s~ZJKW=JGGwMu~QkN)wX1(PV|5J@Nxfj2Z6x)C5 zOw`af*uFeulgqJAlPwNM`qt|%{wXKnt!$l8uW9Zh%~;H9JL~5<{}SQ4rmI>{ccpRf zeC5>2=3n*f$WooEiRmoC_j%6szJB(gL(6K%1WSqD_-4L5_HP#o{C6lP+4dx+vwK~d z?GwdxA=&0W!=*(c2gM2-bS|zpJe^g?HRDXumE8V^-uwo6;j1&R3T^b1N#6aWE%L|H z=}JozINe3AeYo^+ibs@2NX5)f5icpFb*7GgJ*1Ak5>;Nl-kZTP>D=N&Igi!!Uc@@J zzB#|4_>)*euC{-n~{wJTWUU=mx9G;m|FD{ky_?)V_h4+NexC0#~VJEWt z_Vv2Qt~NEBeZlDL)rc?m7H+IjlR5D6Yn|x!Hzg~Sms|bS-LP=(VWso)n^Fz09}-nh zIJZ_q;qa3?{zumQ4V=NbE9>hNSHsdP1*bXho$r%c(iX7ABA6!o#{&ReKad%bSs_pl8`$$hbe<_N&`mdG2 z6VA|jfh%k5J@j=?SMQt{e`Is+Q?{@F1%AfyUjWXW>wp;(gwZl*?!>!UhYfgI-+vaVYf!!U?%071YfidF zT64XvOL%jr_v#guX}xQw{CfLbrMY*h`LRj+l4T?3tNxhQlPWriJKnQ(>qIW;f4i!E z@+XTgYz$9lnxb&itb%E;*@_buVO&C@W?YJq5^EVd#e=G@-T0Sfp_Db#;bdP>U%64e zX>@^l=wZEx4>gxL*Sr2(Zu8_P|74x)<~{0HHG>`m+yCZoto- z%eu~&%Iul(;CEWb=36f;t^TRb$=tBsz5RcKc|qJ!$NWvND?iG9ixd2yJaO;o&tXot zBrm5OGyORyj-%<=jswf5Zd81^MWJ+MKBw8c>z^xAMeXHnKP*4{>d*^~Z?Y%a0}eTU zku5B;Rke3G{mr^u^Yoocp*>NXw3A8Y_u*51D4bYG!;wA4De=U1G -1): + self.gpudev = 'nvidia' + elif (commandOut.lower().find('radeon') > -1): + self.gpudev = 'ati' + + # setup hdd devices + self.hdddev = [] + commandOut = commands.getoutput("ls -1 /dev/sd[a-z] && ls -1 /dev/hd[a-z]") + for device in commandOut.split('\n'): + if (device[:3] != "ls:"): + self.hdddev.append(device) + + + def sources(self): + """create sources""" + sources = ["gpu", "gputemp", "hddtemp"] + return sources + + + def sourceRequestEvent(self, name): + return self.updateSourceEvent(name) + + + def updateSourceEvent(self, source): + """update sources and setup values""" + if (source == "gpu"): + key = "GPU" + if (self.gpudev == 'nvidia'): + commandOut = commands.getoutput("nvidia-smi -q -d UTILIZATION | grep Gpu | tail -n1") + try: + value = "%5s" % (str(round(float(commandOut.split()[2][:-1]), 1))) + except: + value = " N\A" + elif (self.gpudev == 'ati'): + commandOut = commands.getoutput("aticonfig --od-getclocks | grep load | tail -n1") + try: + value = "%5s" % (str(round(float(commandOut.split()[3][:-1]), 1))) + except: + value = " N\A" + else: + value = " N\A" + self.setData(source, "GPU", QString(value)) + elif (source == "gputemp"): + if (self.gpudev == 'nvidia'): + commandOut = commands.getoutput("nvidia-smi -q -d TEMPERATURE | grep Gpu | tail -n1") + try: + value = "%4s" % (str(round(float(commandOut.split()[2]), 1))) + except: + value = " N\A" + elif (self.gpudev == 'ati'): + commandOut = commands.getoutput("aticonfig --od-gettemperature | grep Temperature | tail -n1") + try: + value = "%4s" % (str(round(float(commandOut.split()[4]), 1))) + except: + value = " N\A" + else: + value = " N\A" + self.setData(source, "GPUTemp", QString(value)) + elif (source == "hddtemp"): + for device in self.hdddev: + commandOut = commands.getoutput("hddtemp " + device) + try: + value = "%4s" % (str(round(float(commandOut.split(':')[2][:-3]), 1))) + except: + value = " N\A" + self.setData(source, device, QString(value)) + + return True + + + +def CreateDataEngine(parent): + return ExtendedSysMon(parent) diff --git a/extsysmon/metadata.desktop b/extsysmon/metadata.desktop new file mode 100644 index 0000000..fbb6af4 --- /dev/null +++ b/extsysmon/metadata.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Extended SystemMonitor DataEngine +Comment=Adds gpu, gputemp and hddtemp to DataEngine +ServiceTypes=Plasma/DataEngine +Type=Service +Icon=utilities-system-monitor + +X-Plasma-API=python +X-Plasma-MainScript=code/main.py + +X-KDE-PluginInfo-Author=Evgeniy Alexeev aka arcanis +X-KDE-PluginInfo-Email=esalexeev@gmail.com +X-KDE-PluginInfo-Name=ext-sysmon +X-KDE-PluginInfo-Version=1.0 +X-KDE-PluginInfo-Website=http://kde-look.org/ +X-KDE-PluginInfo-Category=System Information +X-KDE-PluginInfo-Depends= +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=true diff --git a/install_extsysmon.sh b/install_extsysmon.sh new file mode 100755 index 0000000..f336a9a --- /dev/null +++ b/install_extsysmon.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +plasmapkg -t dataengine -i extsysmon-1.0.zip diff --git a/pytextmonitor-1.3.1-unstable.plasmoid b/old_versions/pytextmonitor-1.3.1-unstable.plasmoid similarity index 100% rename from pytextmonitor-1.3.1-unstable.plasmoid rename to old_versions/pytextmonitor-1.3.1-unstable.plasmoid diff --git a/pytextmonitor-1.3.2.plasmoid b/pytextmonitor-1.3.2.plasmoid new file mode 100644 index 0000000000000000000000000000000000000000..cb115354f8d9f4459ed467265b4946e1c5e0737f GIT binary patch literal 15432 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 0)): - time.sleep(self.interval) - # dirty hack - self.label_exit = self.label_exit - 1 - if (self.gpudev == 'nvidia'): - commandOut = commands.getoutput("nvidia-smi -q -d UTILIZATION | grep Gpu | tail -n1") - if (commandOut.split()[2] == 'N/A'): - self.gpu = ' N/A' - else: - self.gpu = "%5s" % (str(round(float(commandOut.split()[2][:-1]), 1))) - elif (self.gpudev == 'ati'): - commandOut = commands.getoutput("aticonfig --od-getclocks | grep load | tail -n1") - self.gpu = "%5s" % (str(round(float(commandOut.split()[3][:-1]), 1))) - else: - self.gpu = '-----' - - - def stop(self): - """stop signal""" - self.stopped = True diff --git a/source/contents/code/gputempchecker.py b/source/contents/code/gputempchecker.py deleted file mode 100644 index 65c2533..0000000 --- a/source/contents/code/gputempchecker.py +++ /dev/null @@ -1,35 +0,0 @@ -import commands, time, os -from PyQt4.QtCore import QThread - - - -class GpuTempThread(QThread): - def __init__(self, interval, gpudev): - """thread definition""" - QThread.__init__(self) - self.stopped = False - self.interval = interval / 1000 - self.label_exit = 2 - self.gpudev = gpudev - self.gputemp = '----' - - - def run(self): - """operating function""" - while ((not self.stopped) and (self.label_exit > 0)): - time.sleep(self.interval) - # dirty hack - self.label_exit = self.label_exit - 1 - if (self.gpudev == 'nvidia'): - commandOut = commands.getoutput("nvidia-smi -q -d TEMPERATURE | grep Gpu | tail -n1") - self.gputemp = "%4s" % (str(round(float(commandOut.split()[2]), 1))) - elif (self.gpudev == 'ati'): - commandOut = commands.getoutput("aticonfig --od-gettemperature | grep Temperature | tail -n1") - self.gputemp = "%4s" % (str(round(float(commandOut.split()[4]), 1))) - else: - self.gputemp = '----' - - - def stop(self): - """stop signal""" - self.stopped = True diff --git a/source/contents/code/hddtempchecker.py b/source/contents/code/hddtempchecker.py deleted file mode 100644 index b1a0000..0000000 --- a/source/contents/code/hddtempchecker.py +++ /dev/null @@ -1,29 +0,0 @@ -import commands, time -from PyQt4.QtCore import QThread - - - -class HddTempThread(QThread): - def __init__(self, interval, hdd): - """thread definition""" - QThread.__init__(self) - self.stopped = False - self.interval = interval / 1000 - self.label_exit = 2 - self.hdd = hdd - self.hddtemp = '----' - - - def run(self): - """operating function""" - while ((not self.stopped) and (self.label_exit > 0)): - time.sleep(self.interval) - # dirty hack - self.label_exit = self.label_exit - 1 - commandOut = commands.getoutput("hddtemp " + self.hdd) - self.hddtemp = "%4s" % (str(round(float(commandOut.split(':')[2][:-3]), 1))) - - - def stop(self): - """stop signal""" - self.stopped = True diff --git a/source/contents/code/main.py b/source/contents/code/main.py index 80e6832..c9eb12f 100644 --- a/source/contents/code/main.py +++ b/source/contents/code/main.py @@ -9,7 +9,7 @@ from PyKDE4 import plasmascript from PyKDE4.plasma import Plasma import commands, os, time -import configaccepted +import configdef import configwindow import dataengine import reinit @@ -20,57 +20,42 @@ from util import * class pyTextWidget(plasmascript.Applet): def __init__(self, parent, args=None): """widget definition""" - plasmascript.Applet.__init__(self,parent) + plasmascript.Applet.__init__(self, parent) def init(self): """function to initializate widget""" self._name = str(self.package().metadata().pluginName()) + self.initTooltip() self.layout = QGraphicsLinearLayout(Qt.Horizontal, self.applet) - self.configAccepted = configaccepted.ConfigAccepted(self) + self.dataengine = dataengine.DataEngine(self) self.reinit = reinit.Reinit(self) + + self.timer = QTimer() + QObject.connect(self.timer, SIGNAL("timeout()"), self.updateLabel) + self.setupVar() self.reinit.reinit() + self.setHasConfigurationInterface(True) def createConfigurationInterface(self, parent): """function to setup configuration window""" - self.configpage = configwindow.ConfigWindow(self, self.settings) - - font = QFont(str(self.settings.get('font_family', 'Terminus')), int(self.settings.get('font_size', 12)), 50) - self.configpage.ui.spinBox_interval.setValue(int(self.settings.get('interval', 2000))) - self.configpage.ui.fontComboBox.setCurrentFont(font) - self.configpage.ui.spinBox_fontSize.setValue(int(self.settings.get('font_size', 12))) - self.configpage.ui.kcolorcombo.setColor(QColor(str(self.settings.get('font_color', '#000000')))) - font = str(self.settings.get('font_style', 'normal')) - if (font == 'normal'): - self.configpage.ui.comboBox_style.setCurrentIndex(0) - else: - self.configpage.ui.comboBox_style.setCurrentIndex(1) - self.configpage.ui.spinBox_weight.setValue(int(self.settings.get('font_weight', 400))) - for label in self.dict_orders.keys(): - exec ('bool = self.' + self.dict_orders[label] + 'Bool') - if (bool == 1): - self.configpage.checkboxes[self.dict_orders[label]].setCheckState(2) - self.configpage.sliders[self.dict_orders[label]].setValue(self.label_order.find(label)+1) - else: - self.configpage.checkboxes[self.dict_orders[label]].setCheckState(0) - if (self.dict_orders[label] == 'net'): - self.configpage.ui.comboBox_numNet.setCurrentIndex(int(self.settings.get('num_dev', 0))) - self.configpage.lineedits[self.dict_orders[label]].setText(str(self.settings.get(self.dict_orders[label] + 'NonFormat', self.dict_defFormat[self.dict_orders[label]]))) - else: - self.configpage.lineedits[self.dict_orders[label]].setText(str(self.settings.get(self.dict_orders[label] + 'Format', self.dict_defFormat[self.dict_orders[label]]))) - if (self.dict_orders[label] == 'bat'): - self.configpage.ui.lineEdit_batdev.setText(str(self.settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))) - self.configpage.ui.lineEdit_acdev.setText(str(self.settings.get('ac_device', '/sys/class/power_supply/AC/online'))) - - # add config page - page = parent.addPage(self.configpage, i18n(self.name())) - page.setIcon(KIcon(self.icon())) - - parent.okClicked.connect(self.configAccepted.configAccepted) + self.configpage = configwindow.ConfigWindow(self) + self.configdef = configdef.ConfigDefinition(self, self.configpage) + self.configdef.createConfigurationInterface(parent) + + + def initTooltip(self): + """function to create tooltip""" + self.tooltip = Plasma.ToolTipContent() + self.tooltip.setMainText("PyTetMonitor") + self.tooltip.setSubText('') + Plasma.ToolTipManager.self().registerWidget(self.applet) + # show tooltip + #Plasma.ToolTipManager.self().setContent(self.applet, self.tooltip) def setupNetdev(self): @@ -102,12 +87,6 @@ class pyTextWidget(plasmascript.Applet): # setup temperature device commandOut = commands.getoutput("sensors | grep Physical -B2") self.tempdev = "lmsensors/"+commandOut.split("\n")[0]+"/"+'_'.join(commandOut.split("\n")[2].split(":")[0].split()) - # setup gpu device - commandOut = commands.getoutput("lspci") - if (commandOut.lower().find('nvidia') > -1): - self.gpudev = 'nvidia' - elif (commandOut.lower().find('radeon') > -1): - self.gpudev = 'ati' # create dictionaries self.dict_orders = {'6':'bat', '1':'cpu', '7':'cpuclock', '9':'gpu', 'a':'gputemp', @@ -124,24 +103,13 @@ class pyTextWidget(plasmascript.Applet): plasmascript.Applet.showConfigurationInterface(self) - def showTooltip(self, text): - """function to create and set tooltip""" - tooltip = Plasma.ToolTipContent() - tooltip.setImage(KIcon(self.icon())) - tooltip.setSubText(text) - tooltip.setAutohide(False) - Plasma.ToolTipManager.self().setContent(self.applet, tooltip) - Plasma.ToolTipManager.self().registerWidget(self.applet) - - def startPolling(self): try: self.timer.start() - QObject.connect(self.timer, SIGNAL("timeout()"), self.updateLabel) self.updateLabel() - self.showTooltip('') + self.tooltip.setSubText('') except Exception as (strerror): - self.showTooltip(str(strerror)) + self.tooltip.setSubText(str(strerror)) self.label_error = Plasma.Label(self.applet) self.label_error.setText('ERROR') self.layout.addItem(self.label_error) @@ -149,19 +117,10 @@ class pyTextWidget(plasmascript.Applet): def updateLabel(self): """function to update label""" - if (self.gpuBool == 1): - self.gpuText() - self.gpuChecker.label_exit = 2 - if (self.gputempBool == 1): - self.gputempText() - self.gpuTempChecker.label_exit = 2 if ((self.memBool == 1) and (self.memInMb == False)): self.memText() if ((self.swapBool == 1) and (self.swapInMb == False)): self.swapText() - if (self.hddtempBool == 1): - self.hddtempText() - self.hddTempChecker.label_exit = 2 if (self.batBool == 1): self.batText() @@ -193,36 +152,6 @@ class pyTextWidget(plasmascript.Applet): self.label_bat.setText(text) - def gpuText(self): - """function to set gpu text""" - if (self.gpuFormat.split('$gpu')[0] != self.gpuFormat): - line = self.gpuFormat.split('$gpu')[0] + self.gpuChecker.gpu + self.gpuFormat.split('$gpu')[1] - else: - line = self.gpuFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_gpu.setText(text) - - - def gputempText(self): - """function to set gpu temperature text""" - if (self.gputempFormat.split('$gputemp')[0] != self.gputempFormat): - line = self.gputempFormat.split('$gputemp')[0] + self.gpuTempChecker.gputemp + self.gputempFormat.split('$gputemp')[1] - else: - line = self.gputempFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_gputemp.setText(text) - - - def hddtempText(self): - """function to set hdd temperature text""" - if (self.hddtempFormat.split('@@')[0] != self.hddtempFormat): - line = self.hddtempFormat.split('@@')[0] + self.hddTempChecker.hddtemp + self.hddtempFormat.split('@@')[2] - else: - line = self.hddtempFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_hddtemp.setText(text) - - def memText(self): """function to set mem text""" full = self.mem_uf + self.mem_free diff --git a/source/contents/code/reinit.py b/source/contents/code/reinit.py index 75d2b3a..87b604c 100644 --- a/source/contents/code/reinit.py +++ b/source/contents/code/reinit.py @@ -1,9 +1,8 @@ +# -*- coding: utf-8 -*- + from PyQt4.QtCore import * from PyKDE4.plasma import Plasma import config -import gpuchecker -import gputempchecker -import hddtempchecker @@ -14,22 +13,22 @@ class Reinit(): def reinit(self): """function to reinitializate widget""" - self.parent.settings = config.Config(self.parent) - self.parent.interval = int(self.parent.settings.get('interval', 2000)) - self.parent.font_family = str(self.parent.settings.get('font_family', 'Terminus')) - self.parent.font_size = int(self.parent.settings.get('font_size', 12)) - self.parent.font_color = str(self.parent.settings.get('font_color', '#000000')) - self.parent.font_style = str(self.parent.settings.get('font_style', 'normal')) - self.parent.font_weight = int(self.parent.settings.get('font_weight', 400)) + settings = config.Config(self.parent) + self.parent.interval = settings.get('interval', 2000).toInt()[0] + self.parent.font_family = str(settings.get('font_family', 'Terminus')) + self.parent.font_size = settings.get('font_size', 12).toInt()[0] + self.parent.font_color = str(settings.get('font_color', '#000000')) + self.parent.font_style = str(settings.get('font_style', 'normal')) + self.parent.font_weight = settings.get('font_weight', 400).toInt()[0] self.parent.formatLine = "

$LINE
" - self.parent.label_order = str(self.parent.settings.get('label_order', '1345')) + self.parent.label_order = str(settings.get('label_order', '1345')) for label in self.parent.dict_orders.values(): if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')): - exec ('self.parent.' + label + 'Bool = int(self.parent.settings.get("' + label + 'Bool", 1))') + exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool", 1))') else: - exec ('self.parent.' + label + 'Bool = int(self.parent.settings.get("' + label + 'Bool", 0))') + exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool", 0))') # small function for update if errors exist summ = 0 for label in self.parent.dict_orders.values(): @@ -40,14 +39,14 @@ class Reinit(): exec ('self.parent.' + label + 'Bool = 1') else: exec ('self.parent.' + label + 'Bool = 0') - exec ('self.parent.settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)') + exec ('settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)') self.parent.label_order = '1345' - self.parent.settings.set('label_order', self.parent.label_order) + settings.set('label_order', self.parent.label_order) for order in self.parent.label_order: if (order == "1"): if (self.parent.cpuBool == 1): - self.parent.cpuFormat = str(self.parent.settings.get('cpuFormat', '[cpu: $cpu%]')) + self.parent.cpuFormat = str(settings.get('cpuFormat', '[cpu: $cpu%]')) if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): self.parent.label_cpu0 = Plasma.Label(self.parent.applet) self.parent.label_cpu1 = Plasma.Label(self.parent.applet) @@ -81,7 +80,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_cpu) elif (order == "2"): if (self.parent.tempBool == 1): - self.parent.tempFormat = str(self.parent.settings.get('tempFormat', '[temp: $temp°C]')) + self.parent.tempFormat = str(settings.get('tempFormat', '[temp: $temp°C]')) self.parent.label_temp = Plasma.Label(self.parent.applet) if (self.parent.tempFormat.split('$temp')[0] != self.parent.tempFormat): line = self.parent.tempFormat.split('$temp')[0] + '----' + self.parent.tempFormat.split('$temp')[1] @@ -92,7 +91,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_temp) elif (order == "3"): if (self.parent.memBool == 1): - self.parent.memFormat = str(self.parent.settings.get('memFormat', '[mem: $mem%]')) + self.parent.memFormat = str(settings.get('memFormat', '[mem: $mem%]')) if (self.parent.memFormat.split('$memmb')[0] != self.parent.memFormat): self.parent.memInMb = True text = self.parent.formatLine.split('$LINE')[0] + self.parent.memFormat.split('$memmb')[0] + '-----' + self.parent.memFormat.split('$memmb')[1] + self.parent.formatLine.split('$LINE')[1] @@ -110,7 +109,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_mem) elif (order == "4"): if (self.parent.swapBool == 1): - self.parent.swapFormat = str(self.parent.settings.get('swapFormat', '[swap: $swap%]')) + self.parent.swapFormat = str(settings.get('swapFormat', '[swap: $swap%]')) if (self.parent.swapFormat.split('$swapmb')[0] != self.parent.swapFormat): self.parent.swapInMb = True text = self.parent.formatLine.split('$LINE')[0] + self.parent.swapFormat.split('$swapmb')[0] + '-----' + self.parent.swapFormat.split('$swapmb')[1] + self.parent.formatLine.split('$LINE')[1] @@ -127,12 +126,12 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_swap) elif (order == "5"): if (self.parent.netBool == 1): - self.parent.netNonFormat = str(self.parent.settings.get('netNonFormat', '[net: $netKB/s]')) + self.parent.netNonFormat = str(settings.get('netNonFormat', '[net: $netKB/s]')) if (self.parent.netNonFormat.split('@@')[0] != self.parent.netNonFormat): self.parent.netdev = self.parent.netNonFormat.split('@@')[1] self.parent.netNonFormat = self.parent.netNonFormat.split('@@')[0] + self.parent.netNonFormat.split('@@')[2] else: - self.parent.num_dev = int(self.parent.settings.get('num_dev', 0)) + self.parent.num_dev = int(settings.get('num_dev', 0)) self.parent.setupNetdev() if (self.parent.netNonFormat.split('$netdev')[0] != self.parent.netNonFormat): self.parent.netFormat = self.parent.netNonFormat.split('$netdev')[0] + self.parent.netdev + self.parent.netNonFormat.split('$netdev')[1] @@ -156,9 +155,9 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_netUp) elif (order == "6"): if (self.parent.batBool == 1): - self.parent.batFormat = str(self.parent.settings.get('batFormat', '[bat: $bat%$ac]')) - self.parent.battery_device= str(self.parent.settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity')) - self.parent.ac_device = str(self.parent.settings.get('ac_device', '/sys/class/power_supply/AC/online')) + self.parent.batFormat = str(settings.get('batFormat', '[bat: $bat%$ac]')) + self.parent.battery_device= str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity')) + self.parent.ac_device = str(settings.get('ac_device', '/sys/class/power_supply/AC/online')) self.parent.label_bat = Plasma.Label(self.parent.applet) line = self.parent.batFormat if (line.split('$ac')[0] != line): @@ -170,7 +169,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_bat) elif (order == "7"): if (self.parent.cpuclockBool == 1): - self.parent.cpuclockFormat = str(self.parent.settings.get('cpuclockFormat', '[mhz: $cpucl]')) + self.parent.cpuclockFormat = str(settings.get('cpuclockFormat', '[mhz: $cpucl]')) if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat): self.parent.label_cpuclock0 = Plasma.Label(self.parent.applet) self.parent.label_cpuclock1 = Plasma.Label(self.parent.applet) @@ -204,7 +203,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_cpuclock) elif (order == "8"): if (self.parent.uptimeBool == 1): - self.parent.uptimeFormat = str(self.parent.settings.get('uptimeFormat', '[uptime: $uptime]')) + self.parent.uptimeFormat = str(settings.get('uptimeFormat', '[uptime: $uptime]')) self.parent.label_uptime = Plasma.Label(self.parent.applet) if (self.parent.uptimeFormat.split('$uptime')[0] != self.parent.uptimeFormat): line = self.parent.uptimeFormat.split('$uptime')[0] + '---d--h--m' + self.parent.uptimeFormat.split('$uptime')[1] @@ -215,7 +214,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_uptime) elif (order == "9"): if (self.parent.gpuBool == 1): - self.parent.gpuFormat = str(self.parent.settings.get('gpuFormat', '[gpu: $gpu%]')) + self.parent.gpuFormat = str(settings.get('gpuFormat', '[gpu: $gpu%]')) self.parent.label_gpu = Plasma.Label(self.parent.applet) if (self.parent.gpuFormat.split('$gpu')[0] != self.parent.gpuFormat): line = self.parent.gpuFormat.split('$gpu')[0] + '-----' + self.parent.gpuFormat.split('$gpu')[1] @@ -226,7 +225,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_gpu) elif (order == "a"): if (self.parent.gputempBool == 1): - self.parent.gputempFormat = str(self.parent.settings.get('gputempFormat', '[gpu temp: $gputemp°C]')) + self.parent.gputempFormat = str(settings.get('gputempFormat', '[gpu temp: $gputemp°C]')) self.parent.label_gputemp = Plasma.Label(self.parent.applet) if (self.parent.gputempFormat.split('$gputemp')[0] != self.parent.gputempFormat): line = self.parent.gputempFormat.split('$gputemp')[0] + '----' + self.parent.gputempFormat.split('$gputemp')[1] @@ -237,7 +236,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_gputemp) elif (order == "b"): if (self.parent.hddBool == 1): - self.parent.hddFormat = str(self.parent.settings.get('hddFormat', '[hdd: @@/@@%]')) + self.parent.hddFormat = str(settings.get('hddFormat', '[hdd: @@/@@%]')) if (self.parent.hddFormat.split('@@')[0] != self.parent.hddFormat): self.parent.mountPoints = self.parent.hddFormat.split('@@')[1].split(';') line = self.parent.hddFormat.split('@@')[0] @@ -262,7 +261,7 @@ class Reinit(): self.parent.layout.addItem(self.parent.label_hdd0) elif (order == "c"): if (self.parent.hddtempBool == 1): - self.parent.hddtempFormat = str(self.parent.settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@°C]')) + self.parent.hddtempFormat = str(settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@°C]')) self.parent.label_hddtemp = Plasma.Label(self.parent.applet) if (self.parent.hddtempFormat.split('@@')[0] != self.parent.hddtempFormat): line = self.parent.hddtempFormat.split('@@')[0] + '----' + self.parent.hddtempFormat.split('@@')[2] @@ -277,17 +276,8 @@ class Reinit(): self.parent.setBackgroundHints(Plasma.Applet.DefaultBackground) self.parent.resize(10,10) - # create threading + # create dataengines self.parent.dataengine.connectToEngine() - self.parent.timer = QTimer() + self.parent.timer.setInterval(self.parent.interval) - if (self.parent.gpuBool == 1): - self.parent.gpuChecker = gpuchecker.GpuThread(self.parent.interval, self.parent.gpudev) - self.parent.gpuChecker.start() - if (self.parent.gputempBool == 1): - self.parent.gpuTempChecker = gputempchecker.GpuTempThread(self.parent.interval, self.parent.gpudev) - self.parent.gpuTempChecker.start() - if (self.parent.hddtempBool ==1): - self.parent.hddTempChecker = hddtempchecker.HddTempThread(self.parent.interval, self.parent.hddtempFormat.split('@@')[1]) - self.parent.hddTempChecker.start() self.parent.startPolling() diff --git a/source/contents/code/util.py b/source/contents/code/util.py index 32b87db..c2ac27c 100644 --- a/source/contents/code/util.py +++ b/source/contents/code/util.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -import os from shutil import copyfile from PyKDE4.kdecore import * +import os @@ -10,16 +10,19 @@ class Util(): def __init__(self, applet): self.applet = applet + def createDirectory(self, name): if not os.path.isdir(name): try: os.mkdir(name) except: print 'Failed to create directory: ' + name - + + def kdeHome(self): return unicode(KGlobal.dirs().localkdedir()) - + + def createNotifyrc(self): print '[%s] creating notifyrc' % (self.applet._name) self.createDirectory(self.kdeHome() + 'share/apps/%s' % self.applet._name) @@ -28,9 +31,10 @@ class Util(): destination = self.kdeHome() + 'share/apps/%s/%s.notifyrc' % (self.applet._name, self.applet._name) copyfile(source, destination) + def createConfig(self): self.createDirectory(self.kdeHome() + 'share/apps/%s' % self.applet._name) source = self.applet.package().path() + 'contents/misc/%s.ini' % self.applet._name destination = self.kdeHome() + 'share/apps/%s/%s.ini' % (self.applet._name, self.applet._name) - copyfile(source, destination) \ No newline at end of file + copyfile(source, destination) diff --git a/source/metadata.desktop b/source/metadata.desktop index fec9634..e235d9a 100644 --- a/source/metadata.desktop +++ b/source/metadata.desktop @@ -1,17 +1,19 @@ [Desktop Entry] Encoding=UTF-8 Name=Py Text Monitor -Type=Service ServiceTypes=Plasma/Applet +Type=Service Icon=utilities-system-monitor + X-Plasma-API=python X-Plasma-MainScript=code/main.py + X-KDE-PluginInfo-Author=Evgeniy Alexeev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=py-text-monitor -X-KDE-PluginInfo-Version=1.3.1 +X-KDE-PluginInfo-Version=1.3.2 X-KDE-PluginInfo-Website=http://kde-look.org/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true \ No newline at end of file +X-KDE-PluginInfo-EnabledByDefault=true