add nfs scan to cache, clean code is not finally

diff --git a/networkbrowser/src/NetworkBrowser.py b/networkbrowser/src/NetworkBrowser.py
index 74479c8..7e1c4ba 100755 (executable)
--- a/networkbrowser/src/NetworkBrowser.py
+++ b/networkbrowser/src/NetworkBrowser.py
@@ -30,7 +30,7 @@ def write_cache(cache_file, cache_data):
                try:
                        mkdir( os_path.dirname(cache_file) )
                except OSError:
-                       print os_path.dirname(cache_file), 'is a file'
+                       print os_path.dirname(cache_file), '[Networkbrowser] is a file'
        fd = open(cache_file, 'w')
        dump(cache_data, fd, -1)
        fd.close()
@@ -168,18 +168,15 @@ class NetworkBrowser(Screen):
        def scanIPclosed(self,result):
                if result[0]:
                        if result[1] == "address":
-                               print "got IP:",result[1]
+                               print "[Networkbrowser] got IP:",result[1]
                                nwlist = []
                                nwlist.append(netscan.netzInfo(result[0] + "/24"))
-                               self.networklist = nwlist[0]
-                               print "###################################"
-                               print self.networklist
+                               self.networklist += nwlist[0]
                        elif result[1] == "nfs":
                                self.networklist.append(['host', result[0], result[0] , '00:00:00:00:00:00', result[0], 'Master Browser'])
-                               print "###################################"
-                               print self.networklist
 
                if len(self.networklist) > 0:
+                       write_cache(self.cache_file, self.networklist)
                        self.updateHostsList()
 
        def setStatus(self,status = None):
@@ -198,13 +195,13 @@ class NetworkBrowser(Screen):
                self.inv_cache = 0
                self.vc = valid_cache(self.cache_file, self.cache_ttl)
                if self.cache_ttl > 0 and self.vc != 0:
-                       print 'Loading network cache from ',self.cache_file
+                       print '[Networkbrowser] Loading network cache from ',self.cache_file
                        try:
                                self.networklist = load_cache(self.cache_file)
                        except:
                                self.inv_cache = 1
                if self.cache_ttl == 0 or self.inv_cache == 1 or self.vc == 0:
-                       print 'Getting fresh network list'
+                       print '[Networkbrowser] Getting fresh network list'
                        self.networklist = self.getNetworkIPs()
                        write_cache(self.cache_file, self.networklist)
                if len(self.networklist) > 0:
@@ -227,7 +224,7 @@ class NetworkBrowser(Screen):
                self.sharecache_file = None
                self.sharecache_file = '/etc/enigma2/' + hostname.strip() + '.cache' #Path to cache directory
                if os_path.exists(self.sharecache_file):
-                       print 'Loading userinfo from ',self.sharecache_file
+                       print '[Networkbrowser] Loading userinfo from ',self.sharecache_file
                        try:
                                self.hostdata = load_cache(self.sharecache_file)
                                username = self.hostdata['username']
@@ -378,17 +375,19 @@ class NetworkBrowser(Screen):
                        else:
                                self.hostcache_file = '/etc/enigma2/' + selectedhostname.strip() + '.cache' #Path to cache directory
                                if os_path.exists(self.hostcache_file):
-                                       print 'Loading userinfo cache from ',self.hostcache_file
+                                       print '[Networkbrowser] Loading userinfo cache from ',self.hostcache_file
                                        try:
                                                self.hostdata = load_cache(self.hostcache_file)
                                                self.passwordQuestion(False)
                                        except:
-                                               self.session.openWithCallback(self.passwordQuestion, MessageBox, (_("Do you want to enter a username and password for this host?\n") ) )
-                               else:
-                                       self.session.openWithCallback(self.passwordQuestion, MessageBox, (_("Do you want to enter a username and password for this host?\n") ) )
+                                               print '[Networkbrowser] exception Loading userinfo from cache'
+               print '[Networkbrowser] sel:' + sel[0][0]
                if sel[0][0] == 'nfsShare': # share entry selected
+                       print '[Networkbrowser] sel nfsShare'
                        self.openMountEdit(sel[0])
                if sel[0][0] == 'smbShare': # share entry selected
+                       print '[Networkbrowser] sel nfsShare'
+                       self.session.openWithCallback(self.passwordQuestion, MessageBox, (_("Do you want to enter a username and password for this host?\n") ) )
                        self.openMountEdit(sel[0])
 
        def passwordQuestion(self, ret = False):
@@ -444,7 +443,7 @@ class NetworkBrowser(Screen):
                                self.sharecache_file = None
                                self.sharecache_file = '/etc/enigma2/' + selection[1].strip() + '.cache' #Path to cache directory
                                if os_path.exists(self.sharecache_file):
-                                       print 'Loading userinfo from ',self.sharecache_file
+                                       print '[Networkbrowser] Loading userinfo from ',self.sharecache_file
                                        try:
                                                self.hostdata = load_cache(self.sharecache_file)
                                                data['username'] = self.hostdata['username']