fix month duplication possibility bug, ui cleanup

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "fob"
 # Remember to update the version number in 'utils/utils.py' manually also.
-version = "0.2.1"
+version = "0.2.2"
 description = "Focus Blocks: Simple and elegant daily time management tool."
 readme = "README.md"
 authors = [{ name = "tensorturtle", email = "[email protected]" }]

src/fob/commands/did.py

@@ -57,4 +57,4 @@ def did(args, db):
         print("Start a new day: [green bold]fob gm[/green bold]")
         return
     else:
-        print("[green]Checklist updated.[/green] See overview: [cyan]fob sup[/cyan]")
+        print("[green]Checklist updated.[/green] See overview: [cyan][bold]fob sup[/cyan][/bold]")

src/fob/commands/didnt.py

@@ -53,9 +53,10 @@ def didnt(args: Namespace, db: TinyDBWrapper):
         print("Consider running: [cyan][bold]fob new_month[/cyan][/bold] if you want to reset the block allocations for this month.")
         return
 
-    # show user today's checklist
-    # also is a guard for: there are blocks assigned to this day (it could be that right before the first day of the month, the checklist is empty.)
-    display_checklist(args, db)
+    # guard for: there are blocks assigned to this day (it could be that right before the first day of the month, the checklist is empty.)
+    if len(data['checklist']) == 0:
+        print("[red][bold]Error: No blocks assigned to today. Run [cyan][bold]fob gm[/cyan][/bold] to assign blocks to today.[/red][/bold]")
+        return
 
     # ask user which number they want to convert to buffer block
     try:
@@ -92,7 +93,7 @@ def didnt(args: Namespace, db: TinyDBWrapper):
 
         # print success message
         display_checklist(args, db)
-        print(f"[green][bold]Block {num_to_convert} converted to Buffer block successfully.[/green][/bold]")
+        print(f"[green]Block {num_to_convert} converted to Buffer block.[/green] See overview: [cyan][bold]fob sup[/cyan][/bold]")
 
     except ValueError:
         print("[red][bold]Please enter a number that corresponds to the checklist item[/red][/bold]")

src/fob/commands/gm.py

@@ -48,8 +48,10 @@ def gm(args: Namespace, db: TinyDBWrapper) -> None:
     print("[bold]Today's Checklist:[/bold]")
     display_checklist(args, db)
 
-    print("Next commands: [cyan][bold]fob sup[/cyan][/bold] to see the above overviews again.")
-    print("[green][bold]fob did (number) [/green][/bold] to mark a block as done.")
+    print("[green]New day started.[/green]")
+    print("See overview: [cyan][bold]fob sup[/cyan][/bold]")
+    print("Mark a block as done: [green][bold]fob did <number>[/green][/bold]")
+    print("Convert a block to Buffer: [cyan][bold]fob didnt <number>[/cyan][/bold]")
 
 
 def new_day(args: Namespace, db: TinyDBWrapper, data) -> None:
@@ -126,12 +128,6 @@ def new_day(args: Namespace, db: TinyDBWrapper, data) -> None:
         print("Database updated successfully.")
         print(Panel(Pretty(db.search(q.year == today.year and q.month == today.month))))
 
-    # also create a 'today' entry (for day overview) with the newly assigned blocks
-    # today_data = {
-    #     "today": today_areas,
-    # }
-    # db.update({"today": today_areas}, None)
-
     checklist = dict()
     i = 0
     for area_name, blocks in today_areas.items():
@@ -145,5 +141,3 @@ def new_day(args: Namespace, db: TinyDBWrapper, data) -> None:
     if args.debug:
         print("Today's data:")
         print(Panel(Pretty(checklist)))
-
-    # updated checklist

src/fob/commands/new_month.py

@@ -6,6 +6,7 @@
 from rich import print
 from rich.table import Table
 from rich.console import Console
+from tinydb import where, Query
 
 from fob.db import TinyDBWrapper
 from fob.db import MonthBlockData
@@ -18,7 +19,7 @@ def new_month(args: Namespace, db: TinyDBWrapper) -> None:
     if result is not None:
         write_new_month(result, db)
         print("\n[green]New month successfully created![/green]")
-        print("Next commands: [green bold]fob gm[/green bold] - Start your day with the good morning command.")
+        print("Start your day: [green bold]fob gm[/green bold]")
 
 def write_new_month(data: MonthBlockData, db: TinyDBWrapper) -> None:
     areas = {}
@@ -28,15 +29,16 @@ def write_new_month(data: MonthBlockData, db: TinyDBWrapper) -> None:
             "completed": 0,
         }
 
-    #!TODO - Add a check to see if the year-month already exists
-    db.insert({
+    # Overwrite the existing month data (shouldn't happen but avoids duplicates)
+    q = Query()
+    db.update({
         "year": data.year,
         "month": data.month,
         "work_days_allocated": data.work_days_allocated,
         "work_days_completed": 0,
         "blocks_per_day": data.blocks_per_day,
         "areas": areas,
-    })
+    }, q.year == data.year and q.month == data.month)
 
 def loop_until_user_happy(args: Namespace) -> MonthBlockData | None:
     user_is_happy = False

src/fob/commands/reset.py

@@ -38,4 +38,4 @@ def reset(args: Namespace, db: TinyDBWrapper) -> None:
     except FileNotFoundError:
         pass
 
-    print("\nNext: [green bold]fob new_month[/green bold]: Start a new month (creates a new database)")
+    print("\nStart a new month: [green bold]fob new_month[/green bold]")

src/fob/commands/sup.py

@@ -11,4 +11,5 @@ def sup(args: Namespace, db: TinyDBWrapper) -> None:
     '''
     month_overview(args, db)
     display_checklist(args, db)
-    print("Next commands: [green][bold]fob did (number)[/green][/bold] check off today's blocks.")
+    print("Mark a block as done: [green][bold]fob did <number>[/green][/bold]")
+    print("Convert a block to Buffer: [cyan][bold]fob didnt <number>[/cyan][/bold]")

src/fob/utils/utils.py

@@ -7,7 +7,7 @@
 from rich import print
 
 def get_version_number() -> tuple[int, int, int]:
-    return (0,2,1)
+    return (0,2,2)
 
 def get_db_path(args: Namespace) -> Path:
     '''