From b4a440a83f227df5dfb63025a575b4e393dd589f Mon Sep 17 00:00:00 2001
From: Carlo Lobrano <c.lobrano@gmail.com>
Date: Mon, 29 Jul 2024 10:38:43 +0200
Subject: [PATCH] Fix goto CLI handler

see #47
---
 Makefile        |  4 ++++
 src/cli.py      |  8 ++------
 src/handlers.py | 28 +++++++++++++++++-----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 87c1c0e..b827f4d 100644
--- a/Makefile
+++ b/Makefile
@@ -20,3 +20,7 @@ clean: clean_src
 
 clean_src:
 	-rm -r src/__pycache__
+
+
+replace:
+	make clean && make build && pip install .
diff --git a/src/cli.py b/src/cli.py
index fb2c641..97a60d2 100644
--- a/src/cli.py
+++ b/src/cli.py
@@ -78,12 +78,8 @@ def main():
         is_ok, msg = handlers.stop_task_handler(" ".join(args["<time>"]))
 
     elif args["goto"]:
-        name = " ".join(args["<newtask>"])
-        tid, is_ok = guess_task_id_from_string(name)
-        if not is_ok:
-            msg = f"could not get task ID from: {name}"
-
-        is_ok, msg = handlers.goto_task_handler(tid)
+        description = " ".join(args["<newtask>"])
+        is_ok, msg = handlers.goto_task_handler(description)
 
     if args["see"]:
         if args["<query>"]:
diff --git a/src/handlers.py b/src/handlers.py
index 2bd1cda..850b5f7 100644
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -15,7 +15,7 @@ def autocomplete_handler():
     return autocomplete()
 
 
-def start_task_handler(description: str, start_str: str) -> (bool, str):
+def start_task_handler(description: str, start_str: str="") -> (bool, str):
     """handles a request to start a task"""
     if not description:
         return False, "task description is mandatory"
@@ -70,15 +70,21 @@ def stop_task_handler(stop_time: str) -> (bool, str):
     return True, msg
 
 
-def goto_task_handler(tid: int) -> (bool, str):
+def goto_task_handler(description: str) -> (bool, str):
     """handles a request to switch to another task given the ID"""
-    tasks = get_tasks(lambda x: x.tid == tid)
-    if not tasks:
-        return False, f"could not find task with ID {tid}"
-    task = tasks[0]
+    if not description:
+        return False, "task description is mandatory"
+
+    if Task.get_running():
+        now = datetime.now().strftime("%H:%M")
+        is_ok, msg = stop_task_handler(now)
+        if not is_ok:
+            return False, msg
+
+    tid, got_id = guess_task_id_from_string(description)
+    if got_id:
+        work_on(task_id=tid)
+        return True, ""
+    else:
+        return Task(description).start(), ""
 
-    now = datetime.now().strftime("%H:%M")
-    is_ok, msg = stop_task_handler(now)
-    if not is_ok:
-        return False, msg
-    return start_task_handler(task.name, now)