Changeset 6818

Timestamp:

Feb 14, 2018, 6:10:39 PM (2 years ago)

Author:

Juanma

Message:

refactorized

Location:

taskscheduler/trunk/fuentes

Files:

• client-scheduler.install/usr/share/n4d/python-plugins/SchedulerClient.py (modified) (1 diff)
• python3-taskscheduler.install/usr/share/taskscheduler/taskscheduler.py (modified) (1 diff)
• scheduler-gui.install/usr/share/taskscheduler/rsrc/taskScheduler.ui (modified) (1 diff)
• server-scheduler.install/etc/n4d/conf.d/SchedulerServer (modified) (1 diff)
• server-scheduler.install/usr/share/n4d/python-plugins/SchedulerServer.py (modified) (4 diffs)

taskscheduler/trunk/fuentes/client-scheduler.install/usr/share/n4d/python-plugins/SchedulerClient.py

@@ -90 +90 @@
                                                         task_data['mon'],task_data['dow'],u""+task_data['cmd']))
                         cron_array.append(cron_task)
+#                       for task_serial,task_info in task_data.items():
+#                               cron_task=("%s %s %s %s %s root %s"%(task_info['m'],task_info['h'],task_info['dom'],\
+#                                                               task_info['mon'],task_info['dow'],task_info['cmd']))
+#                               cron_array.append(cron_task)
                         if task_data:
                                 with open(fname,'w') as data:

taskscheduler/trunk/fuentes/python3-taskscheduler.install/usr/share/taskscheduler/taskscheduler.py

@@ -52 +52 @@
                 tasks={}
                 self._debug("Retrieving task list remote=%s"%sw_remote)
+                if self.n4dserver:
+                        result=self.n4dserver.get_remote_tasks("","SchedulerServer")
+                        if type(result)==type({}):
+                                tasks=result.copy()
                 result=self.n4dclient.get_tasks("","SchedulerServer")
                 if type(result)==type({}):
-                        tasks=result['data'].copy()
+                        tasks.update(result['data'].copy())
                 return tasks
         #def get_scheduled_tasks

taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/rsrc/taskScheduler.ui

@@ -396 +396 @@
             </child>
             <child>
-              <object class="GtkBox" id="nav_bo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="hexpand">True</property>
-                <child>
-                  <object class="GtkButton" id="btn_all_tasks">
-                    <property name="label" translatable="yes">button</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="btn_fixed_tasks">
-                    <property name="label" translatable="yes">button</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="btn_repetitive_tasks">
-                    <property name="label" translatable="yes">button</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="btn_daily_tasks">
-                    <property name="label" translatable="yes">button</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
+              <placeholder/>
             </child>
           </object>

taskscheduler/trunk/fuentes/server-scheduler.install/etc/n4d/conf.d/SchedulerServer

@@ -8 +8 @@
 remove_task=adm,admins,teachers
 get_tasks=*,anonymous
+get_remote_tasks=*,anonymous
 get_available_tasks=*,anonymous

taskscheduler/trunk/fuentes/server-scheduler.install/usr/share/n4d/python-plugins/SchedulerServer.py

@@ -35 +35 @@
                         sw_continue=False
                         for task in task_serial.keys():
-                                if ['spread_task'] in task.keys():
-                                                if task['spread_task']==True:
+                                if ['spread'] in task.keys():
+                                                if task['spread']==True:
                                                         sw_continue=True
                                                         break
@@ -46 +46 @@
         def get_remote_tasks(self):
                 remote_tasks={}
-                tasks_data=self._read_wrkfiles(self.tasks_dir)['data']
-                for task_serial in tasks_data.keys():
+                tasks_data=self._read_wrkfiles(self.tasks_dir)['data'].copy()
+
+                for task_name,serial_data in tasks_data.items():
                         sw_continue=False
-                        for task in task_serial.keys():
-                                if ['spread_task'] in task.keys():
-                                        if task['spread_task']==True:
-                                                remote_tasks.update(task_serial)
-                                                break
+                        for serial,data in serial_data.items():
+                                if 'spread' in data.keys():
+                                        if data['spread']==True:
+                                                if task_name in remote_tasks.keys():
+#                                                       remote_tasks[task_name].update({'r'+serial:tasks_data[task_name][serial]})
+                                                        remote_tasks[task_name]['r'+serial]=tasks_data[task_name][serial]
+                                                else:
+                                                        remote_tasks[task_name]={'r'+serial:tasks_data[task_name][serial]}
                 return remote_tasks
 
@@ -85 +89 @@
                 if os.path.isfile(wrkfile):
                         try:
-                                tasks=json.loads(open(wrkfile).read())
-                        except :
+#                               with open(wrkfile,"rb") as fh:
+#                                       tasks=json.load(fh)
+                                tasks=json.loads(open(wrkfile,"rb").read())
+                        except Exception as e:
                                 errormsg=(("unable to open %s") % wrkfile)
+                                errormsg=(("Reason: %s") %e)
                                 self._debug(errormsg)
                 return(tasks)
@@ -132 +139 @@
                 task_name=list(tasks.keys())[0]
                 task_serial=list(tasks[task_name].keys())[0]
+                task_data=tasks[task_name][task_serial]
+                del tasks[task_name][task_serial]
+                task_serial=task_serial.strip("r")
+                tasks[task_name]={task_serial:task_data}
                 self._debug(tasks)
                 serialized_task={}