Changeset 3421

Timestamp:

Jan 26, 2017, 12:46:01 PM (2 years ago)

Author:

daduve

Message:

Adding new function to share group in n4d variable and set user default at login screen

Location:

epoptes/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• epoptes/common/config.py (modified) (4 diffs)
• epoptes/ui/gui.py (modified) (2 diffs)

epoptes/trunk/fuentes/debian/changelog

@@ +1 @@
+epoptes (0.5.9-lliurex20) xenial; urgency=high
+
+  * Adding new function to share group in n4d variable and set user
+    default at login screen
+
+ -- Daniel Duran Vecino <daduve@gmail.com>  Thu, 26 Jan 2017 12:45:12 +0100
+
 epoptes (0.5.9-lliurex19) xenial; urgency=high
 

epoptes/trunk/fuentes/epoptes/common/config.py

@@ -107 +107 @@
         return {}
 
-def read_groups(filename):
+def read_groups(filename,n4d_mode=None):
     """Parse a JSON file and create the appropriate group and
     client objects.
@@ -114 +114 @@
     instances list.
     """
-    try:
-        f=open(filename)
-        data = json.loads(f.read())
-        f.close()
-    except:
-        return ([],[])
+    if not n4d_mode:
+        try:
+            f=open(filename)
+            data = json.loads(f.read())
+            f.close()
+        except:
+            return ([],[])
+    else:
+        try:
+            import xmlrpclib as x
+            c=x.ServerProxy("https://server:9779")
+            data=c.get_variable("","VariablesManager","EPOPTES_GROUPS")
+
+            #print "***** EPOPTES N4D DATA: [%s] ..."%data
+            # If not exists value to EPOPTES GROUP in N4D, .config/epoptes/groups.json is listed
+            if data==None or data=={}:
+                f=open(filename)
+                data = json.loads(f.read())
+                f.close()
+            #raise Exception
+        except:
+            return ([],[])
     
     saved_clients = {}
@@ -137 +153 @@
     return (saved_clients.values(), groups)
     
-def save_groups(filename, model):
+def save_groups(filename, model,n4d_mode=None):
     """Save the groups and their members from model (gtk.ListStore)
     in JSON format.
@@ -185 +201 @@
         f.write(json.dumps(data, indent=2))
         f.close()
+        #print "JSON ESCRITO"
     except:
         pass
+    valor=str(n4d_mode)
+    #print "N4D_MODE POSEEEEEEE EL VALOR DE: %s" %valor
+    if n4d_mode!=None:
+        import xmlrpclib as x
+        c=x.ServerProxy("https://server:9779")
+
+        # Just in case EPOPTES_GROUPS Variable does not exist
+        #print c.add_variable(n4d_mode,"VariablesManager","EPOPTES_GROUPS",{},"","Epoptes Groups",[],False,False)
+        if c.add_group(n4d_mode,"EpoptesVariables",n4d_mode)[0]:
+
+                #print c.set_variable(n4d_mode,"VariablesManager","EPOPTES_GROUPS",data)
+                c.set_group(n4d_mode,"EpoptesVariables",n4d_mode,data)
+
 
 def write_history():

epoptes/trunk/fuentes/epoptes/ui/gui.py

@@ -128 +128 @@
         self.reload_imagetypes()
         
-        saved_clients, groups = config.read_groups(os.path.expanduser('~/.config/epoptes/groups.json'))
+        saved_clients, groups = config.read_groups(os.path.expanduser('~/.config/epoptes/groups.json'),True)
         for grp in groups:
             self.gstore.append([grp.name, grp, True])
@@ -190 +190 @@
           sel_group = self.gstore.get_path(self.getSelectedGroup()[0])[0]
           self.gstore.remove(self.gstore.get_iter(self.default_group.ref.get_path()))
-          config.save_groups(os.path.expanduser('~/.config/epoptes/groups.json'), self.gstore)
+          config.save_groups(os.path.expanduser('~/.config/epoptes/groups.json'), self.gstore,(self.n4d_user,self.n4d_password))
           settings = config.settings
           if not settings.has_section('GUI'):