From 61e4005082c13b329e50f09a06f556036a760f7a Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 6 Jan 2017 01:06:26 +0100 Subject: Goniec support --- ausbutler/interface.py | 15 ++++++++++++--- butler.py | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ausbutler/interface.py b/ausbutler/interface.py index b100a1d..7b1feb5 100644 --- a/ausbutler/interface.py +++ b/ausbutler/interface.py @@ -79,11 +79,14 @@ class Interface(object): self.session.commit() def generate_all(self): - self.generate_segments() - self.generate_frames() - self.generate_table() + files = [] + files += self.generate_segments() + files += self.generate_frames() + files += self.generate_table() + return list(set(files)) def generate_frames(self): + files = [] template = self.template.get_template('frame.html') for round_no in range(1, Constants.rnd + 1): for segment_no in range(1, Constants.segmentsperround + 1): @@ -100,8 +103,11 @@ class Interface(object): 'first_board': first_board }) ) + files.append(filename) + return files def generate_segments(self): + files = [] template = self.template.get_template('segment.html') for round_no in range(1, Constants.rnd + 1): for segment_no in range(1, Constants.segmentsperround + 1): @@ -141,6 +147,8 @@ class Interface(object): 'time': datetime.now().strftime('%H:%M') }).encode('utf8') ) + files.append(filename) + return files def generate_table(self): template = self.template.get_template('table.html') @@ -198,3 +206,4 @@ class Interface(object): 'time': datetime.now().strftime('%H:%M') }).encode('utf8') ) + return [filename] diff --git a/butler.py b/butler.py index 7c03ada..2b253fa 100644 --- a/butler.py +++ b/butler.py @@ -1,7 +1,9 @@ from ausbutler.config import load_config from ausbutler.interface import Interface - +from ausbutler.goniec import Goniec i = Interface(load_config('butler')) i.calculate_all() -i.generate_all() +files = i.generate_all() +g = Goniec(load_config('goniec')) +g.send(files) -- cgit v1.2.3