masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change pomodoro counting logic

Browse Source
This commit is contained in:
Sergei Turukin 2016-05-18 14:51:54 +03:00
parent ae3721ce87
commit 565e4a66d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
i3pystatus/pomodoro.py
View File

@ -47,7 +47,8 @@ class Pomodoro(IntervalModule):
def init(self): def init(self):
# state could be either running/break or stopped # state could be either running/break or stopped
self.state = STOPPED self.state = STOPPED
self.breaks = 0 self.current_pomodoro = 0
self.total_pomodoro = self.short_break_count + 1 # and 1 long break
self.time = None self.time = None
def run(self): def run(self):
@ -57,17 +58,16 @@ class Pomodoro(IntervalModule):
if self.breaks == self.short_break_count: if self.breaks == self.short_break_count:
self.time = datetime.utcnow() + \ self.time = datetime.utcnow() + \
timedelta(seconds=self.long_break_duration) timedelta(seconds=self.long_break_duration)
self.breaks = 0
else: else:
self.time = datetime.utcnow() + \ self.time = datetime.utcnow() + \
timedelta(seconds=self.break_duration) timedelta(seconds=self.break_duration)
self.breaks += 1
text = 'Go for a break!' text = 'Go for a break!'
else: else:
self.state = RUNNING self.state = RUNNING
self.time = datetime.utcnow() + \ self.time = datetime.utcnow() + \
timedelta(seconds=self.pomodoro_duration) timedelta(seconds=self.pomodoro_duration)
text = 'Back to work!' text = 'Back to work!'
self.current_pomodoro = (self.current_pomodoro + 1) % self.total_pomodoro
self._alarm(text) self._alarm(text)
if self.state == RUNNING or self.state == BREAK: if self.state == RUNNING or self.state == BREAK:
@ -75,8 +75,8 @@ class Pomodoro(IntervalModule):
text = '{:02}:{:02}'.format(int(min), int(sec)) text = '{:02}:{:02}'.format(int(min), int(sec))
sdict = { sdict = {
'time': text, 'time': text,
'current_pomodoro': self.breaks + 1, 'current_pomodoro': self.current_pomodoro + 1,
'total_pomodoro': self.short_break_count + 1, 'total_pomodoro': self.total_pomodoro,
} }
color = self.color_running if self.state == RUNNING else self.color_break color = self.color_running if self.state == RUNNING else self.color_break
@ -93,7 +93,7 @@ class Pomodoro(IntervalModule):
def start(self): def start(self):
self.state = RUNNING self.state = RUNNING
self.time = datetime.utcnow() + timedelta(seconds=self.pomodoro_duration) self.time = datetime.utcnow() + timedelta(seconds=self.pomodoro_duration)
self.breaks = 0 self.current_pomodoro = 0
def stop(self): def stop(self):
self.state = STOPPED self.state = STOPPED