taskai-cli 1.1.1__tar.gz → 1.1.4__tar.gz

{taskai_cli-1.1.1 → taskai_cli-1.1.4}/.gitignore

@@ -16,3 +16,4 @@ tmp*/
 _tmp_database_dir/
 .dev
 .prod
+*.swo

{taskai_cli-1.1.1 → taskai_cli-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskai-cli
-Version: 1.1.1
+Version: 1.1.4
 Author-email: Alex Paskal <alexcpaskal@gmail.com>
 Requires-Python: >=3.12
 Requires-Dist: google-genai>=2.8

{taskai_cli-1.1.1 → taskai_cli-1.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskai-cli"
-version = "1.1.1"
+version = "1.1.4"
 description = ""
 authors = [{name = "Alex Paskal", email = "alexcpaskal@gmail.com"}]
 readme = "README.md"

taskai_cli-1.1.4/scripts/bump_version.py

@@ -0,0 +1,37 @@
+import sys
+import os
+import tomlkit
+
+projdir = os.path.dirname(os.path.dirname(__file__))
+with open(os.path.join(projdir, "pyproject.toml")) as f:
+    toml = tomlkit.load(f)
+
+major, minor, bugfix = list(map(int, toml["project"]["version"].split(".")))
+
+args = sys.argv[1:]
+
+if not args:
+    bugfix += 1
+elif args[0] == "bugfix":
+    bugfix += 1
+elif args[0] == "minor":
+    minor += 1
+    bugfix = 0
+elif args[0] == "major":
+    major += 1
+    minor = 0
+    bugfix = 0
+else:
+    print("didn't work")
+    print(args)
+    sys.exit(-1)
+
+new_version = f"{major}.{minor}.{bugfix}"
+print("Bumping to version {}".format(new_version))
+toml["project"]["version"] = new_version
+
+
+with open(os.path.join(projdir, "pyproject.toml"), "w") as f:
+    tomlkit.dump(toml, f)
+
+

{taskai_cli-1.1.1 → taskai_cli-1.1.4}/taskai/cli.py

@@ -208,6 +208,30 @@ class Controller:
         db.update_item(src_id, dependency_ids=dependency_ids)
         db.commit()
 
+    def reorder(id1: int, id2: int, position: str):
+        if position not in ("before", "after"):
+            Controller.throw_error("position must be one of before, after")
+
+        child1 = db.get_item(id1)
+        parent = db.get_item(child1.parent_id)
+        if parent is None:
+            Controller.throw_error("Cannot reorder root items")
+        
+
+        new_child_ids = []
+        for child_id in parent.child_ids:
+            if child_id == id1:
+                continue
+            if child_id == id2:
+                new_child_ids.extend(
+                    [id1, id2] if position == "before" else [id2, id1]
+                )
+                continue
+            new_child_ids.append(child_id)
+        db.update_item(parent.id, child_ids=new_child_ids)
+        db.commit()
+
+
 # utilities
 def _parse_arg_string(arg_string: str) -> list[str]:
     """parses a string properly before dispatching it to the argument parser"""
@@ -309,7 +333,10 @@ def execute_commands(*args, **kwargs) -> int:
             
             case "update":
                 Controller.update_item(args[1], **kwargs)
-                
+        
+            case "reorder":
+                Controller.reorder(int(args[1]), int(args[3]), args[2])
+
             case "delete" | "remove":
                 match args[1]:
                     case _ if _is_int(args[1]): Controller.delete_item(args[1])

{taskai_cli-1.1.1 → taskai_cli-1.1.4}/taskai/models.py

@@ -44,6 +44,7 @@ class TodoItem(Base):
     recurs_every: Optional[list[timedelta]] = None
     recurs_until: Optional[datetime] = None 
     recur_keep_incomplete: bool = False
+    status: str = ""
 
 
 class Comment(Base):

{taskai_cli-1.1.1 → taskai_cli-1.1.4}/test/test_view.py

@@ -33,12 +33,18 @@ def _populate_db():
     ids.update(locals())
 
 def test_view_lists():
+    _cleanup_db()
+    _setup_db()
+    _populate_db()
     print("Root 1");print("-"*30)
     view_lists(db, [ids["root1"]])
     print("\n\n\n");print("Root 1");print("-"*30)
     view_lists(db, [ids["root2"]])
 
 def test_view_item():
+    _cleanup_db()
+    _setup_db()
+    _populate_db()
     print("\n\n\n");print("Grandchild");print("-"*30)
     view_item(db, ids["gchild1"])
     print("\n\n\n");print("Grandchild");print("-"*30)
@@ -57,4 +63,4 @@ if __name__ == "__main__":
     # import rich
     # import orjson as json
     # rich.print_json(json.dumps(_test_db.user_data).decode())
-        _cleanup_db()
+        _cleanup_db()