Restructure to a more normal module-like structure

.gitignore

@@ -1,2 +1,4 @@
 __pycache__/
 /passwords.py
+/passwords.yaml
+/venv/

bin/doorUpdater

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+from memberPlumbing import doorUpdater
+
+doorUpdater.main()

bin/events

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+from memberPlumbing import events
+
+events.main()

bin/sqlExport

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+from memberPlumbing import sqlExport
+
+sqlExport.main()

bin/ucsAccounts

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+from memberPlumbing import ucsAccounts
+
+ucsAccounts.main()

memberPlumbing/common.py

@@ -1,21 +1,18 @@
-import os
-
 from ruamel.yaml import YAML
 
-from lib.hid.DoorController import DoorController
+from .hid.DoorController import DoorController
-from lib.MembershipWorks import MembershipWorks
+from .MembershipWorks import MembershipWorks
-from passwords import (
-    DOOR_PASSWORD,
-    DOOR_USERNAME,
-    MEMBERSHIPWORKS_PASSWORD,
-    MEMBERSHIPWORKS_USERNAME,
-)
 
-try:
+with open("passwords.yaml") as f:
-    with open(os.path.dirname(os.path.abspath(__file__)) + "/config.yaml") as f:
+    passwords = YAML().load(f)
-        config = YAML().load(f)
+
-except NameError:
+DOOR_USERNAME = passwords["DOOR_USERNAME"]
-    with open("config.yaml") as f:
+DOOR_PASSWORD = passwords["DOOR_PASSWORD"]
+
+MEMBERSHIPWORKS_USERNAME = passwords["MEMBERSHIPWORKS_USERNAME"]
+MEMBERSHIPWORKS_PASSWORD = passwords["MEMBERSHIPWORKS_PASSWORD"]
+
+with open("config.yaml") as f:
     config = YAML().load(f)
 
 doors = {

memberPlumbing/doorUpdater.py

@@ -2,9 +2,9 @@
 
 import copy
 
-from common import doors, doorSpecificSchedules, memberLevels, membershipworks
+from .common import doors, doorSpecificSchedules, memberLevels, membershipworks
-from lib.hid.Credential import Credential
+from .hid.Credential import Credential
-from lib.hid.DoorController import ROOT, E
+from .hid.DoorController import ROOT, E
 
 
 class Member:

memberPlumbing/events.py

@@ -5,8 +5,8 @@ import re
 import requests
 from lxml import etree
 
-from common import doors
+from .common import doors
-from lib.hid.DoorController import E, E_plain
+from .hid.DoorController import E, E_plain
 
 
 def getStrings(door):

memberPlumbing/sqlExport.py

@@ -2,8 +2,8 @@
 
 from datetime import datetime
 
-from common import membershipworks
+from .common import membershipworks
-from lib.mw_models import Label, Member, MemberLabel, Transaction, database
+from .mw_models import Label, Member, MemberLabel, Transaction, database
 
 
 @database.atomic()

memberPlumbing/ucsAccounts.py

@@ -4,7 +4,7 @@ import re
 import string
 import subprocess
 
-from common import membershipworks
+from .common import membershipworks
 
 LDAP_BASE = "cn=users,dc=sawtooth,dc=claremontmakerspace,dc=org"
 GROUP_BASE = "cn=groups,dc=sawtooth,dc=claremontmakerspace,dc=org"

pyproject.toml

@@ -9,6 +9,7 @@ line_length = 88
 
 [tool.poetry]
 name = "memberPlumbing"
+packages = [{ include = "memberPlumbing" }]
 version = "0.1.0"
 description = ""
 authors = ["Adam Goldsmith <adam@adamgoldsmith.name>"]

systemd/doorUpdater.service

@@ -7,4 +7,4 @@ User=adam
 Type=oneshot
 TimeoutStartSec=600
 WorkingDirectory=/home/adam/memberPlumbing/
-ExecStart=/usr/bin/python3 -u /home/adam/memberPlumbing/doorUpdater.py
+ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run /home/adam/memberPlumbing/bin/doorUpdater

systemd/hidEvents.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Pull events from door controllers into local database
+OnFailure=status-email-admin@%n.service
+After=mariadb.service
+Requires=mariadb.service
+
+[Service]
+User=adam
+Type=oneshot
+TimeoutStartSec=600
+WorkingDirectory=/home/adam/memberPlumbing/
+ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run /home/adam/memberPlumbing/bin/hidEvents

systemd/hidEvents.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Hourly door controller events sync
+
+[Timer]
+OnCalendar=hourly
+Persistent=true
+
+[Install]
+WantedBy=timers.target

systemd/membershipworksSQL.service

@@ -9,4 +9,4 @@ User=adam
 Type=oneshot
 TimeoutStartSec=600
 WorkingDirectory=/home/adam/memberPlumbing/
-ExecStart=/usr/bin/python3 -u /home/adam/memberPlumbing/sqlExport.py
+ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run /home/adam/memberPlumbing/bin/sqlExport