Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sanitize filenames and handle member issues in attendance.py example script #155

Merged
merged 10 commits into from
Oct 20, 2024
Merged

Sanitize filenames and handle member issues in attendance.py example script #155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d8c67a8
Add Excel folder to .gitignore
alsp80 Jul 10, 2024
ff7d1c2
Merge pull request #1 from Olen/main
alsp80 Sep 18, 2024
f7fb4aa
Handle filenames better and don't exit if a member does not exist
alsp80 Sep 30, 2024
42e8695
Revert "Add Excel folder to .gitignore"
elliot-100 Oct 2, 2024
970f190
Merge remote-tracking branch 'upstream/main'
elliot-100 Oct 20, 2024
68c7820
Format with black
elliot-100 Oct 20, 2024
8984e69
Refactor: extract `_sanitise_chars()`
elliot-100 Oct 20, 2024
5221e0e
Revert "Refactor: extract `_sanitise_chars()`"
elliot-100 Oct 20, 2024
4edc771
Refactor: extract `_sanitise_filename()`
elliot-100 Oct 20, 2024
20ae96c
Refactor: extract duplicated code
elliot-100 Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ cython_debug/
# Project specific
exports/*
config.py
Excel/*



54 changes: 41 additions & 13 deletions attendance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import asyncio
import csv
import os
import re
from datetime import date

from config import password, username
Expand Down Expand Up @@ -38,8 +39,11 @@ async def main():
os.makedirs("./exports")

for e in events:
filename = f"{e['startTimestamp']}-{e['heading']}.csv"
Copy link
Collaborator

@elliot-100 elliot-100 Oct 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to refactor out the filename-derivation code into a self-documenting function, e.g. sanitised_filename(event).

filename = str(filename).strip().replace(" ", "_")
filename = re.sub(r"(?u)[^-\w.]", "", filename)
filename = os.path.join(
"./exports", f"{e['startTimestamp']}-{e['heading']}.csv"
"./exports", filename
)
with open(filename, "w", newline="") as csvfile:
spamwriter = csv.writer(
Expand All @@ -50,8 +54,12 @@ async def main():
["Start", "End", "Description", "Name", "Answer", "Organizer"]
)
for o in e["owners"]:
person = await s.get_person(o["id"])
full_name = person["firstName"] + " " + person["lastName"]
try:
person = await s.get_person(o["id"])
except KeyError:
full_name = o["id"]
else:
full_name = person["firstName"] + " " + person["lastName"]
Copy link
Collaborator

@elliot-100 elliot-100 Oct 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recommend refactoring out this repeated line to a function e.g. full_name(person).

spamwriter.writerow(
[
e["startTimestamp"],
Expand All @@ -64,8 +72,12 @@ async def main():
)
if args.a is True:
for r in e["responses"]["acceptedIds"]:
person = await s.get_person(r)
full_name = person["firstName"] + " " + person["lastName"]
try:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

..and this repeated block too.

person = await s.get_person(r)
except KeyError:
full_name = r
else:
full_name = person["firstName"] + " " + person["lastName"]
spamwriter.writerow(
[
e["startTimestamp"],
Expand All @@ -76,8 +88,12 @@ async def main():
]
)
for r in e["responses"]["declinedIds"]:
person = await s.get_person(r)
full_name = person["firstName"] + " " + person["lastName"]
try:
person = await s.get_person(r)
except KeyError:
full_name = r
else:
full_name = person["firstName"] + " " + person["lastName"]
spamwriter.writerow(
[
e["startTimestamp"],
Expand All @@ -88,8 +104,12 @@ async def main():
]
)
for r in e["responses"]["unansweredIds"]:
person = await s.get_person(r)
full_name = person["firstName"] + " " + person["lastName"]
try:
person = await s.get_person(r)
except KeyError:
full_name = r
else:
full_name = person["firstName"] + " " + person["lastName"]
spamwriter.writerow(
[
e["startTimestamp"],
Expand All @@ -100,8 +120,12 @@ async def main():
]
)
for r in e["responses"]["unconfirmedIds"]:
person = await s.get_person(r)
full_name = person["firstName"] + " " + person["lastName"]
try:
person = await s.get_person(r)
except KeyError:
full_name = r
else:
full_name = person["firstName"] + " " + person["lastName"]
spamwriter.writerow(
[
e["startTimestamp"],
Expand All @@ -112,8 +136,12 @@ async def main():
]
)
for r in e["responses"]["waitinglistIds"]:
person = await s.get_person(r)
full_name = person["firstName"] + " " + person["lastName"]
try:
person = await s.get_person(r)
except KeyError:
full_name = r
else:
full_name = person["firstName"] + " " + person["lastName"]
spamwriter.writerow(
[
e["startTimestamp"],
Expand Down
Loading