diff --git a/fossgis14/__init__.py b/fossgis14/__init__.py index ea9a737..b71e4cb 100644 --- a/fossgis14/__init__.py +++ b/fossgis14/__init__.py @@ -202,5 +202,5 @@ def ticket(ticket): def deploy(ticket, task): for encoder in range(1, 6): - print("encoder{n}".format(n=encoder)) + print(colored("--> rsync'ing to encoder{n}".format(n=encoder), 'green')) subprocess.check_call('rsync -v --bwlimit=1000 --progress -e="ssh -A voc@gw.ep14.c3voc.de ssh -A voc@encoder{n}.lan.c3voc.de" {file} :{file}'.format(n=encoder, file=task.outfile), shell=True) diff --git a/pycon14/__init__.py b/pycon14/__init__.py index 66753dc..cd41564 100644 --- a/pycon14/__init__.py +++ b/pycon14/__init__.py @@ -103,5 +103,5 @@ def ticket(ticket): def deploy(ticket, task): for encoder in range(1, 3): - print("encoder{n}".format(n=encoder)) + print(colored("--> rsync'ing to encoder{n}".format(n=encoder), 'green')) subprocess.check_call('rsync -v --bwlimit=1000 --progress -e="ssh -A voc@gw.ep14.c3voc.de ssh -A voc@encoder{n}.lan.c3voc.de" {file} :/tmp/'.format(n=encoder, file=task.outfile), shell=True) diff --git a/renderlib.py b/renderlib.py index 9019e57..cc207ed 100644 --- a/renderlib.py +++ b/renderlib.py @@ -180,3 +180,9 @@ def events(scheduleUrl, titlemap={}): 'persons': personnames, 'personnames': ', '.join(personnames) } + +try: + from termcolor import colored +except ImportError: + def colored(str, col): + return str diff --git a/script-Z-preroll-generator.py b/script-Z-preroll-generator.py index 24a62c3..eb2ade8 100755 --- a/script-Z-preroll-generator.py +++ b/script-Z-preroll-generator.py @@ -9,6 +9,12 @@ import os import renderlib import c3t_rpc_client as rpc +try: + from termcolor import colored +except ImportError: + def colored(str, col): + return str + print("C3TT preroll generator") renderlib.debug = True @@ -40,16 +46,16 @@ def generatePreroll(ticket): task.outfile = os.path.join(ticket['Processing.Path.Intros'], ticket['Fahrplan.ID'] + '.dv') task.workdir = os.path.join(os.getcwd(), projectname, 'artwork') - print("rendering") + print(colored("rendering", 'green')) renderlib.rendertask(task) if hasattr(project, 'deploy'): - print("deploying") + print(colored("deploying", 'green')) project.deploy(ticket, task) while True: - print('Asking RPC for {0}-tickets which are ready for state {1}'.format(ticket_type, ticket_state)) + print(colored('Asking RPC for {0}-tickets which are ready for state {1}'.format(ticket_type, ticket_state), 'yellow')) ticket_id = rpc.assignNextUnassignedForState(ticket_type, ticket_state, url, token, host, secret, filter) if ticket_id != False: @@ -59,7 +65,7 @@ while True: rpc.setTicketDone(str(ticket_id), url, token, host, secret) except: error = str(traceback.format_exc()) - print(error) + print(colored(error, 'red')) rpc.setTicketFailed(str(ticket_id), error, url, token, host, secret) else: