Skip to content

Increasing responsiveness #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aeph6Ee0 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Increasing responsiveness #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fc3b1e
Wake up PomodoroThread on 'n' / 'q' event in order to increase respon…
aeph6Ee0 Apr 22, 2018
8c29fd8
Clean shutdown on Ctrl-c
aeph6Ee0 Apr 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 59 additions & 45 deletions omodoro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ from os.path import exists, join
if version_info >= (3, 0):
get_input = input
from configparser import ConfigParser, NoOptionError
import queue
else:
get_input = raw_input
from ConfigParser import ConfigParser, NoOptionError
import Queue as queue
if platformname() == 'Windows':
onWindows = True
else:
Expand Down Expand Up @@ -70,6 +72,7 @@ time_left = None # time left after the pause
state = States.Pomodori
command = "" # input string
lockObject = Lock()
thread_signal = queue.Queue() # wake up the PomodoroThread when sleeping
nextState = False # indicates user-triggered state change

def changeState(newState, length):
Expand Down Expand Up @@ -156,8 +159,10 @@ class PomodoroThread(Thread):
print("Error - aborting.")
exit(1)
lockObject.release()
sleep(30)
print("Shutdown finished.")
try:
thread_signal.get(block=True, timeout=30)
except queue.Empty:
pass


if __name__ == "__main__":
Expand Down Expand Up @@ -207,53 +212,62 @@ if __name__ == "__main__":

# commandline interface
while True:
command = get_input()
if command == "p":
if time_left is None: # if not None, already paused
if lockObject.acquire(True):
time_left = end_time - datetime.now()
print("Paused.\n$ ", end="")
else:
print("Error: current cycle is already paused.\n$ ", end="")
elif command == "c":
try:
lockObject.release()
except ThreadError:
print("Error: current cycle is not paused.\n$ ", end="")
continue
end_time = datetime.now() + time_left
time_left = None
print("Continuing the current pomodoro cycle.\nNew End Time: %s\n$ " % end_time.strftime("%H:%M"), end="")
elif command == "n":
nextState = True
print("Skipping to next pomodori/break, please wait some seconds.", end="")
elif command == "s":
if state == States.Pomodori:
print("Pomodoro cycle", end="")
elif state == States.ShortBreak:
print("Short break", end="")
elif state == States.LongBreak:
print("Long break", end="")
try:
command = get_input()
if command == "p":
if time_left is None: # if not None, already paused
if lockObject.acquire(True):
time_left = end_time - datetime.now()
print("Paused.\n$ ", end="")
else:
print("Error: current cycle is already paused.\n$ ", end="")
elif command == "c":
try:
lockObject.release()
except ThreadError:
print("Error: current cycle is not paused.\n$ ", end="")
continue
end_time = datetime.now() + time_left
time_left = None
print("Continuing the current pomodoro cycle.\nNew End Time: %s\n$ " % end_time.strftime("%H:%M"), end="")
elif command == "n":
nextState = True
thread_signal.put(None)
elif command == "s":
if state == States.Pomodori:
print("Pomodoro cycle", end="")
elif state == States.ShortBreak:
print("Short break", end="")
elif state == States.LongBreak:
print("Long break", end="")

if time_left is None:
print(", running, %d minutes left\n$ " % round(
(end_time - datetime.now()).total_seconds() / 60) , end="")
if time_left is None:
print(", running, %d minutes left\n$ " % round(
(end_time - datetime.now()).total_seconds() / 60) , end="")
else:
print(", paused, %d minutes left\n$ " % round(
time_left.total_seconds() / 60), end="")
elif command == "q":
try:
lockObject.release()
except ThreadError:
pass # Lock was not locked - exit anyway
thread_signal.put(None)
exit(0)
elif command == "t":
if terminal_bell == True:
terminal_bell = False
print("Terminal bell off")
elif terminal_bell == False:
terminal_bell = True
print("Terminal bell on")
else:
print(", paused, %d minutes left\n$ " % round(
time_left.total_seconds() / 60), end="")
elif command == "q":
print("Unknown command.\n$ ", end="")
except KeyboardInterrupt:
command = "q" # indicate the PomodoroThread to quit
try:
lockObject.release()
except ThreadError:
pass # Lock was not locked - exit anyway
print("omodoro is shutting down, please wait some seconds.")
thread_signal.put(None)
exit(0)
elif command == "t":
if terminal_bell == True:
terminal_bell = False
print("Terminal bell off")
elif terminal_bell == False:
terminal_bell = True
print("Terminal bell on")
else:
print("Unknown command.\n$ ", end="")