timedctl 3.3.0__tar.gz → 3.5.0__tar.gz

{timedctl-3.3.0 → timedctl-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: timedctl
-Version: 3.3.0
+Version: 3.5.0
 Summary: CLI for timed
 License: AGPL-3.0-only
 Author: Arthur Deierlein
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: click-aliases (>=1.0.1,<2.0.0)
-Requires-Dist: libtimed (>=0.2.1,<0.3.0)
+Requires-Dist: libtimed (>=0.3.0,<0.4.0)
 Requires-Dist: pyfzf (>=0.3.1,<0.4.0)
 Requires-Dist: rich (>=13.4.2,<14.0.0)
 Requires-Dist: terminaltables (>=3.1.10,<4.0.0)

{timedctl-3.3.0 → timedctl-3.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "timedctl"
-version = "3.3.0"
+version = "3.5.0"
 description = "CLI for timed"
 authors = ["Arthur Deierlein <arthur.deierlein@adfinis.com>", "Gian Klug <gian.klug@adfinis.com>"]
 readme = "README.md"
@@ -11,7 +11,7 @@ python = "^3.10"
 click = "^8.1.3"
 pyfzf = "^0.3.1"
 rich = "^13.4.2"
-libtimed = "^0.2.1"
+libtimed = "^0.3.0"
 terminaltables = "^3.1.10"
 tomlkit = "^0.11.8"
 click-aliases = "^1.0.1"

{timedctl-3.3.0 → timedctl-3.5.0}/timedctl/timedctl.py

@@ -2,7 +2,6 @@
 """CLI application for libtimed."""
 
 import datetime
-import tomllib
 import os
 import re
 import sys
@@ -11,10 +10,11 @@ import click
 import pyfzf
 import rich
 import terminaltables
+import tomllib
 from click_aliases import ClickAliasedGroup
-from tomlkit import dump
 from libtimed import TimedAPIClient
 from libtimed.oidc import OIDCClient
+from tomlkit import dump
 
 
 def load_config():
@@ -204,11 +204,12 @@ def get_reports(date):
         task_obj = report["relationships"]["task"]
         task = task_obj["attributes"]["name"]
 
-        project_obj = timed.projects.get(id=task_obj["relationships"]["project"]["id"])
+        project_obj = timed.projects.get(id=task_obj["relationships"]["project"]["id"], cached=True)
         project = project_obj["attributes"]["name"]
 
         customer_obj = timed.customers.get(
-            id=project_obj["relationships"]["customer"]["data"]["id"]
+            id=project_obj["relationships"]["customer"]["data"]["id"],
+            cached=True
         )
         customer = customer_obj["attributes"]["name"]
 
@@ -232,28 +233,30 @@ def get_reports(date):
 def get_activities(date):
     """Get activities."""
     activities = timed.activities.get(
-        {"day": date}, include="task,task.project,task.project.customer",
+        {"day": date},
+        include="task,task.project,task.project.customer",
     )
     table = [["Activity", "Comment", "Start", "End"]]
-    for activity in activities:
-        task_obj = activity["relationships"]["task"]
+    for activity_obj in activities:
+        task_obj = activity_obj["relationships"]["task"]
         task = task_obj["attributes"]["name"]
 
-        project_obj = timed.projects.get(id=task_obj["relationships"]["project"]["id"])
+        project_obj = timed.projects.get(id=task_obj["relationships"]["project"]["id"], cached=True)
         project = project_obj["attributes"]["name"]
 
         customer_obj = timed.customers.get(
-            id=project_obj["relationships"]["customer"]["data"]["id"]
+            id=project_obj["relationships"]["customer"]["data"]["id"],
+            cached=True
         )
         customer = customer_obj["attributes"]["name"]
 
         table.append(
             [
                 f"{customer} > {project} > {task}",
-                activity["attributes"]["comment"],
-                activity["attributes"]["from-time"].strftime("%H:%M:%S"),
-                activity["attributes"]["to-time"].strftime("%H:%M:%S")
-                if activity["attributes"]["to-time"] is not None
+                activity_obj["attributes"]["comment"],
+                activity_obj["attributes"]["from-time"].strftime("%H:%M:%S"),
+                activity_obj["attributes"]["to-time"].strftime("%H:%M:%S")
+                if activity_obj["attributes"]["to-time"] is not None
                 else "active",
             ]
         )
@@ -315,9 +318,9 @@ def add():
 @click.option("--task", default=None)
 @click.option("--description", default=None)
 @click.option("--duration", default=None)
-def add_report(customer, project, task, description, duration):
+def add_report(customer, project, task, description, duration):  # pylint: disable=R0912
     """Add report(s)."""
-    customers = timed.customers.get()
+    customers = timed.customers.get(cached=True)
     # ask the user to select a customer
     msg("Select a customer")
     # select a customer
@@ -329,7 +332,7 @@ def add_report(customer, project, task, description, duration):
     else:
         customer = fzf_wrapper(customers, ["attributes", "name"], "Select a customer: ")
     # get projects
-    projects = timed.projects.get({"customer": customer["id"]})
+    projects = timed.projects.get({"customer": customer["id"]}, cached=True)
     # select a project
     if project:
         project = [p for p in projects if p["attributes"]["name"] == project]
@@ -339,7 +342,7 @@ def add_report(customer, project, task, description, duration):
     else:
         project = fzf_wrapper(projects, ["attributes", "name"], "Select a project: ")
     # get tasks
-    tasks = timed.tasks.get({"project": project["id"]})
+    tasks = timed.tasks.get({"project": project["id"]}, cached=True)
     # select a task
     if task:
         task = [t for t in tasks if t["attributes"]["name"] == task]
@@ -439,7 +442,7 @@ def activity():
 @click.option("--task", default=None)
 def start(comment, customer, project, task):
     """Start recording activity."""
-    customers = timed.customers.get()
+    customers = timed.customers.get(cached=True)
     # ask the user to select a customer
     msg("Select a customer")
     # select a customer
@@ -451,7 +454,7 @@ def start(comment, customer, project, task):
     else:
         customer = fzf_wrapper(customers, ["attributes", "name"], "Select a customer: ")
     # get projects
-    projects = timed.projects.get({"customer": customer["id"]})
+    projects = timed.projects.get({"customer": customer["id"]}, cached=True)
     # select a project
     if project:
         project = [p for p in projects if p["attributes"]["name"] == project]
@@ -461,7 +464,7 @@ def start(comment, customer, project, task):
     else:
         project = fzf_wrapper(projects, ["attributes", "name"], "Select a project: ")
     # get tasks
-    tasks = timed.tasks.get({"project": project["id"]})
+    tasks = timed.tasks.get({"project": project["id"]}, cached=True)
     # select a task
     if task:
         task = [t for t in tasks if t["attributes"]["name"] == task]
@@ -482,19 +485,24 @@ def start(comment, customer, project, task):
     error_handler("ERR_ACTIVITY_START_FAILED")
 
 
-@activity.command()
-def stop(aliases=["end", "finish"]):
+@activity.command(aliases=["end", "finish"])
+def stop():
     """Stop current activity."""
+    if not timed.activities.current:
+        error_handler("ERR_NO_CURRENT_ACTIVITY")
+    else:
+        timed.activities.stop()
     msg("Activity stopped successfully.")
 
 
-@activity.command()
-def show(aliases=["s", "get", "info"]):
+@activity.command(aliases=["s", "get", "info"])
+def show():
     """Show current activity."""
     current_activity = timed.activities.current
     if current_activity:
         msg(
-            f"Current activity: {current_activity['attributes']['comment']} (Since {current_activity['attributes']['from-time'].strftime('%H:%M:%S')})"
+            f"Current activity: {current_activity['attributes']['comment']} (Since "
+            + f"{current_activity['attributes']['from-time'].strftime('%H:%M:%S')})"
         )
     else:
         error_handler("ERR_NO_CURRENT_ACTIVITY")
@@ -505,23 +513,23 @@ def generate_timesheet():
     """Generate the timesheet of the current activities."""
     activities = timed.activities.get()
     if activities:
-        for activity in activities:
-            if not activity["attributes"]["transferred"]:
-                if not activity["attributes"]["to-time"]:
-                    activity["attributes"]["to-time"] = datetime.now()
-                from_time = activity["attributes"]["from-time"]
-                to_time = activity["attributes"]["to-time"]
+        for activity_obj in activities:
+            if not activity_obj["attributes"]["transferred"]:
+                if not activity_obj["attributes"]["to-time"]:
+                    activity_obj["attributes"]["to-time"] = datetime.datetime.now()
+                from_time = activity_obj["attributes"]["from-time"]
+                to_time = activity_obj["attributes"]["to-time"]
                 duration = to_time - from_time
-                task = activity["relationships"]["task"]["data"]["id"]
+                task = activity_obj["relationships"]["task"]["data"]["id"]
                 timed.reports.post(
                     {
                         "duration": duration,
-                        "comment": activity["attributes"]["comment"],
+                        "comment": activity_obj["attributes"]["comment"],
                     },
                     {"task": task},
                 )
                 timed.activities.patch(
-                    activity["id"], {"transferred": True}, {"task": task}
+                    activity_obj["id"], {"transferred": True}, {"task": task}
                 )
         msg("Timesheet generated successfully.")
     else: