Make format configurable, fix bug, progess output

This commit is contained in:
Sergei Turukin 2014-12-09 16:49:27 +02:00
parent a1c66f33b5
commit 45c94bd5cd

View File

@ -27,6 +27,7 @@ class Pomodoro(IntervalModule):
('break_duration', 'Short break duration in secods'), ('break_duration', 'Short break duration in secods'),
('long_break_duration', 'Long break duration in secods'), ('long_break_duration', 'Long break duration in secods'),
('short_break_count', 'Short break count before first long break'), ('short_break_count', 'Short break count before first long break'),
format
) )
color_stopped = '#2ECCFA' color_stopped = '#2ECCFA'
@ -34,6 +35,7 @@ class Pomodoro(IntervalModule):
color_break = '#37FF00' color_break = '#37FF00'
interval = 1 interval = 1
short_break_count = 3 short_break_count = 3
format = '{current_pomodoro}/{total_pomodoro} {time}'
pomodoro_duration = 25 * 60 pomodoro_duration = 25 * 60
break_duration = 5 * 60 break_duration = 5 * 60
@ -56,8 +58,8 @@ class Pomodoro(IntervalModule):
else: else:
self.time = datetime.now() + \ self.time = datetime.now() + \
timedelta(seconds=self.break_duration) timedelta(seconds=self.break_duration)
text = 'Go for a break!'
self.breaks += 1 self.breaks += 1
text = 'Go for a break!'
else: else:
self.state = 'running' self.state = 'running'
self.time = datetime.now() + \ self.time = datetime.now() + \
@ -70,11 +72,20 @@ class Pomodoro(IntervalModule):
text = '{:02}:{:02}'.format(int(min), int(sec)) text = '{:02}:{:02}'.format(int(min), int(sec))
color = self.color_running if self.state == 'running' else self.color_break color = self.color_running if self.state == 'running' else self.color_break
else: else:
text = 'Stopped' self.output = {
color = self.color_stopped 'full_text': 'Stopped',
'color': self.color_stopped
}
return
sdict = {
'time': text,
'current_pomodoro': self.breaks,
'total_pomodoro': self.short_break_count + 1,
}
self.output = { self.output = {
'full_text': text, 'full_text': self.format.format(**sdict),
'color': color 'color': color
} }