Better calendar size calculations

README.md

@@ -0,0 +1,18 @@
+## Installation
+
+```bash
+sudo apt update
+sudo apt install python3-pip
+
+git clone https://github.com/pimoroni/inky
+cd inky
+./install.sh
+
+python3 -m venv .venv
+source .venv/bin/activate
+pip install -r requirements.txt
+```
+
+## Todo
+
+- [ ] Accurate temp

building.py

@@ -4,31 +4,35 @@ from PIL import ImageFont
 from datetime import datetime, timedelta
 from time import gmtime, strftime
 import time
-from googleCalendar import get_events
 from itertools import groupby
-from hasApi import get_calendar_events
+from hasApi import get_calendar_events, get_todo_items
 import dateutil.parser
 from dotenv import load_dotenv
 
-black = '#000000'
+black = "#000000"
-white = '#ffffff'
+white = "#ffffff"
 
 
 fontSymbols = ImageFont.truetype("SymbolsNerdFont-Regular.ttf", 18)
-fontTitle = ImageFont.truetype("Nunito-SemiBold.ttf", 24)
+fontTitle = ImageFont.truetype("Nunito-Bold.ttf", 24)
-fontLarge = ImageFont.truetype ("Nunito-ExtraLight.ttf", 18)
+fontLarge = ImageFont.truetype("Nunito-ExtraLight.ttf", 18)
-fontSmall = ImageFont.truetype ("Nunito-ExtraLight.ttf", 16)
+fontLargeBold = ImageFont.truetype("Nunito-SemiBold.ttf", 18)
+fontSmall = ImageFont.truetype("Nunito-ExtraLight.ttf", 16)
 fontVerySmall = ImageFont.truetype("Nunito-ExtraLight.ttf", 10)
 
-class Space(Exception): pass
+
+class Space(Exception):
+    pass
+
 
 def getsize(font, text):
     _, _, right, bottom = font.getbbox(text)
     return (right, bottom)
 
+
 def reflow_quote(quote, width, font):
     words = quote.split(" ")
-    reflowed = ''
+    reflowed = ""
     line_length = 0
 
     for i in range(len(words)):
@@ -46,98 +50,125 @@ def reflow_quote(quote, width, font):
 
     return reflowed
 
+
 def draw_image():
     image = Image.new("P", (400, 300))
     draw = ImageDraw.Draw(image)
 
     # Draw the top bar
+    topbar = 26
     draw.rectangle((0, 0, 400, 300), fill=white)
-    draw.rectangle((0, 0, 400, 30), fill=black)
+    draw.rectangle((0, 0, 400, topbar), fill=black)
 
     # Add the clock
     timeStr = strftime("%H:%M", time.localtime())
-    draw.text((10, 5), timeStr, white, fontSmall)
+    draw.text((10, 3), timeStr, white, fontSmall)
 
-    # Add indoor tempriture
+    # Add indoor temperature
-    draw.text((350, 5), "19c", white, fontSmall)
+    draw.text((350, 3), "19c", white, fontSmall)
 
     # Add sections
-    ep = 5
+    ep = 3
-    draw.rounded_rectangle((ep, 30+ep, (400/2)-ep, 300-ep), 10, outline=black, width=2)
+    margin = 5
-    draw.rounded_rectangle(((400/2) + ep, 30+ep, 400-ep, 300-ep), 10, outline=black, width=2)
+    draw.rounded_rectangle(
+        (margin, topbar + margin, (400 / 2) - margin, 300 - margin),
+        10,
+        outline=black,
+        width=2,
+    )
+    draw.rounded_rectangle(
+        ((400 / 2) + margin, topbar + margin, 400 - margin, 300 - margin),
+        10,
+        outline=black,
+        width=2,
+    )
 
     # Add tasks
-    draw.text((15, 40), 'Tasks', black, fontTitle)
+    draw.text((20, topbar + 7), "Tasks", black, fontTitle)
+    draw.line((margin, 62, 200 - margin, 62), fill=black, width=1)
 
-    tasks = [
+    tasks = get_todo_items()
-        {'done': False, 'title': 'Something'}, 
-        {'done': True, 'title': 'Get the Modus and Audi MOTs organised'},
-        {'done': False, 'title': 'Something else'}, 
-        {'done': False, 'title': 'Call locksmith'}, 
-        ]
 
-    taskStart = 80
+    taskStart = 70
     for task in tasks:
-        if task['done']:
+        if task["status"] == "completed":
-            draw.text((15, taskStart-2), '󰄵', black, fontSymbols)
+            continue
+            draw.text((15, taskStart - 2), "󰄵", black, fontSymbols)
         else:
-            draw.text((15, taskStart-2), '󰄱', black, fontSymbols)
+            draw.text((15, taskStart), "󰄱", black, fontSymbols)
 
-        reflowedTitle = reflow_quote(task['title'], 170, fontLarge)
+        reflowedTitle = reflow_quote(task["summary"], 160, fontLarge)
         titleSizeW, titleSizeH = getsize(fontLarge, reflowedTitle)
-        titleSizeH *= (reflowedTitle.count('\n') + 1)
+        titleSizeH *= reflowedTitle.count("\n") + 1
 
         draw.text((35, taskStart - 3), reflowedTitle, black, fontLarge)
-        taskStart += titleSizeH + (2*ep)
+        taskStart += titleSizeH + (2 * ep)
 
     # Add cal
-    draw.text((215, 40), 'Calendar', black, fontTitle)
+    draw.text((220, topbar + 7), "Calendar", black, fontTitle)
+    draw.line(((400 / 2) + margin, 62, 400 - margin, 62), fill=black, width=1)
     events = get_calendar_events()
+
     def get_start_date(x):
-        start = x['start']
+        start = x["start"]
-        if 'date' in start: 
+        if "date" in start:
-            startDate = datetime.strptime(start['date'], '%Y-%m-%d').date()
+            startDate = datetime.strptime(start["date"], "%Y-%m-%d").date()
-        elif 'dateTime' in start: 
+        elif "dateTime" in start:
-            startDate = datetime.strptime(start['dateTime'][:10], '%Y-%m-%d').date()
+            startDate = datetime.strptime(start["dateTime"][:10], "%Y-%m-%d").date()
         else:
-            print('Error')
+            print("Error")
             print(start)
             return None
         if startDate < datetime.today().date():
             return datetime.today().date()
-        else: return startDate
+        else:
+            return startDate
 
-    itemStart = 80
+    itemStart = 70
-    try:
+    for key, group in groupby(events, get_start_date):
-        for key, group in groupby(events, get_start_date):
+        dayStart = itemStart
-            if key == datetime.today().date(): 
+        # Calculate
-                dateStr = 'Today'
+        if key == datetime.today().date():
-            elif key == (datetime.today() + timedelta(days = 1)).date():
+            dateStr = "Today"
-                dateStr = 'Tomorrow' 
+        elif key == (datetime.today() + timedelta(days=1)).date():
-            else:
+            dateStr = "Tomorrow"
-                dateStr = key.strftime('%d %b')
+        else:
+            dateStr = key.strftime("%d %b")
 
-            draw.text((215, itemStart), dateStr, black, fontLarge)
+        w, h = getsize(fontLarge, "Today")
-            w, h = getsize(fontLarge, 'Today')
+        dayStart += h + (ep)
-            itemStart += h + (ep)
 
-            for thing in list(group):
+        dayTasks = list(group)
-                reflowedItem = reflow_quote(thing['summary'], 170, fontSmall)
-                w, h = getsize(fontLarge, 'Today')
-                h *= (reflowedItem.count('\n') + 1)
-                # print(f'After {reflowedItem}, {itemStart + h}')
-                if itemStart + h > 270: raise Space
-                draw.text((230, itemStart), reflowedItem, black, fontSmall)
-                itemStart += h + (ep)
 
-            if itemStart > 250: raise Space
+        for thing in dayTasks:
-    except Space:
+            reflowedItem = reflow_quote(thing["summary"], 170, fontSmall)
-        pass
+            w, h = getsize(fontLarge, "Today")
+            h *= reflowedItem.count("\n") + 1
+            dayStart += h + (ep)
 
+        dayStart + ep
+
+        if dayStart > 280:
+            print()
+            break
+
+        # Commit if possible
+        draw.text((215, itemStart), dateStr, black, fontLargeBold)
+        w, h = getsize(fontLargeBold, dateStr)
+        itemStart += h + ep
+        for thing in dayTasks:
+            reflowedItem = reflow_quote(thing["summary"], 170, fontSmall)
+            w, h = getsize(fontSmall, thing["summary"])
+            h *= reflowedItem.count("\n") + 1
+            draw.text((230, itemStart), reflowedItem, black, fontSmall)
+            itemStart += h + ep
+
+        itemStart += ep
 
     return image
 
+
 if __name__ == "__main__":
     load_dotenv()
     img = draw_image()
-    img.save('built.bmp')
+    img.save("built.bmp")

dev_reqs.txt

@@ -0,0 +1,5 @@
+pillow
+imgkit
+requests
+python-dotenv
+python-dateutil

hasApi.py

@@ -3,20 +3,46 @@ import datetime
 from dotenv import load_dotenv
 import os
 
+
 def get_calendar_events():
-    token = os.getenv('HAS_TOKEN')
+    token = os.getenv("HAS_TOKEN")
     if not token:
-        raise Exception('Missing HAS token')
+        raise Exception("Missing HAS token")
 
     headers = {"Authorization": f"Bearer {token}"}
     payload = {
-        'start': datetime.datetime.now().strftime('%Y-%m-%d'), 
+        "start": datetime.datetime.now().strftime("%Y-%m-%d"),
-        'end': (datetime.datetime.now() + datetime.timedelta(days=14)).strftime('%Y-%m-%d')}
+        "end": (datetime.datetime.now() + datetime.timedelta(days=14)).strftime(
-    response = requests.get('https://has.nozzy.online/api/calendars/calendar.romosborne_gmail_com', 
+            "%Y-%m-%d"
-                            headers=headers,
+        ),
-                            params=payload)
+    }
+    response = requests.get(
+        "https://has.nozzy.online/api/calendars/calendar.romosborne_gmail_com",
+        headers=headers,
+        params=payload,
+    )
     return response.json()
 
+
+def get_todo_items():
+    token = os.getenv("HAS_TOKEN")
+    if not token:
+        raise Exception("Missing HAS token")
+    headers = {"Authorization": f"Bearer {token}"}
+    payload = {"entity_id": "todo.todo_2"}
+    params = {"return_response": "null"}
+    response = requests.post(
+        "https://has.nozzy.online/api/services/todo/get_items",
+        headers=headers,
+        params=params,
+        json=payload,
+    )
+    data = response.json()
+    return data["service_response"]["todo.todo_2"]["items"]
+
+
 if __name__ == "__main__":
     load_dotenv()
-    events = get_calendar_events()
+    events = get_todo_items()
+    for item in events:
+        print(item["summary"])

requirements.txt

@@ -3,3 +3,4 @@ inky
 imgkit
 requests
 python-dotenv
+python-dateutil