diff --git a/bin/Categ.py b/bin/Categ.py index be0dff17..986080d4 100755 --- a/bin/Categ.py +++ b/bin/Categ.py @@ -98,4 +98,4 @@ if __name__ == "__main__": publisher.info( 'Categ;{};{};{};Detected {} as {};{}'.format( paste.p_source, paste.p_date, paste.p_name, - len(found), categ), paste.p_path) + len(found), categ, paste.p_path)) diff --git a/bin/Mail.py b/bin/Mail.py index 161082b0..6ec938f3 100755 --- a/bin/Mail.py +++ b/bin/Mail.py @@ -62,6 +62,7 @@ if __name__ == "__main__": publisher.warning(to_print) #Send to duplicate p.populate_set_out(filename, 'Duplicate') + p.populate_set_out('mail;{}'.format(filename), 'BrowseWarningPaste') else: publisher.info(to_print) @@ -69,7 +70,6 @@ if __name__ == "__main__": for mail in MX_values[1]: print 'mail;{};{};{}'.format(1, mail, PST.p_date) p.populate_set_out('mail;{};{};{}'.format(1, mail, PST.p_date), 'ModuleStats') - p.populate_set_out('mail;{}'.format(filename), 'BrowseWarningPaste') prec_filename = filename diff --git a/bin/ModulesInformationV2.py b/bin/ModulesInformationV2.py index 1b548734..b43edeb7 100755 --- a/bin/ModulesInformationV2.py +++ b/bin/ModulesInformationV2.py @@ -117,6 +117,7 @@ class CListBox(ListBox): if len(self._options) > 0 and event.key_code == Screen.KEY_UP: # Move up one line in text - use value to trigger on_select. self._line = max(0, self._line - 1) + self._line = min(self._line, len(self._options)-1) #If we move a line cursor from a line that has dissapear self.value = self._options[self._line][1] elif len(self._options) > 0 and event.key_code == Screen.KEY_DOWN: @@ -627,8 +628,7 @@ def fetchQueueData(): if int(card) > 0: # Queue need to be killed if int((datetime.datetime.now() - startTime_readable).total_seconds()) > args.treshold: - log(([str(time.time()), queue, "-", "ST:"+str(timestamp)+" PT:"+str(time.time()-float(timestamp))], 0), True) - #log.write(json.dumps([queue, card, str(startTime_readable), str(processed_time_readable), path]) + "\n") + log(([str(time.time()), queue, "-", "ST:"+str(timestamp)+" PT:"+str(time.time()-float(timestamp))], 0), True, show_in_board=False) try: last_kill_try = time.time() - lastTimeKillCommand[moduleNum] except KeyError: @@ -718,9 +718,10 @@ def format_string(tab, padding_row): printstring.append( (text, the_pid) ) return printstring -def log(data, write_on_disk=False): - printarrayLog.insert(0, data) - printarrayLog.pop() +def log(data, write_on_disk=False, show_in_board=True): + if show_in_board: + printarrayLog.insert(0, data) + printarrayLog.pop() if write_on_disk: with open(log_filename, 'a') as log: log.write(json.dumps(data[0]) + "\n") @@ -799,10 +800,18 @@ if __name__ == "__main__": module_file_array = set() no_info_modules = {} path_allmod = os.path.join(os.environ['AIL_HOME'], 'doc/all_modules.txt') - with open(path_allmod, 'r') as module_file: - for line in module_file: - module_file_array.add(line[:-1]) + try: + with open(path_allmod, 'r') as module_file: + for line in module_file: + module_file_array.add(line[:-1]) + except IOError as e: + if e.errno == 2: #module_file not found, creating a new one + print(path_allmod + " not found.\nCreating a new one.") + os.system("./../doc/generate_modules_data_flow_graph.sh") + with open(path_allmod, 'r') as module_file: + for line in module_file: + module_file_array.add(line[:-1]) cleanRedis()