Changeset 2489

Timestamp:

Sep 21, 2016, 3:39:57 PM (4 years ago)

Author:

kbut

Message:

fix bugs

Location:

lliurex-mirror/trunk/fuentes

Files:

• lliurex-mirror-gui/lliurex_mirror_connect.py (modified) (4 diffs)
• n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py (modified) (4 diffs)

lliurex-mirror/trunk/fuentes/lliurex-mirror-gui/lliurex_mirror_connect.py

@@ -24 +24 @@
 
         def local_connect(self):
-                self.client = xmlrpclib.ServerProxy('https://localhost:9779')
+                self.client = xmlrpclib.ServerProxy('https://localhost:9779',allow_none=True)
                 try:
                         self.client.get_methods()
@@ -42 +42 @@
 
         def mirror_list(self):
-                if self.client == None:
+                if type(self.client) == None:
                         return {}
                 result = self.client.get_all_configs(self.credentials,'MirrorManager')
@@ -71 +71 @@
         #def create_conf
 
-        def update(self,mirror,mode,data=None)
-        '''
+        def update(self,mirror,mode,data=None):
+                '''
                 mode is option to update mirror. (Internet, local network, folder)
                 data is extra info to update (local network ip, )
-        '''
+                '''
                 self.mode = None
                 if mode == '2':
@@ -129 +129 @@
                 return result['status']
         #def stop_update
+
+
+if __name__ == '__main__':
+        c = LliurexMirrorN4d('localhost',['kbut','lliurex'])
+        print c.mirror_list()

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py

@@ -551 +551 @@
                         configfile = os.path.join(self.configpath,version)
                         f = open(configfile,'r')
-                        allconfigs[version] = json.load(f)
+                        allconfigs[version.replace('.json','')] = json.load(f)
                         f.close()
                 return {'status':True,'msg':allconfigs}
@@ -579 +579 @@
         #def watch_update_finish
 
-        def _watch_update_finish(self,credentials,server)
+        def _watch_update_finish(self,credentials,server):
                 import time
                 import xmlrpclib as x
@@ -587 +587 @@
                                 c = x.ServerProxy('https://'+ server +':9779')
                                 result = c.is_alive(credentials,'MirrorManager')
-                                if ! result:
+                                if not result:
                                         self.stop_webserver()
                                         break
@@ -595 +595 @@
 
         def is_alive_get_mirror(self):
-                return {'status':self.get_mirror_thread.is_alive(),'msg':}
+                return {'status':self.get_mirror_thread.is_alive(),'msg':self.exportpercentage}
         #def is_alive_get_mirror