add stopwatch functionality

lots of code duplication... next step is to get rid of that

2 files changed, 49 insertions, 1 deletions

diff --git a/main.py b/main.py
index bde6bf8..f1a4e27 100644
--- a/main.py
+++ b/main.py
@@ -45,3 +45,22 @@ if option == 't':
     #print(session)
 
     f.sesh_to_log(session, "lock-n-log.csv")
+
+else:
+    print("whenever you're ready, press enter to start", end="", flush=True)
+    input()
+    elapsed, start = timers.stopwatch()
+
+    print("\nfocus session finished!\nlogging...")
+    session = OrderedDict()
+    session["id"] = hashlib.sha256(str(start).encode('utf8')).hexdigest()
+    session["date"] = start.strftime("%Y-%m-%d")
+    session["start"] = start.strftime("%H:%M")
+    session["elapsed"] = int(elapsed.total_seconds())
+    session["type"] = "focus"
+    session["tag"] = tag
+    session["timer"] = "stopwatch"
+    session["ratio"] = 0.2
+    #print(session)
+
+    f.sesh_to_log(session, "lock-n-log.csv")
diff --git a/timers.py b/timers.py
index 0141222..ee04e86 100644
--- a/timers.py
+++ b/timers.py
@@ -2,13 +2,15 @@ import datetime
 import sys, termios, tty
 import inputs
 
+frequency = 120 # 120Hz refresh
+
 def countdown(length):
     """countdown timer; length in seconds. returns start and time left (>0 if quit early)"""
     time_left = length
     start = datetime.datetime.now()
     end = start + datetime.timedelta(seconds=time_left) # change to mins in final
     accum = 0
-    timeout = 1/120 # 120Hz refresh
+    timeout = 1/frequency
 
     old_settings = termios.tcgetattr(sys.stdin)
     tty.setcbreak(sys.stdin.fileno())
@@ -22,11 +24,38 @@ def countdown(length):
         if ch == 'q':
             print("\nexited early!")
             break
+
         # see https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
         print("\x1b[2K\r" + inputs.delta_to_HM(time_left), end="", flush=True)
+
         accum += timeout
         if accum >= 1:
             accum = 0
     termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_settings)
 
     return (time_left, start)
+
+def stopwatch():
+    """stopwatch timer; returns time elapsed"""
+    start = datetime.datetime.now()
+    accum = 0
+    timeout = 1/frequency
+
+    old_settings = termios.tcgetattr(sys.stdin)
+    tty.setcbreak(sys.stdin.fileno())
+    while True:
+        elapsed = datetime.datetime.now() - start
+
+        ch = inputs.getch_nb(timeout)
+        if ch == 'q':
+            break
+
+        # see https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
+        print("\x1b[2K\r" + inputs.delta_to_HM(elapsed), end="", flush=True)
+
+        accum += timeout
+        if accum >= 1:
+            accum = 0
+    termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_settings)
+
+    return (elapsed, start)