Small Fixes - Fix Default Camera Image

README.md

@@ -61,7 +61,7 @@ poetry shell
 
 Start the server in development mode (hot reload):
 ```
-poetry run uvicorn app:app --reload
+poetry run uvicorn app:shepherd --reload
 ```
 
 To deploy run (chosen port and ip are optional):

app/config.py

@@ -28,13 +28,30 @@ class Settings:
     teamname_file: Path = Path("/home/pi/teamname.txt")
     zone: bool = False
 
+    """
+    Pick a start image in order of preference :
+        1) Camera Image (Deleted on Start)
+        2) Corner Image (USB)
+        3) Team Image (Uploaded)
+        4) Generic Corner Image (Arena USB Exists)
+        5) Teddy Image
+    """
+    camera_image_files: list[Path] = [
+        Path("static/image.jpg"),
+        Path("static/temp.jpg"),
+        arena_usb_path / "Corner.jpg",
+        Path('usercode/editable/team_logo.jpg'),
+        Path("static/game/teddy.jpg")
+    ]
+
     # tempfile.mktemp is deprecated, but there's no possibility of a race --
     usr_fifo_path = tempfile.mktemp(prefix="shepherd-fifo-")
 
     def __init__(self):
         self._on_brain()
         self._init_usercode_folder()
         self._zone_from_USB()
+        self._get_team_image()
 
         # os.mkfifo raises if its path already exists.
         os.mkfifo(self.usr_fifo_path)
@@ -72,35 +89,17 @@ def _zone_from_USB(self):
                 self.zone = str(i)
                 return
 
-    def _get_team_specifics(self):
+    def _get_team_image(self):
         """Find information set on each brain about the team
 
         Only makes sense to run this if we are on a brain
         Teamname is set per brain before shipping and allows unique graphics
         for ID'ing teams in the arena.
-
-        Pick a start image in order of preference :
-            1) We have a team corner image on the USB
-            2) The team have uploaded their own image to the robot
-            3) We have a generic corner image on the USB
-            4) The game image
         """
+        teamname_jpg = 'none'
         if self.teamname_file.exists():
-            teamname_jpg = self.teamname_file.read_text().replace('\n', '') + '.jpg'
-        else:
-            teamname_jpg = 'none'
-
-        start_img_path = self.arena_usb_path / teamname_jpg
-        if not start_img_path.exists():
-            start_img_path = Path('usercode/editable/team_logo.jpg')
-        if not start_img_path.exists():
-            start_img_path = self.arena_usb_path / 'Corner.jpg'
-        if not start_img_path.exists():
-            start_img_path = Path('/home/pi/game_logo.jpg')
-
-        if start_img_path.exists():
-            displayed_img_path = Path('static/image.jpg')
-            displayed_img_path.write_bytes(start_img_path.read_bytes())
-
+            teamname_jpg = self.teamname_file.read_text().strip() + '.jpg'
+
+        self.camera_image_files[1] = Path(teamname_jpg) 
 
 config = Settings()

app/routers.py

@@ -5,13 +5,14 @@
 import logging
 
 from fastapi import APIRouter, HTTPException, UploadFile, File, Request
+from fastapi.responses import FileResponse
 from pydantic import BaseModel
 
 from app.run import States
 from app.run import runner
 import app.editor
 import app.upload
-
+from app.config import config
 
 # ==============================================================================
 # Runner router
@@ -87,3 +88,10 @@ async def save_file(filename: str, request: Request):
 def delete_file(filename: str):
     app.editor.delete_file(filename)
 
+
+@files_router.get('/image.jpg')
+def get_image():
+    for camera_file in config.camera_image_files:
+        if camera_file.exists():
+            return FileResponse(camera_file)
+    raise HTTPException(status_code=404, detail="Item not found")

test/test_editor.py

@@ -55,3 +55,23 @@ def test_create_and_delete(client):
     finally:
         if stimulus_path.exists():
             os.remove(stimulus_path)
+
+def test_get_image(client):
+
+    """
+    Test Camera Image
+    """
+    cameraFile = config.camera_image_files[0]
+    if not cameraFile.exists():
+        cameraFile.write_text("Hello World!")
+
+    response = client.get("/files/image.jpg")
+    assert response.status_code == 200
+
+
+    """
+    Test No Camera Image
+    """
+    os.remove(cameraFile)
+    response = client.get("/files/image.jpg")
+    assert response.status_code == 200