memberPlumbing/upcomingEvents.py

@@ -1,84 +1,50 @@
 #!/usr/bin/env python3
 
 from datetime import datetime
-import sys
-
-import pyclip
 
 from .config import Config
+from .MembershipWorks import MembershipWorks
 
 
-def format_event(event_details, truncate: bool):
+def format_event(membershipworks: MembershipWorks, event):
+    event_details = membershipworks.get_event_by_eid(event["eid"])
     url = (
         "https://claremontmakerspace.org/events/#!event/register/"
         + event_details["url"]
     )
     if "lgo" in event_details:
-        img = (
-            f"""<img class="alignleft" width="400" src="{event_details['lgo']['l']}">"""
-        )
+        img = f"""<img class="aligncenter" width="500" height="500" src="{event_details['lgo']['l']}">"""
     else:
         img = ""
     # print(json.dumps(event_details))
-    out = f"""<h2 style="text-align: center;">
-  <a href="{url}">{img}{event_details['ttl']}</a>
+    return f"""<h2 style="text-align: center;">
+  <a href="{url}">
+    {img}
+    {event_details['ttl']}
+  </a>
 </h2>
-<div><i>{event_details['szp']} &mdash; {event_details['ezp']}</i></div>
-"""
-    if not truncate:
-        out += f"""
+<div>{event_details['szp']} &mdash; {event_details['ezp']}</div>
 <div>
   {event_details['dtl']}
 </div>
 
 <a href="{url}">Register for this class now!</a>"""
-    return out
 
 
-def format_section(title: str, blurb: str, events, truncate: bool):
-    # skip empty sections
-    if not events:
-        return ""
-
-    events_list = "\n<hr />\n\n".join(format_event(event, truncate) for event in events)
-
-    return f"""<h1>{title}</h1>
-<h4><i>{blurb}</i></h4>
-{events_list}
-"""
-
-
-def generate_post():
+def main():
     config = Config()
-    now = datetime.now()
 
     membershipworks = config.membershipworks
-    events = membershipworks.get_events_list(now)
+    events = membershipworks.get_events_list(datetime.now())
     if "error" in events:
         print("Error:", events["error"])
         return
 
-    ongoing_events = []
-    full_events = []
-    upcoming_events = []
-    for event in events["evt"]:
-        # ignore hidden events
-        if event["cal"] == 0:
-            continue
-        event_details = membershipworks.get_event_by_eid(event["eid"])
-
-        # registration has already ended
-        if (
-            "erd" in event_details
-            and datetime.fromtimestamp(event_details["erd"]) < now
-        ):
-            ongoing_events.append(event_details)
-        # class is full
-        elif event_details["cnt"] >= event_details["cap"]:
-            full_events.append(event_details)
-        else:
-            upcoming_events.append(event_details)
-
+    events_list = "\n<hr />\n\n".join(
+        format_event(membershipworks, event)
+        for event in events["evt"]
+        if event["cal"] != 0  # ignore hidden events
+    )
     header = """<p><img class="aligncenter size-medium wp-image-2319" src="https://claremontmakerspace.org/wp-content/uploads/2019/03/CMS-Logo-b-y-g-300x168.png" alt="" width="300" height="168" /></a></p>
 <p>Greetings Upper Valley Makers:</p>
 <p>We have an exciting list of upcoming classes at the Claremont MakerSpace that we think might interest you.</p>
@@ -93,44 +59,15 @@ def generate_post():
 <hr />
 """
 
-    footer = """<div style="clear: both;">
-  <hr />
+    footer = """
+<hr />
 
-  <div>Happy Makin’!</div>
-  <div>We are grateful for all of the public support that our 501(c)(3), non-profit organization receives. If you’d like to make a donation,please visit the <a href="https://claremontmakerspace.org/support/"><strong>Support Us page</strong></a> of our website.</div>
+<div>Happy Makin’!</div>
+<div>We are grateful for all of the public support that our 501(c)(3), non-profit organization receives. If you’d like to make a donation,please visit the <a href="https://claremontmakerspace.org/support/"><strong>Support Us page</strong></a> of our website.</div>
 </div>
 """
 
-    yield header
-    yield format_section(
-        "Upcoming Events",
-        "Events that are currently open for registration.",
-        upcoming_events,
-        truncate=False,
-    )
-
-    yield format_section(
-        "Just Missed",
-        "These classes are currently full at time of writing. If you are interested, please check the event's page; spots occasionally open up. Keep an eye on this newsletter to see when these classes are offered again.",
-        full_events,
-        truncate=True,
-    )
-
-    yield format_section(
-        "Ongoing",
-        "These classes are ongoing. Registration is closed, but they may be offered again in the future.",
-        ongoing_events,
-        truncate=True,
-    )
-
-    yield (footer)
-
-
-def main():
-    result = "\n".join(generate_post())
-    print(result)
-    pyclip.copy(result)
-    print("Copied to clipboard!", file=sys.stderr)
+    print(header, events_list, footer)
 
 
 if __name__ == "__main__":

pyproject.toml

@@ -23,7 +23,6 @@ lxml = "^4.5.0"
 peewee = "^3.13.2"
 mysqlclient = "^2.1.0"
 udm-rest-client = "^1.0.6"
-pyclip = "^0.7.0"
 
 [tool.poetry.dev-dependencies]
 black = "^22.3.0"