[Gobal] added flake8 and did format

.flake8

@@ -0,0 +1,8 @@
+[tool.black]
+line-length = 88
+target-version = ['py312']
+
+[tool.flake8]
+max-line-length = 88
+extend-ignore = "E203"
+exclude = ".venv"

AGENTS.md

@@ -0,0 +1,15 @@
+# AGENTS.md
+
+## Core Workflow
+
+- **Setup**: `make prep` (creates `.venv` and installs `requirements.txt`)
+- **Build**: `make build` (runs `atom_gen.py`, `prep.py`, and `build_pages.py`)
+- **Events**: Update `dogadjaji.csv` then run `make events` (updates pages and generates images via `image_poster.py`)
+- **Development**: `make dev` (starts Nginx using `nginx.dev.conf`) and `make stop` to terminate.
+
+## Technical Details
+
+- **Environment**: Uses a local virtual environment in `.venv`. Always use `./.venv/bin/python` or ensure the venv is activated.
+- **Output**: The generated website is stored in the `site/` directory.
+- **Data**: Events are driven by `dogadjaji.csv`.
+- **Web Server**: Uses Nginx for the development server.

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build events dev stop help prep
+.PHONY: build events dev stop help prep lint format
 
 help:
 	@echo "Available commands:"
@@ -29,3 +29,9 @@ dev:
 stop:
 	nginx -p . -s stop
 
+lint:
+	./.venv/bin/flake8 . --config .flake8 --exclude .venv
+
+format:
+	./.venv/bin/black .
+

atom_gen.py

@@ -11,7 +11,7 @@ import os
 
 blogs_dir = os.fsencode("blog")
 
-#def blogposts_list_gen():
+# def blogposts_list_gen():
 #    output_list = []
 #    for file in os.listdir(blogs_dir):
 #        filename = os.fsdecode(file)
@@ -26,46 +26,48 @@ blogs_dir = os.fsencode("blog")
 #            output_list.append([author, title, time, content_html, full_path])
 #    return output_list
 
+
 def events_list_gen():
     output_list = []
     events_file = open("dogadjaji.csv", "r")
     for line in events_file.readlines():
-            date, time, location, title = line.split(", ")
+        date, time, location, title = line.split(", ")
-            author = "Decentrala"
+        author = "Decentrala"
-            content_html = f"Event is taking place at {location} on {date} at {time}. For more information see the forum at https://forum.dmz.rs"
+        content_html = f"Event is taking place at {location} on {date} at {time}. For more information see the forum at https://forum.dmz.rs"
 
-            output_list.append([author, title, content_html])
+        output_list.append([author, title, content_html])
     events_file.close()
     return output_list
 
+
 def feedgen(blogs, events):
     fg_blog = FeedGenerator()
-    fg_blog.id('http://dmz.rs/')
+    fg_blog.id("http://dmz.rs/")
-    fg_blog.title('Decentrala Blog')
+    fg_blog.title("Decentrala Blog")
-    fg_blog.author( {'name':'Decentrala','email':'dmz@dmz.rs'} )
+    fg_blog.author({"name": "Decentrala", "email": "dmz@dmz.rs"})
-    fg_blog.link( href='https://dmz.rs/atom_blog.xml', rel='self' )
+    fg_blog.link(href="https://dmz.rs/atom_blog.xml", rel="self")
 
     fg_events = FeedGenerator()
-    fg_events.id('http://dmz.rs/')
+    fg_events.id("http://dmz.rs/")
-    fg_events.title('Decentrala Blog')
+    fg_events.title("Decentrala Blog")
-    fg_events.author( {'name':'Decentrala','email':'dmz@dmz.rs'} )
+    fg_events.author({"name": "Decentrala", "email": "dmz@dmz.rs"})
-    fg_events.link( href='https://dmz.rs/atom_events.xml', rel='self' )
+    fg_events.link(href="https://dmz.rs/atom_events.xml", rel="self")
 
     for post in blogs:
         fe_blogs = fg_blog.add_entry()
         fe_blogs.id("https://dmz.rs/" + post[4][:-3] + ".html")
-        fe_blogs.author({'name': post[0]})
+        fe_blogs.author({"name": post[0]})
         fe_blogs.title(post[1])
         fe_blogs.updated(post[2])
-        fe_blogs.content(content=post[3], type='html')
+        fe_blogs.content(content=post[3], type="html")
 
     for event in events:
         fe_events = fg_events.add_entry()
         fe_events.id("https://dmz.rs/pages/events.html")
-        fe_events.author({'name': event[0]})
+        fe_events.author({"name": event[0]})
         fe_events.title(event[1])
         fe_events.updated(datetime.datetime.now(datetime.timezone.utc))
-        fe_events.content(content=event[2], type='html')
+        fe_events.content(content=event[2], type="html")
 
-    fg_blog.atom_file('site/atom_blog.xml')
+    fg_blog.atom_file("site/atom_blog.xml")
-    fg_events.atom_file('site/atom_events.xml')
+    fg_events.atom_file("site/atom_events.xml")

blog.py

@@ -5,8 +5,8 @@ from markdown import markdown as to_markdown
 
 blog = ""
 
-with open('blogs/Lorem Ipsum.md','rt') as file:
+with open("blogs/Lorem Ipsum.md", "rt") as file:
     blog = file.read()
 
-with open('blogs/Lorem Ipsum.html', 'wt') as file:
+with open("blogs/Lorem Ipsum.html", "wt") as file:
     file.write(to_markdown(blog))

build_pages.py

@@ -2,39 +2,61 @@ from jinja2 import Environment, FileSystemLoader
 import os
 
 PAGES = [
-    {'name': 'index', 'titleSR': 'Početna', 'titleEN': 'Home', 'style': 'home'},
+    {"name": "index", "titleSR": "Početna", "titleEN": "Home", "style": "home"},
-    {'name': 'account', 'titleSR': 'Nalog', 'titleEN': 'Account', 'style': 'account'},
+    {"name": "account", "titleSR": "Nalog", "titleEN": "Account", "style": "account"},
-    {'name': 'about', 'titleSR': 'O nama', 'titleEN': 'About us', 'style': 'about'},
+    {"name": "about", "titleSR": "O nama", "titleEN": "About us", "style": "about"},
-    {'name': 'statute', 'titleSR': 'Statut', 'titleEN': 'Statute', 'style': 'statute'},
+    {"name": "statute", "titleSR": "Statut", "titleEN": "Statute", "style": "statute"},
-    {'name': 'events', 'titleSR': 'Događaji', 'titleEN': 'Events', 'style': 'events'},
+    {"name": "events", "titleSR": "Događaji", "titleEN": "Events", "style": "events"},
-    {'name': 'events_archive', 'titleSR': 'Arhiva događaja', 'titleEN': 'Events archive', 'style': 'events'},
+    {
-    {'name': 'services', 'titleSR': 'Servisi', 'titleEN': 'Services', 'style': 'services'},
+        "name": "events_archive",
-    {'name': 'webring', 'titleSR': 'Webring', 'titleEN': 'Webring', 'style': ''},
+        "titleSR": "Arhiva događaja",
-    {'name': 'support', 'titleSR': 'Podrška', 'titleEN': 'Support', 'style': 'support'},
+        "titleEN": "Events archive",
-    {'name': 'deconference', 'titleSR': 'Dekonferencija', 'titleEN': 'Deconference', 'style': 'deconference'},
+        "style": "events",
+    },
+    {
+        "name": "services",
+        "titleSR": "Servisi",
+        "titleEN": "Services",
+        "style": "services",
+    },
+    {"name": "webring", "titleSR": "Webring", "titleEN": "Webring", "style": ""},
+    {"name": "support", "titleSR": "Podrška", "titleEN": "Support", "style": "support"},
+    {
+        "name": "deconference",
+        "titleSR": "Dekonferencija",
+        "titleEN": "Deconference",
+        "style": "deconference",
+    },
 ]
 
-env = Environment(loader=FileSystemLoader('template'))
+env = Environment(loader=FileSystemLoader("template"))
+
 
 def main():
-    os.makedirs('site/en/', exist_ok=True)
+    os.makedirs("site/en/", exist_ok=True)
     for page in PAGES:
         # Build SR Page
         with open(f'pages/sr/{page["name"]}.html') as f:
             page_content = "<div class='cover-wrap'><img src='/img/students_bug.jpg' alt='Studenti su nasli bug' /></div>"
             page_content += f.read()
 
-        sr_html = env.get_template('page-sr.html').render(
+        sr_html = env.get_template("page-sr.html").render(
-            title=page['titleSR'],
+            title=page["titleSR"],
             content=page_content,
-            extra_styles=f'<link rel="stylesheet" href="/styles/{page["style"]}.css">' if page['style'] else '',
+            extra_styles=(
+                f'<link rel="stylesheet" href="/styles/{page["style"]}.css">'
+                if page["style"]
+                else ""
+            ),
             lang="sr",
             sr_link=f"/en/{page['name']}",
-            current_path=f"/{page['name']}" if page['name'] != 'index' else "/"
+            current_path=f"/{page['name']}" if page["name"] != "index" else "/",
         )
 
-        sr_filename = "index.html" if page['name'] == 'index' else f"{page['name']}.html"
+        sr_filename = (
-        with open(f'site/{sr_filename}', 'w') as f:
+            "index.html" if page["name"] == "index" else f"{page['name']}.html"
+        )
+        with open(f"site/{sr_filename}", "w") as f:
             f.write(sr_html)
 
         # Build EN Page
@@ -42,19 +64,25 @@ def main():
             page_content = "<div class='cover-wrap'><img src='/img/students_bug.jpg' alt='Students found the bug' /></div>"
             page_content += f.read()
 
-        en_html = env.get_template('page-en.html').render(
+        en_html = env.get_template("page-en.html").render(
-            title=page['titleEN'],
+            title=page["titleEN"],
             content=page_content,
-            extra_styles=f'<link rel="stylesheet" href="/styles/{page["style"]}.css">' if page['style'] else '',
+            extra_styles=(
+                f'<link rel="stylesheet" href="/styles/{page["style"]}.css">'
+                if page["style"]
+                else ""
+            ),
             lang="en",
             sr_link=f"/{page['name']}",
-            current_path=f"/en/{page['name']}" if page['name'] != 'index' else "/en/"
+            current_path=f"/en/{page['name']}" if page["name"] != "index" else "/en/",
         )
 
-        en_filename = "index.html" if page['name'] == 'index' else f"{page['name']}.html"
+        en_filename = (
-        with open(f'site/en/{en_filename}', 'w') as f:
+            "index.html" if page["name"] == "index" else f"{page['name']}.html"
+        )
+        with open(f"site/en/{en_filename}", "w") as f:
             f.write(en_html)
 
-if __name__ == '__main__':
-    main()
 
+if __name__ == "__main__":
+    main()

image_poster.py

@@ -13,10 +13,34 @@ NEXT_MONTH = CURRENT_TIME + relativedelta.relativedelta(months=1, day=1)
 DAYS_OF_WEEK_SR = ("PON", "UTO", "SRE", "ČET", "PET", "SUB", "NED")
 DAYS_OF_WEEK_EN = ("MON", "TUE", "WED", "THU", "FRI", "SAT", "SUn")
 
-MONTHS_SR = ("Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul",
+MONTHS_SR = (
-             "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar")
+    "Januar",
-MONTHS_EN = ("January", "February", "March", "April", "May", "June", "July",
+    "Februar",
-             "August", "September", "October", "November", "December")
+    "Mart",
+    "April",
+    "Maj",
+    "Jun",
+    "Jul",
+    "Avgust",
+    "Septembar",
+    "Oktobar",
+    "Novembar",
+    "Decembar",
+)
+MONTHS_EN = (
+    "January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December",
+)
 
 HEADER_SR = "Plan za {}"
 
@@ -36,10 +60,15 @@ All events are always free
 
 def parseArgs(parser):
     """
-        Parse all arguments and return the list of argument values
+    Parse all arguments and return the list of argument values
     """
-    parser.add_argument("month", metavar="MM",
+    parser.add_argument(
-                        help="two digit number representing the month for which to generate poster", default="empty", nargs="?")
+        "month",
+        metavar="MM",
+        help="two digit number representing the month for which to generate poster",
+        default="empty",
+        nargs="?",
+    )
     return parser.parse_args()
 
 
@@ -51,18 +80,19 @@ def load_events(csv_path: str, month: int) -> list[dict]:
         next(csv_reader, None)
         for event in csv_reader:
             event_date = event[0]
-            event_date_parsed = dt.datetime.strptime(
+            event_date_parsed = dt.datetime.strptime(event_date, "%d-%m-%Y").date()
-                event_date, "%d-%m-%Y").date()
             event_time = event[1]
             event_title = event[3]
             event_title_en = event[3]
             if len(event) > 6:
                 event_title_en = event[6]
 
-            current_event = {"date": event_date_parsed,
+            current_event = {
-                             "time": event_time,
+                "date": event_date_parsed,
-                             "title": event_title.strip(),
+                "time": event_time,
-                             "title_en": event_title_en.strip()}
+                "title": event_title.strip(),
+                "title_en": event_title_en.strip(),
+            }
             if event_date_parsed >= month and event_date_parsed < monthafter:
                 events.append(current_event)
         return events
@@ -71,8 +101,7 @@ def load_events(csv_path: str, month: int) -> list[dict]:
 def drawMesh(draw, img, fg, bg, font, W, H):
     def drawCircle(x, y):
         r = 50
-        draw.ellipse((x - r, y - r, x + r, y+r),
+        draw.ellipse((x - r, y - r, x + r, y + r), fill=fg, outline=(0, 0, 0), width=0)
-                     fill=fg, outline=(0, 0, 0), width=0)
 
     LCX = 415  # logo center x
     LCY = 4350  # logo center y
@@ -84,11 +113,15 @@ def drawMesh(draw, img, fg, bg, font, W, H):
     drawCircle(LCX + d, LCY)
 
     draw.line([(LCX - d, LCY), (LCX + d, LCY)], fill=fg, width=20, joint=None)
-    draw.line([(LCX, LCY), (LCX, LCY + d), (LCX + d, LCY),
+    draw.line(
-              (LCX, LCY - d)], fill=fg, width=20, joint=None)
+        [(LCX, LCY), (LCX, LCY + d), (LCX + d, LCY), (LCX, LCY - d)],
-    draw.text((LCX - 1.7*d, LCY + 1.5*d), "dmz.rs", font=font, fill=fg)
+        fill=fg,
+        width=20,
+        joint=None,
+    )
+    draw.text((LCX - 1.7 * d, LCY + 1.5 * d), "dmz.rs", font=font, fill=fg)
 
-    mesh_svg = svg2png(url='site/img/mesh-light.svg')
+    mesh_svg = svg2png(url="site/img/mesh-light.svg")
     mesh_svg_bytes = io.BytesIO(mesh_svg)
     mesh_img = Image.open(mesh_svg_bytes)
     if bg == (0, 0, 0):
@@ -107,35 +140,32 @@ def drawMesh(draw, img, fg, bg, font, W, H):
 
 
 def drawPoster(events, bg, fg, month: int, en: bool):
-    fontFacade = ImageFont.truetype('./site/font/Facade-Sud.woff', size=365)
+    fontFacade = ImageFont.truetype("./site/font/Facade-Sud.woff", size=365)
-    fontIosevka = ImageFont.truetype(
+    fontIosevka = ImageFont.truetype("./site/font/iosevka-regular.woff", size=200)
-        './site/font/iosevka-regular.woff', size=200)
+    fontIosevkaSmall = ImageFont.truetype("./site/font/iosevka-regular.woff", size=150)
-    fontIosevkaSmall = ImageFont.truetype(
-        './site/font/iosevka-regular.woff', size=150)
 
     W = 3508
     H = 4960
-    img = Image.new('RGB', (W, H), bg)
+    img = Image.new("RGB", (W, H), bg)
     draw = ImageDraw.Draw(img)
 
     drawMesh(draw, img, fg, bg, fontIosevka, W, H)
 
     title = "DECENTRALA"
     _, _, w, _ = draw.textbbox((0, 0), title, font=fontFacade)
-    draw.text(((W-w)/2, 165), title, font=fontFacade, fill=fg)
+    draw.text(((W - w) / 2, 165), title, font=fontFacade, fill=fg)
 
     header = HEADER_EN if en else HEADER_SR
     months = MONTHS_EN if en else MONTHS_SR
     header = header.format(months[month.month - 1])
 
     _, _, w, _ = draw.textbbox((0, 0), header, font=fontIosevka)
-    draw.text(((W-w)/2, 560), header, font=fontIosevka, fill=fg)
+    draw.text(((W - w) / 2, 560), header, font=fontIosevka, fill=fg)
 
     height = 890
 
     sub_header = SUBHEADER_EN if en else SUBHEADER_SR
-    draw.text((165, height), sub_header,
+    draw.text((165, height), sub_header, font=fontIosevkaSmall, fill=fg)
-              font=fontIosevkaSmall, fill=fg)
     height += 800
 
     # Write list of events to sperate text file as well
@@ -167,8 +197,7 @@ def drawPoster(events, bg, fg, month: int, en: bool):
 
 def main():
     # Parse arguments
-    parser = argparse.ArgumentParser(
+    parser = argparse.ArgumentParser(description="Generate images of the poster")
-        description="Generate images of the poster")
     args = parseArgs(parser)
 
     # Set month based on user input
@@ -176,22 +205,24 @@ def main():
     if args.month.isdigit():
         month = dt.date(CURRENT_TIME.year, int(args.month), 1)
     elif args.month != "empty":
-        print("Month has to be specified as a number. I will use next month as the default")
+        print(
+            "Month has to be specified as a number. I will use next month as the default"
+        )
 
     # Load events and draw a poseter
     events = load_events("dogadjaji.csv", month)
 
     img = drawPoster(events, (0, 0, 0), (20, 250, 50), month, False)
-    img.save('poster_dark.png')
+    img.save("poster_dark.png")
 
     img = drawPoster(events, (255, 255, 255), (0, 0, 0), month, False)
-    img.save('poster_light.png')
+    img.save("poster_light.png")
 
     img = drawPoster(events, (0, 0, 0), (20, 250, 50), month, True)
-    img.save('poster_dark_en.png')
+    img.save("poster_dark_en.png")
 
     img = drawPoster(events, (255, 255, 255), (0, 0, 0), month, True)
-    img.save('poster_light_en.png')
+    img.save("poster_light_en.png")
 
 
 if __name__ == "__main__":

pages/sr/support.html

@@ -24,7 +24,7 @@
     Jednostavno koriscenje naseg softwera se takodje racuna kao doprinos, posto
     bi se time pridruzili decentralizaciji.
   </p>
-  <p>Takođe primamo donacije u bitcoin na adresi:</p>
+  <p>Takođe primamo donacije u bitcoinu na adresi:</p>
   <ul>
     <li>Bitcoin: <i>bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</i></li>
     <!--

poster.py

@@ -7,10 +7,23 @@ EVENTS_CSV_PATH = "dogadjaji.csv"
 CURRENT_TIME = dt.date.today()
 NEXT_MONTH = CURRENT_TIME + relativedelta.relativedelta(months=1, day=1)
 DAYS_OF_WEEK_SR = ("PON", "UTO", "SRE", "ČET", "PET", "SUB", "NED")
-MONTHS_SR = ("Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul", "Avgust",\
+MONTHS_SR = (
-            "Septembar", "Oktobar", "Novembar", "Decembar")
+    "Januar",
+    "Februar",
+    "Mart",
+    "April",
+    "Maj",
+    "Jun",
+    "Jul",
+    "Avgust",
+    "Septembar",
+    "Oktobar",
+    "Novembar",
+    "Decembar",
+)
 
-def load_events(csv_path:str) -> list[dict]:
+
+def load_events(csv_path: str) -> list[dict]:
     events = []
     with open(csv_path) as csv_file:
         csv_reader = csv.reader(csv_file)
@@ -20,14 +33,17 @@ def load_events(csv_path:str) -> list[dict]:
             event_date_parsed = dt.datetime.strptime(event_date, "%d-%m-%Y").date()
             event_time = event[1]
             event_title = event[3]
-            current_event = {"date":event_date_parsed,
+            current_event = {
-                             "time":event_time,
+                "date": event_date_parsed,
-                             "title":event_title.strip()}
+                "time": event_time,
+                "title": event_title.strip(),
+            }
             if event_date_parsed >= NEXT_MONTH:
                 events.append(current_event)
         return events
 
-def render_table(events:list[dict])-> str:
+
+def render_table(events: list[dict]) -> str:
     html = ""
     for event in events:
         date = DAYS_OF_WEEK_SR[event["date"].weekday()]
@@ -36,12 +52,13 @@ def render_table(events:list[dict])-> str:
         html += f"\t\t\t<tr> <td>{date}</td> <td>{day}.</td> <td>{title}</td> </tr>\n"
     return html
 
+
 def render_page(table: str) -> str:
-    head = "<head><meta charset=\"UTF-8\"><link rel=\"stylesheet\"\
+    head = '<head><meta charset="UTF-8"><link rel="stylesheet"\
-href=\"styles/poster.css\"><head>"
+href="styles/poster.css"><head>'
     header = "<h1>DECENTRALA</h1>"
     subheader = f"<h2>Plan za {MONTHS_SR[NEXT_MONTH.month - 1]}</h2>"
-    link = "<div id=link><img src=\"/img/logo-light.svg\"> dmz.rs</div>"
+    link = '<div id=link><img src="/img/logo-light.svg"> dmz.rs</div>'
     p1 = "<p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov\
 u <strong>Kraljice Marije 47</strong>.</p>"
     p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\
@@ -50,6 +67,7 @@ pored menjačnice. DC Krov je na poslednjem spratu.</p>"
     return f"<html>{head}<body><main>{header}{subheader}\
 <table>{table}</table>{footer}</main></body></html>"
 
+
 def main():
     events = load_events(EVENTS_CSV_PATH)
     table = render_table(events)
@@ -58,5 +76,6 @@ def main():
     f.write(page)
     f.close()
 
+
 if __name__ == "__main__":
     main()

prep.py

@@ -18,11 +18,12 @@ TYPES_DICT = {
     "party": ("zabava", "entertainment"),
 }
 
-env = Environment(loader=FileSystemLoader('template'))
+env = Environment(loader=FileSystemLoader("template"))
 
-def load_events(csv_path:str) -> list[dict]:
+
+def load_events(csv_path: str) -> list[dict]:
     events = []
-    with open(csv_path, encoding='utf-8') as csv_file:
+    with open(csv_path, encoding="utf-8") as csv_file:
         csv_reader = csv.DictReader(csv_file, skipinitialspace=True)
         for event in csv_reader:
             event_date = event["datum"]
@@ -30,17 +31,20 @@ def load_events(csv_path:str) -> list[dict]:
             event_time = event["vreme"]
             event_location = event["lokacija"]
             event_title = event["tema"]
-            types =  event["tip"].split()
+            types = event["tip"].split()
             link = event.get("link", "")
-            current_event = {"date":event_date_parsed,
+            current_event = {
-                             "time":event_time,
+                "date": event_date_parsed,
-                             "location": event_location,
+                "time": event_time,
-                             "title":event_title.strip(),
+                "location": event_location,
-                             "types": types,
+                "title": event_title.strip(),
-                             "link": link}
+                "types": types,
+                "link": link,
+            }
             events.append(current_event)
         return events
 
+
 def build_ical(events: list[dict]) -> str:
     today = datetime.today().now()
     events_ical = ""
@@ -55,7 +59,16 @@ def build_ical(events: list[dict]) -> str:
 
         uid = str(date.month).zfill(2) + str(date.day).zfill(2) + time[:2]
         date_str = str(date.year) + str(date.month).zfill(2) + str(date.day).zfill(2)
-        created = str(today.year) + str(today.month).zfill(2) + str(today.day).zfill(2) + "T" + str(today.hour).zfill(2) + str(today.minute).zfill(2) + str(today.second).zfill(2) + "Z"
+        created = (
+            str(today.year)
+            + str(today.month).zfill(2)
+            + str(today.day).zfill(2)
+            + "T"
+            + str(today.hour).zfill(2)
+            + str(today.minute).zfill(2)
+            + str(today.second).zfill(2)
+            + "Z"
+        )
         date_str = date_str + "T" + time.replace(":", "") + "00"
 
         event_template_str = env.get_template("event.ical").render(
@@ -64,7 +77,15 @@ def build_ical(events: list[dict]) -> str:
             DATE=date_str,
             TITLE=title,
             URL=url,
-            LOCATION="DC Krov\\, Kraljice Marije 47\\, 6\\, Beograd\\, Serbia" if location.startswith("DC Krov") else ("Matematički fakultet\\, Svetog Nikole 39\\, Beograd\\, Serbia" if location.startswith("Matematički fakultet (Učionica 153)") else location)
+            LOCATION=(
+                "DC Krov\\, Kraljice Marije 47\\, 6\\, Beograd\\, Serbia"
+                if location.startswith("DC Krov")
+                else (
+                    "Matematički fakultet\\, Svetog Nikole 39\\, Beograd\\, Serbia"
+                    if location.startswith("Matematički fakultet (Učionica 153)")
+                    else location
+                )
+            ),
         )
         events_ical += event_template_str
 
@@ -72,27 +93,34 @@ def build_ical(events: list[dict]) -> str:
         events_ical += file.read()
     return events_ical
 
+
 def render_page(template_name, output_path, context):
     template = env.get_template(template_name)
     with open(output_path, "w") as file:
         file.write(template.render(context))
 
+
 # Main execution
 events = sorted(load_events("dogadjaji.csv"), key=lambda e: e["date"])
 today = datetime.today().date()
 
-past_events = sorted([e for e in events if e["date"] <= today], key=lambda e: e["date"], reverse=True)
+past_events = sorted(
-new_events  = [e for e in events if e["date"] >= today]
+    [e for e in events if e["date"] <= today], key=lambda e: e["date"], reverse=True
+)
+new_events = [e for e in events if e["date"] >= today]
 
 sr_types = {k: v[0] for k, v in TYPES_DICT.items()}
 en_types = {k: v[1] for k, v in TYPES_DICT.items()}
 
 # Build Serbian Pages
-render_page("events-sr.html", "pages/sr/events.html", {
+render_page(
-    "lang": "sr",
+    "events-sr.html",
-    "title": "Događaji",
+    "pages/sr/events.html",
-    "sr_link": "/events_archive",
+    {
-    "events_html": env.from_string("""
+        "lang": "sr",
+        "title": "Događaji",
+        "sr_link": "/events_archive",
+        "events_html": env.from_string("""
         {% for event in events %}
         <div class='event'>
             <div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
@@ -116,14 +144,18 @@ render_page("events-sr.html", "pages/sr/events.html", {
             {% endif %}
         </div>
         {% endfor %}
-    """).render(events=new_events, types_names=sr_types)
+    """).render(events=new_events, types_names=sr_types),
-})
+    },
+)
 
-render_page("events-en.html", "pages/en/events.html", {
+render_page(
-    "lang": "en",
+    "events-en.html",
-    "title": "Events",
+    "pages/en/events.html",
-    "sr_link": "/events_archive",
+    {
-    "events_html": env.from_string("""
+        "lang": "en",
+        "title": "Events",
+        "sr_link": "/events_archive",
+        "events_html": env.from_string("""
         {% for event in events %}
         <div class='event'>
             <div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
@@ -147,15 +179,19 @@ render_page("events-en.html", "pages/en/events.html", {
             {% endif %}
         </div>
         {% endfor %}
-    """).render(events=new_events, types_names=en_types)
+    """).render(events=new_events, types_names=en_types),
-})
+    },
+)
 
 # Build Archive Pages
-render_page("events_archive-sr.html", "pages/sr/events_archive.html", {
+render_page(
-    "lang": "sr",
+    "events_archive-sr.html",
-    "title": "Arhiva događaja",
+    "pages/sr/events_archive.html",
-    "sr_link": "/events",
+    {
-    "events_html": env.from_string("""
+        "lang": "sr",
+        "title": "Arhiva događaja",
+        "sr_link": "/events",
+        "events_html": env.from_string("""
         {% for event in events %}
         <div class='event'>
             <div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
@@ -179,14 +215,18 @@ render_page("events_archive-sr.html", "pages/sr/events_archive.html", {
             {% endif %}
         </div>
         {% endfor %}
-    """).render(events=past_events, types_names=sr_types)
+    """).render(events=past_events, types_names=sr_types),
-})
+    },
+)
 
-render_page("events_archive-en.html", "pages/en/events_archive.html", {
+render_page(
-    "lang": "en",
+    "events_archive-en.html",
-    "title": "Events archive",
+    "pages/en/events_archive.html",
-    "sr_link": "/en/events",
+    {
-    "events_html": env.from_string("""
+        "lang": "en",
+        "title": "Events archive",
+        "sr_link": "/en/events",
+        "events_html": env.from_string("""
         {% for event in events %}
         <div class='event'>
             <div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
@@ -210,8 +250,9 @@ render_page("events_archive-en.html", "pages/en/events_archive.html", {
             {% endif %}
         </div>
         {% endfor %}
-    """).render(events=past_events, types_names=en_types)
+    """).render(events=past_events, types_names=en_types),
-})
+    },
+)
 
 # Build ical
 with open("site/events.ical", "w") as file:

pyproject.toml

@@ -0,0 +1,8 @@
+[tool.black]
+line-length = 88
+target-version = ['py312']
+
+[tool.flake8]
+max-line-length = 88
+extend-ignore = "E203"
+exclude = ".venv"

requirements.txt

@@ -1,7 +1,9 @@
 cairosvg
-markdown
+black
-freetype-py
-python-dateutil
 feedgen
-pillow
+flake8
+freetype-py
 jinja2
+markdown
+pillow
+python-dateutil