barcode scanner

Author: timothywashburn

.github/workflows/build.yml

@@ -4,10 +4,11 @@ on:
   push:
     branches:
       - main
+      - dev
   workflow_dispatch:
 
 concurrency:
-  group: production_environment
+  group: ${{ github.ref_name }}_environment
   cancel-in-progress: true
 
 jobs:
@@ -23,6 +24,17 @@ jobs:
         id: lowercase
         run: echo "owner=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
+      - name: Set image name
+        id: image
+        run: |
+          if [ "${{ github.ref_name }}" = "dev" ]; then
+            echo "name=check-in-dev" >> $GITHUB_OUTPUT
+            echo "extra_tag=ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in-dev:dev" >> $GITHUB_OUTPUT
+          else
+            echo "name=check-in" >> $GITHUB_OUTPUT
+            echo "extra_tag=ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in:latest" >> $GITHUB_OUTPUT
+          fi
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -39,5 +51,5 @@ jobs:
           context: .
           push: true
           tags: |
-            ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in:${{ github.sha }}
-            ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in:latest
+            ghcr.io/${{ steps.lowercase.outputs.owner }}/${{ steps.image.outputs.name }}:${{ github.sha }}
+            ${{ steps.image.outputs.extra_tag }}

src/api/client.py

@@ -56,13 +56,43 @@ def get_traffic_light(self):
             logging.error(f"Error getting traffic light: {e}")
             return "off"
 
-    def create_account(self, rfid, *, barcode=None, pid=None):
+    def lookup_by_pid(self, pid):
+        """Returns dict with first_name/last_name/email/pid, or None if not found."""
+        try:
+            resp = _req("GET", f"{API_BASE_URL}/accounts/lookup/pid/{pid}", timeout=10)
+            if resp.status_code == 404:
+                return None
+            resp.raise_for_status()
+            return resp.json()
+        except Exception as e:
+            logging.error(f"Error looking up student by pid {pid}: {e}")
+            return None
+
+    def lookup_by_barcode(self, barcode):
+        """Returns dict with first_name/last_name/email/pid, or None if not found."""
+        try:
+            resp = _req("GET", f"{API_BASE_URL}/accounts/lookup/barcode/{barcode}", timeout=10)
+            if resp.status_code == 404:
+                return None
+            resp.raise_for_status()
+            return resp.json()
+        except Exception as e:
+            logging.error(f"Error looking up student by barcode: {e}")
+            return None
+
+    def create_account(self, rfid, *, barcode=None, pid=None, first_name=None, last_name=None, email=None):
         try:
             payload = {"rfid": rfid}
             if barcode:
                 payload["barcode"] = barcode
             if pid:
                 payload["pid"] = pid
+            if first_name:
+                payload["first_name"] = first_name
+            if last_name:
+                payload["last_name"] = last_name
+            if email:
+                payload["email"] = email
             resp = _req("POST", f"{API_BASE_URL}/accounts", json=payload, timeout=30)
             resp.raise_for_status()
             return resp.json()

src/controllers/account_controller.py

@@ -9,10 +9,76 @@ def __init__(self, ctx):
     def create_account_from_barcode(self, barcode):
         self._create(barcode=barcode)
 
+    def go_to_review_from_barcode(self, barcode):
+        canvas = self.ctx.window.canvas
+        loading = tkinter.Label(
+            canvas,
+            text="Looking up student...",
+            bg="#153246", fg="white", font=("Arial", 25),
+        )
+        loading.place(relx=0.5, rely=0.87, anchor="center")
+        self.ctx.window.update()
+
+        student = self.ctx.sheets.lookup_by_barcode(barcode)
+        loading.destroy()
+
+        if student is None:
+            error = tkinter.Label(
+                canvas,
+                text="Student not found. Please enter your details manually.",
+                bg="#153246", fg="white", font=("Arial", 20),
+            )
+            error.place(relx=0.5, rely=0.87, anchor="center")
+            error.after(3000, error.destroy)
+            return
+
+        self.ctx.nav.go_to_create_account_review(
+            pid=student["pid"],
+            first_name=student["first_name"],
+            last_name=student["last_name"],
+            email=student["email"],
+        )
+
     def create_account_from_pid(self, pid):
         self._create(pid=pid)
 
-    def _create(self, *, barcode=None, pid=None):
+    def go_to_review_from_pid(self, pid):
+        canvas = self.ctx.window.canvas
+        loading = tkinter.Label(
+            canvas,
+            text="Looking up student...",
+            bg="#153246", fg="white", font=("Arial", 25),
+        )
+        loading.place(relx=0.5, rely=0.87, anchor="center")
+        self.ctx.window.update()
+
+        student = self.ctx.sheets.lookup_by_pid(pid)
+        loading.destroy()
+
+        if student is None:
+            error = tkinter.Label(
+                canvas,
+                text="Student not found. Please check your PID.",
+                bg="#153246", fg="white", font=("Arial", 20),
+            )
+            error.place(relx=0.5, rely=0.87, anchor="center")
+            error.after(3000, error.destroy)
+            return
+
+        self.ctx.nav.go_to_create_account_review(
+            pid=pid,
+            first_name=student["first_name"],
+            last_name=student["last_name"],
+            email=student["email"],
+        )
+
+    def create_account_from_review(self, *, first_name, last_name, email, pid):
+        if pid:
+            self._create(pid=pid)
+        else:
+            self._create(first_name=first_name, last_name=last_name, email=email)
+
+    def _create(self, *, barcode=None, pid=None, first_name=None, last_name=None, email=None):
         canvas = self.ctx.window.canvas
         inProgress = tkinter.Label(
             canvas,
@@ -22,7 +88,14 @@ def _create(self, *, barcode=None, pid=None):
         inProgress.place(relx=0.5, rely=0.87, anchor="center")
         self.ctx.window.update()
 
-        result = self.ctx.sheets.create_account(self.ctx.rfid, barcode=barcode, pid=pid)
+        result = self.ctx.sheets.create_account(
+            self.ctx.rfid,
+            barcode=barcode,
+            pid=pid,
+            first_name=first_name,
+            last_name=last_name,
+            email=email,
+        )
         inProgress.destroy()
 
         if result is None:

src/controllers/barcode_scanner_controller.py

@@ -0,0 +1,56 @@
+import logging
+import time
+from threading import Thread
+
+from screens.check_in_manual import CheckInManual
+from screens.create_account_barcode import CreateAccountBarcode
+from screens.create_account_manual import CreateAccountManual
+
+
+class BarcodeScannerController:
+    def __init__(self, ctx):
+        self.ctx = ctx
+
+    def start(self, scanner):
+        thread = Thread(target=self._run, args=(scanner,), daemon=True)
+        thread.start()
+
+    def _run(self, scanner):
+        logging.info("Now reading barcodes")
+        scanner_error = False
+        try:
+            while True:
+                if scanner_error:
+                    time.sleep(0.5)
+                    if scanner.reconnect():
+                        logging.info("Barcode scanner reconnected")
+                        scanner_error = False
+                    continue
+
+                try:
+                    barcode = scanner.read_barcode()
+                except OSError as e:
+                    logging.error("Barcode scanner disconnected: %s", e)
+                    scanner_error = True
+                    continue
+
+                if barcode is None:
+                    continue
+
+                logging.debug("Raw barcode received: %r", barcode)
+
+                if not scanner.is_valid(barcode):
+                    logging.warning("Invalid barcode rejected: %r", barcode)
+                    continue
+
+                logging.info("Barcode scanned: %r", barcode)
+                curr_frame = self.ctx.nav.get_curr_frame()
+
+                if curr_frame == CheckInManual:
+                    self.ctx.window.after(0, lambda b=barcode: self.ctx.check_in.handle_by_pid(b))
+                elif curr_frame in (CreateAccountBarcode, CreateAccountManual):
+                    self.ctx.window.after(0, lambda b=barcode: self.ctx.account.go_to_review_from_barcode(b))
+                else:
+                    logging.debug("Barcode scanned on unhandled screen: %s", curr_frame)
+        except Exception as e:
+            logging.exception("Barcode scanner thread crashed: %s", e)

src/controllers/navigation_controller.py

@@ -4,6 +4,8 @@
 from screens.transition_screen import TransitionScreen
 from screens.create_account_barcode import CreateAccountBarcode
 from screens.create_account_manual import CreateAccountManual
+from screens.create_account_no_pid import CreateAccountNoPid
+from screens.create_account_review import CreateAccountReview
 from screens.sign_waiver import SignWaiver
 from screens.check_in_manual import CheckInManual
 from screens.qr_codes import QRCodes
@@ -30,6 +32,8 @@ def __init__(self, window, ctx, dev_mode=False):
             TransitionScreen,
             CreateAccountBarcode,
             CreateAccountManual,
+            CreateAccountNoPid,
+            CreateAccountReview,
             SignWaiver,
             CheckInManual,
             QRCodes,
@@ -108,6 +112,21 @@ def go_to_create_account_manual(self):
         self.get_frame(CreateAccountManual).clear_entries()
         self.show_frame(CreateAccountManual)
 
+    def go_to_create_account_no_pid(self):
+        self.get_frame(CreateAccountNoPid).clear_entries()
+        self.show_frame(CreateAccountNoPid)
+
+    def go_to_create_account_review(self, pid="", first_name="", last_name="", email=""):
+        pid_locked = bool(pid)
+        self.get_frame(CreateAccountReview).setup(
+            first_name=first_name,
+            last_name=last_name,
+            email=email,
+            pid=pid,
+            pid_locked=pid_locked,
+        )
+        self.show_frame(CreateAccountReview)
+
     def go_to_create_account(self, on_done):
         self.get_frame(TransitionScreen).display(
             "Looks like you don't have an account,\nlet's set one up!"

src/controllers/swipe_controller.py

@@ -0,0 +1,43 @@
+import serial
+import logging
+from os.path import exists
+
+
+class BarcodeScanner:
+    def __init__(self, usb_id):
+        self._usb_id = usb_id
+        self._ser = None
+        self._connect()
+
+    def _connect(self):
+        self._ser = serial.Serial(self._usb_id, baudrate=9600, timeout=0.1)
+        self._ser.reset_input_buffer()
+        logging.info("Barcode scanner connected at %s", self._usb_id)
+
+    def reconnect(self):
+        if not exists(self._usb_id):
+            return False
+        try:
+            self._connect()
+            return True
+        except Exception:
+            self._ser = None
+            return False
+
+    def read_barcode(self):
+        """Read one barcode from the scanner. Returns stripped string or None."""
+        # Use read_until(\r) to handle scanners that terminate with CR only
+        line = self._ser.read_until(b"\r")
+        if not line:
+            return None
+        barcode = line.decode("ascii", errors="ignore").strip()
+        # Strip Codabar start/stop characters (A, B, C, D) from both ends
+        barcode = barcode.strip("ABCDabcd")
+        return barcode if barcode else None
+
+    def is_valid(self, barcode):
+        if not barcode:
+            return False
+        if len(barcode) > 32:
+            return False
+        return True