Ask for an end time when stoping a timer

Author: cimnine

README.md

@@ -29,7 +29,7 @@ The source code is available at [Github][gh]. Pull requests are welcome.
 Clone this repository.
 Copy the `info.plist.template` file to `info.plist`.
 
-The update the variables `hakuna_api_key` and `hakuna_base_url` to match your Hakuna instance.
+Then update the variables `hakuna_api_key` and `hakuna_base_url` to match your Hakuna instance.
 
 **Before you push, make sure to copy `info.plist` to `info.plist.template` and remove all sensitive information!**
 

action_start_timer.sh

@@ -19,6 +19,7 @@ project_id=${hakuna_project_id-$1}
 task_id=${hakuna_task_id-$2}
 if ! start_time=$(format_time "${start_time-$3}"); then
   echo "The given time '$start_time' is not valid. The expected format is 'hh:mm' or 'hh:mm:ss'."
+  exit 1
 fi
 note=${hakuna_note-${4-}}
 

action_stop_timer.sh

@@ -2,7 +2,29 @@
 
 . utils.sh
 
-load timer PUT
+format_time() {
+  if expr "$1" : '^[0-2][0-9]:[0-5][0-9]:[0-5][0-9]$' > /dev/null; then
+    echo "${1%:*}"
+    return 0
+  elif ! expr "$end_time" : '^[0-2][0-9]:[0-5][0-9]$' > /dev/null; then
+    echo "$1"
+    return 1
+  else
+    echo "$1"
+    return 0
+  fi
+}
+
+if ! end_time=$(format_time "${end_time-$1}"); then
+  echo "The given time '$end_time' is not valid. The expected format is 'hh:mm' or 'hh:mm:ss'."
+  exit 1
+fi
+
+echo \
+"{
+  \"end_time\": \"$end_time\"
+}" \
+  | load timer PUT @-
 
 if filter .error > /dev/null; then
   echo "Currently there is no running timer to stop."