Changeset 6831

Timestamp:

Feb 16, 2018, 12:54:54 PM (18 months ago)

Author:

Juanma

Message:

refactorized

Location:

taskscheduler/trunk/fuentes

Files:

• python3-taskscheduler.install/usr/share/taskscheduler/taskscheduler.py (modified) (3 diffs)
• scheduler-gui.install/usr/share/taskscheduler/bin/taskScheduler.py (modified) (5 diffs)
• 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/python3-taskscheduler.install/usr/share/taskscheduler/taskscheduler.py

@@ -56 +56 @@
                         if type(result)==type({}):
                                 tasks=result.copy()
-                result=self.n4dclient.get_tasks("","SchedulerServer")['data']
+#               result=self.n4dclient.get_tasks("","SchedulerServer")['data']
+                result=self.n4dclient.get_local_tasks("","SchedulerServer")
                 if type(result)==type({}):
                         if tasks:
@@ -68 +69 @@
                         else:
                                 tasks.update(result.copy())
-                print(tasks)
                 return tasks
         #def get_scheduled_tasks
@@ -115 +115 @@
                 return wrkfiles
         #def _get_wrkfiles
+
+        def add_command(self,cmd_name,cmd):
+                if self.n4dserver:
+                        self.n4dserver.add_command(self.credentials,"SchedulerServer",cmd_name,cmd)
+                else:
+                        self.n4dclient.add_command(self.credentials,"SchedulerServer",cmd_name,cmd)
 
         def get_commands(self):

taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/bin/taskScheduler.py

@@ -250 +250 @@
                 self.manage_box=builder.get_object("manage_box")
                 custom_grid=builder.get_object("custom_grid")
-                custom_grid.set_margin_left(12)
-                custom_grid.set_margin_top(12)
+                custom_grid.set_margin_left(WIDGET_MARGIN*2)
+                custom_grid.set_margin_top(WIDGET_MARGIN*2)
                 txt_taskname=Gtk.Entry()
                 txt_taskname.set_tooltip_text(_("A descriptive name for the command"))
@@ -257 +257 @@
                 lbl_name=Gtk.Label(_("Task name"))
                 lbl_name.set_halign(Gtk.Align.END)
+                btn_add_cmd=Gtk.Button.new_from_stock(Gtk.STOCK_ADD)
                 custom_grid.attach(lbl_name,0,0,1,1)
                 custom_grid.attach(txt_taskname,1,0,1,1)
                 cmb_cmds=Gtk.ComboBoxText()
-                cmds=self.scheduler.get_commands()
-                i18n_cmd={}
-                for cmd in cmds.keys():
-                        i18n_cmd[_(cmd)]=cmd
-                        cmb_cmds.append_text(_(cmd))
-
+                i18n_cmd=self.load_cmb_cmds(cmb_cmds)
                 lbl_cmd=Gtk.Label(_("Command"))
                 lbl_cmd.set_halign(Gtk.Align.END)
                 custom_grid.attach(lbl_cmd,0,1,1,1)
                 custom_grid.attach(cmb_cmds,1,1,1,1)
+                custom_grid.attach(btn_add_cmd,2,1,1,1)
                 chk_parm_is_file=Gtk.CheckButton(_("Needs a file"))
                 chk_parm_is_file.set_tooltip_text(_("Mark if the command will launch a file"))
@@ -280 +277 @@
                 lbl_arg=Gtk.Label(_("Arguments"))
                 lbl_arg.set_halign(Gtk.Align.END)
-                custom_grid.attach(lbl_arg,2,1,1,1)
-                custom_grid.attach(txt_params,3,1,1,1)
-                custom_grid.attach(chk_parm_is_file,2,0,1,1)
-                custom_grid.attach(btn_file,3,0,1,1)
+                custom_grid.attach(lbl_arg,3,1,1,1)
+                custom_grid.attach(txt_params,4,1,1,1)
+                custom_grid.attach(chk_parm_is_file,3,0,1,1)
+                custom_grid.attach(btn_file,4,0,1,1)
                 btn_file.set_sensitive(False)
                 self.btn_apply_manage=builder.get_object("btn_apply_manage")
@@ -291 +288 @@
                 self.btn_cancel_manage=builder.get_object("btn_cancel_manage")
                 self.btn_cancel_manage.connect("clicked",self._cancel_manage_clicked)
+                btn_add_cmd.connect("clicked",self._add_cmd_clicked,cmb_cmds)
         #def _load_manage_tasks
+
+        def load_cmb_cmds(self,cmb_cmds):
+                cmb_cmds.remove_all()
+                cmds=self.scheduler.get_commands()
+                i18n_cmd={}
+                for cmd in cmds.keys():
+                        i18n_cmd[_(cmd)]=cmd
+                        cmb_cmds.append_text(_(cmd))
+                return(i18n_cmd)
+
+        def _add_cmd_clicked(self,*args):
+                cmb_cmds=args[-1]
+                def show_file_dialog(*args):
+                        file_response=dlg_file.run()
+                        if file_response == Gtk.ResponseType.OK:
+                                txt_file.set_text(dlg_file.get_filename())
+#                       dlg_file.destroy()
+                dialog=Gtk.Dialog()
+                dialog.add_buttons(Gtk.STOCK_APPLY,42,"Close",Gtk.ResponseType.CLOSE)
+                box=dialog.get_content_area()
+                hbox=Gtk.Grid()
+                hbox.set_column_spacing(WIDGET_MARGIN)
+                hbox.set_row_spacing(WIDGET_MARGIN)
+                lbl_name=Gtk.Label(_("Action name"))
+                txt_name=Gtk.Entry()
+                txt_name.set_tooltip_text("Enter the name for the action")
+                lbl_file=Gtk.Label(_("Command"))
+                txt_file=Gtk.Entry()
+                txt_file.set_tooltip_text("Enter the command or choose one from the file selector")
+                dlg_file=Gtk.FileChooserDialog(_("Choose a command"),dialog,Gtk.FileChooserAction.OPEN,(Gtk.STOCK_CANCEL,Gtk.ResponseType.CANCEL,Gtk.STOCK_OPEN,Gtk.ResponseType.OK))
+                btn_file=Gtk.Button.new_from_stock(Gtk.STOCK_FILE)
+                btn_file.connect("clicked",show_file_dialog)
+                hbox.attach(lbl_name,0,0,1,1)
+                hbox.attach(txt_name,1,0,1,1)
+                hbox.attach(lbl_file,0,1,1,1)
+                hbox.attach(txt_file,1,1,1,1)
+                hbox.attach(btn_file,2,1,1,1)
+                hbox.attach(Gtk.Separator(),0,2,2,1)
+                box.add(hbox)
+                box.show_all()
+                response=dialog.run()
+                if response==Gtk.ResponseType.CLOSE:
+                        dialog.destroy()
+                if response==42:
+                        self._add_custom_cmd(txt_name.get_text(),txt_file.get_text())
+                        self.load_cmb_cmds(cmb_cmds)
+        #def _add_cmd_clicked
+
+        def _add_custom_cmd(self,name,cmd):
+                self.scheduler.add_command(name,cmd)
         
         def _enable_filechooser(self,widget,filechooser):
@@ -300 +348 @@
         #def _enable_filechooser
 
-        def _add_custom_task(self,widget,w_name,w_cmd,w_parms,w_chk,w_file,i18n_cmd):
+        def _add_custom_task(self,widget,w_name,w_cmd,w_parms,w_chk,w_file,i18n_cmd=None):
                 name=w_name.get_text()
                 cmd=w_cmd.get_active_text()
-                cmd_desc=i18n_cmd[cmd]
+                if i18n_cmd:
+                        cmd_desc=i18n_cmd[cmd]
+                else:
+                        cmd_desc=cmd
                 parms=w_parms.get_text()
                 cmd=self.scheduler.get_command_cmd(cmd_desc)

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

@@ -9 +9 @@
 get_tasks=*,anonymous
 get_remote_tasks=*,anonymous
+get_local_tasks=*,anonymous
 get_available_tasks=*,anonymous
+add_command=adm,admins,teachers

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

@@ -11 +11 @@
 class SchedulerServer():
         def __init__(self):
-                self.dbg=0
+                self.dbg=1
                 self.tasks_dir="/etc/scheduler/tasks.d"
                 self.schedTasksDir=self.tasks_dir+"/scheduled"
@@ -18 +18 @@
                 self.remote_tasks_dir=self.tasks_dir+"/remote"
                 self.local_tasks_dir=self.tasks_dir+"/local"
+                self.commands_file='/etc/scheduler/conf.d/commands/commands.json'
         #def __init__
 
@@ -32 +33 @@
                 local_tasks={}
                 tasks_data=self._read_wrkfiles(self.tasks_dir)['data'].copy()
-                for task_serial in tasks_data.keys():
+
+                for task_name,serial_data in tasks_data.items():
                         sw_continue=False
-                        for task in task_serial.keys():
-                                if ['spread'] in task.keys():
-                                                if task['spread']==True:
-                                                        sw_continue=True
-                                                        break
-                        if sw_continue:
-                                continue
-                        local_tasks.update(task_serial)
+                        for serial,data in serial_data.items():
+                                if 'spread' in data.keys():
+                                        if data['spread']==False:
+                                                if task_name in local_tasks.keys():
+#                                                       remote_tasks[task_name].update({'r'+serial:tasks_data[task_name][serial]})
+                                                        local_tasks[task_name]['r'+serial]=tasks_data[task_name][serial]
+                                                else:
+                                                        local_tasks[task_name]={'r'+serial:tasks_data[task_name][serial]}
+                                else:
+                                        if task_name in local_tasks.keys():
+                                                local_tasks[task_name]['r'+serial]=tasks_data[task_name][serial]
+                                        else:
+                                                local_tasks[task_name]={'r'+serial:tasks_data[task_name][serial]}
                 return local_tasks
 
@@ -244 +251 @@
         #def write_custom_task
 
+        def add_command(self,cmd_name,cmd):
+                self._debug("Adding command %s - %s"%(cmd_name,cmd))
+                commands={}
+                dict_cmd={cmd_name:cmd}
+                if os.path.isfile(self.commands_file):
+                        commands=json.loads(open(self.commands_file,"rb").read())
+                commands.update(dict_cmd)
+                with open(self.commands_file,'w') as json_data:
+                        json.dump(commands,json_data,indent=4)
+        #def add_command
+
         def _register_cron_update(self):
                 self._debug("Registering trigger var")