From 9f392c3a1981a2d3036a0689a51012b5d0c78388 Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Sat, 24 May 2014 18:08:03 +0400
Subject: [PATCH] edited update netdevice

---
 sources/ptm/contents/code/main.py   | 18 ++++++++++++------
 sources/ptm/contents/code/reinit.py |  5 +----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sources/ptm/contents/code/main.py b/sources/ptm/contents/code/main.py
index 3d70c5a..80a147b 100644
--- a/sources/ptm/contents/code/main.py
+++ b/sources/ptm/contents/code/main.py
@@ -116,6 +116,7 @@ class pyTextWidget(plasmascript.Applet):
                         self.ptm['dataengine']['system'], SLOT("forceImmediateUpdateOfAllVisualizations()"))
         QObject.connect(self.ptmActions['update'], SIGNAL("triggered(bool)"),
                         self.ptm['dataengine']['time'], SLOT("forceImmediateUpdateOfAllVisualizations()"))
+        QObject.connect(self.ptmActions['update'], SIGNAL("triggered(bool)"), self.updateNetdev)
 
 
     def contextualActions(self):
@@ -311,6 +312,11 @@ class pyTextWidget(plasmascript.Applet):
         self.updateTooltip()
 
 
+    def updateNetdev(self):
+        """function to update netdev"""
+        self.ptm['names']['net'] = self.setNetdev()
+
+
     def updateTooltip(self):
         """function to update tooltip"""
         self.tooltipView.resize(100.0*(len(self.ptm['vars']['tooltip']['required']) - self.ptm['vars']['tooltip']['required'].count('up')), 100.0)
@@ -597,8 +603,7 @@ class pyTextWidget(plasmascript.Applet):
     def reInit(self):
         """function to run reinit"""
         self.reinit.reinit()
-        if (self.ptm['vars']['adv']['netdevBool'] == 0):
-            self.ptm['names']['net'] = self.setNetdev()
+        self.updateNetdev()
         self.resize(10, 10)
 
         # create dataengines
@@ -611,18 +616,19 @@ class pyTextWidget(plasmascript.Applet):
 
     def setNetdev(self):
         """function to set network device"""
+        if (self.ptm['vars']['adv']['netdevBool'] > 0):
+            return self.ptm['vars']['adv']['netdev']
         netdev = "lo"
         netdir = self.ptm['vars']['adv']['netDir']
         interfaces = QDir.entryList(QDir(netdir), QDir.Dirs | QDir.NoDotAndDotDot)
         for device in interfaces:
             if (str(device) != "lo"):
-                #try:
-                if True:
+                try:
                     with open(netdir + '/' + str(device) + '/operstate', 'r') as stateFile:
                         if (stateFile.readline() == "up\n"):
                             netdev = str(device)
-                #except:
-                    #pass
+                except:
+                    pass
         return netdev
 
 
diff --git a/sources/ptm/contents/code/reinit.py b/sources/ptm/contents/code/reinit.py
index 8de79bb..a87f602 100644
--- a/sources/ptm/contents/code/reinit.py
+++ b/sources/ptm/contents/code/reinit.py
@@ -45,6 +45,7 @@ class Reinit():
         ptmVars['adv']['customTime'] = str(settings.get('custom_time', '$hh:$mm'))
         ptmVars['adv']['customUptime'] = str(settings.get('custom_uptime', '$dd,$hh,$mm'))
         ptmVars['adv']['netdevBool'] = settings.get('netdevBool', 0).toInt()[0]
+        ptmVars['adv']['netdev'] = str(settings.get('custom_netdev', 'lo'))
         ptmVars['adv']['netDir'] = str(settings.get('netdir', '/sys/class/net'))
         ptmVars['adv']['player'] = str(settings.get('player_name', "amarok"))
 
@@ -74,10 +75,6 @@ class Reinit():
         ptmNames['disk'] = str(settings.get('disk', 'disk/sda_(8:0)')).split('@@')
         ptmNames['hdd'] = str(settings.get('mount', '/')).split('@@')
         ptmNames['hddtemp'] = str(settings.get('hdd', '/dev/sda')).split('@@')
-        if (ptmVars['adv']['netdevBool'] > 0):
-            ptmNames['net'] = str(settings.get('custom_netdev', 'lo'))
-        else:
-            ptmNames['net'] = ""
         ptmNames['temp'] = str(settings.get('temp_device', '')).split('@@')
         self.parent.applySettings('names', ptmNames)