Changeset 2482

Timestamp:

Sep 19, 2016, 6:34:05 PM (4 years ago)

Author:

kbut

Message:

a lot of thins

Location:

lliurex-mirror/trunk/fuentes

Files:

• admin-center-lliurex-mirror.install/lliurex-mirror/src/js/lliurex-mirror.js (modified) (1 diff)
• lliurex-mirror-cli/usr/bin/lliurex-mirror (modified) (1 diff)
• lliurex-mirror-gui (added)
• lliurex-mirror-gui/lliurex_mirror_connect.py (added)
• n4d-lliurex-mirror.install/etc/n4d/conf.d/MirrorManager (modified) (2 diffs)
• n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py (modified) (7 diffs)

lliurex-mirror/trunk/fuentes/admin-center-lliurex-mirror.install/lliurex-mirror/src/js/lliurex-mirror.js

@@ -394 +394 @@
   var credentials=[sessionStorage.username , sessionStorage.password];
   var n4dclass="MirrorManager";
-  var n4dmethod="is_mirror_update";
+  var n4dmethod="is_update_available";
   var arglist=[self.activedistro];
   var mirrorupdatemessage=document.querySelector('#llxmirrorupdatepanel');

lliurex-mirror/trunk/fuentes/lliurex-mirror-cli/usr/bin/lliurex-mirror

@@ -87 +87 @@
 
         def isMirrorUpdate(self,distro):
-                result = self.client.is_mirror_update(self.credentials,"MirrorManager",distro)
+                result = self.client.is_update_available(self.credentials,"MirrorManager",distro)
                 print str(result['msg'])
                 sys.exit( 0 if result['status'] else 1 )        

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/etc/n4d/conf.d/MirrorManager

@@ -12 +12 @@
 get_mirror_orig=anonymous,*
 set_mirror_orig=adm,admins
+get_option_update=anonymous,*
+set_option_update=adm,admins
 get_percentage=anonymous,*
 build_debmirror_config=adm,admins
+render_debmirror_config=adm,admins
 enable_webserver_into_folder=adm,admins
 stop_webserver=adm,admins
@@ -20 +23 @@
 get_available_mirrors=anonymous,*
 stopupdate=adm,admins
-is_mirror_update=anonymous,*
+download_time_file=adm,admins
+get_time_file=anonymous,*
+is_update_available=anonymous,*
+new_mirror_config=adm,admins
+get_all_configs=anonymous,*
+update_mirror_config=adm,admins
+get_client_ip=anonymous,*
+watch_update_finish=adm,admins
+is_alive_get_mirror=anonymous,*
+get_mirror=adm,admins

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

@@ -313 +313 @@
 
         def set_mirror_orig(self,distro,url,option):
+                if url == None:
+                        return {'status':False,'msg':'url is None'}
                 configpath = os.path.join(self.configpath, distro + ".json")
                 config = json.load(open(configpath,'r'))
@@ -360 +362 @@
 
         def build_debmirror_config(self,distro):
-                template = self.tpl_env.get_template('debmirror.conf')
-                configpath = os.path.join(self.configpath,distro + ".json")
-                config = json.load(open(configpath,'r'))
-                string_template = template.render(config).encode('utf-8')
+                result = self.render_debmirror_config(distro)
+                string_template = result['msg']
                 f = open(os.path.join(self.debmirrorconfpath,distro),'w')
                 f.write(string_template)
                 f.close()
         #def build_debmirror_config
+
+        def render_debmirror_config(self,distro):
+                template = self.tpl_env.get_template('debmirror.conf')
+                configpath = os.path.join(self.configpath,distro + ".json")
+                config = json.load(open(configpath,'r'))
+                return {'status':True,'msg':template.render(config).encode('utf-8')}
+
+        #def render_debmirror_config
         
         def enable_webserver_into_folder(self,path):
@@ -469 +477 @@
         # def get_time_file             
 
-        def is_mirror_update(self,distro):
+        def is_update_available(self,distro):
 
                 configpath = os.path.join(self.configpath,distro + ".json")
@@ -513 +521 @@
                         return {'status':False,'msg':file_local_mirror + ' does not exist.','action':'nothing'}
 
-        # def is_mirror_update
+        # def is_update_available
 
         def new_mirror_config(self,config):
@@ -524 +532 @@
                 if name == "":
                         return {'status':False,'msg':"Name can't void"}
-                newconfigpath = os.path.join(self.configpath,name,'.json')
-                if os.path.exists(newconfigpath):
-                        return {'status':False,'msg':'Path for %s already exists'%config["NAME"]}
+                while True:
+                        newconfigpath = os.path.join(self.configpath,name,'.json')
+                        if not os.path.exists(newconfigpath):
+                                break
+                        name = name + "1"
 
                 data=unicode(json.dumps(config,indent=4,encoding="utf-8",ensure_ascii=False)).encode("utf-8")
@@ -532 +542 @@
                 f.write(data)
                 f.close()
-                return {'status':True,'msg':'Config has been created'}
+                return {'status':True,'msg':name}
         #def new_mirror_config
 
@@ -557 +567 @@
                 return {'status':True,'msg':'Updated config'}
         #def update_mirror_config
+
+        def get_client_ip(self,ip):
+                return {'status':True,'msg':ip}
+        #def get_client_ip
+
+        def watch_update_finish(self,credentials,server):
+                self.watch_thread=threading.Thread(target=self._update,args=(credentials,server,))
+                self.watch_thread.daemon=True
+                self.watch_thread.start()
+                
+        #def watch_update_finish
+
+        def _watch_update_finish(self,credentials,server)
+                import time
+                import xmlrpclib as x
+                while True:
+                        try:
+                                time.sleep(240)
+                                c = x.ServerProxy('https://'+ server +':9779')
+                                result = c.is_alive(credentials,'MirrorManager')
+                                if ! result:
+                                        self.stop_webserver()
+                                        break
+                        except:
+                                break
+        #def _watch_update_finish
+
+        def is_alive_get_mirror(self):
+                return {'status':self.get_mirror_thread.is_alive(),'msg':}
+        #def is_alive_get_mirror
+
+        def get_mirror(self,config_path):
+                self.get_mirror_thread = threading.Thread(target=self._get_mirror,args=(config_path))
+                self.get_mirror_thread.daemon = True
+                self.get_mirror_thread.start()
+        #def get_mirror
+
+        def _get_mirror(self,config_path):
+                self.get_mirror_process = pexpect.spawn("/usr/bin/debmirror --config-file="+config_path)
+                while True:
+                        try:
+                                self.get_mirror_process.expect('\n')
+                                line =self.get_mirror_process.before
+                                line1=line.strip("\n")
+                                if line1.startswith("[") and line1[5] == "]":
+                                        self.exportpercentage = (int(line1[1:4].strip()),self.get_mirror_process.exitstatus)
+                        except pexpect.EOF:
+                                        line1 = self.get_mirror_process.before
+                                        if line1 != "" and line1.startswith("[") and line1[5] == "]":
+                                                        self.exportpercentage=(int(line1[1:4].strip()),self.get_mirror_process.exitstatus)
+                                        self.get_mirror_process.close()
+                                        status = self.get_mirror_process.exitstatus
+                                        self.exportpercentage=(self.exportpercentage[0],status)
+                                        break
+                        except Exception as e:
+                                break
+        #def _get