fix: adapt after testing in context with old API

Author: toresbe

.dockerignore

@@ -0,0 +1,3 @@
+upload/
+archive/
+.venv

Dockerfile

@@ -34,4 +34,6 @@ COPY --from=builder --chown=app:app /app .
 # Place executables in the environment at the front of the path
 ENV PATH="/app/.venv/bin:$PATH"
 
+USER 1000
+
 CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

app/api/hooks/routes.py

@@ -32,9 +32,9 @@ async def receive_hook(
         # construct updated values for the file info
         sanitized_filename = secure_filename(metadata.orig_file_name)
         upload_id = f"{metadata.video_id}"
-        new_file = settings.tusd_dir / f"{upload_id}/{sanitized_filename}"
+        new_file = Path(f"{upload_id}/{sanitized_filename}")
 
-        if new_file.exists():
+        if (settings.tusd_dir / new_file).exists():
             logger.warning("File already exists, deleting!: %s", new_file)
             new_file.unlink()
 
@@ -43,11 +43,8 @@ async def receive_hook(
     if hook_request.type == "post-finish":
         ingest = Ingester(archive_base_path=settings.archive_dir, django_api=django_api)
         upload_meta = get_upload_metadata(hook_request)
+        upload_file = Path(hook_request.event.upload.storage["Path"])
 
-        # As it's presently configured, tusd sees it at /upload/<video_id>/<sanitized_filename>
-        # and it's mounted at ./upload for ingest.
-        # It's a janky way to turn an absolute path to a relative one, but it works
-        upload_file = Path(f".{hook_request.event.upload.storage['Path']}")
         try:
             metadata = await metadata_extractor.assert_compliance(upload_file)
         except ComplianceError as e:

app/util/lifespan.py

@@ -48,8 +48,8 @@ async def lifespan(app: FastAPI):
         # fixme: should only happen in debug mode
         from app.api.debug.watch_folder.watcher import start_watchfolder
 
-        logger.info("Starting directory watcher for %s", settings.debug.watchdir)
-        start_watchfolder(settings.debug.watchdir)
+        logger.info("Starting directory watcher for %s", settings.tusd_dir)
+        start_watchfolder(settings.tusd_dir)
 
         yield  # App runs here
 

tests/get_git_root.py

@@ -3,4 +3,7 @@
 
 
 def get_git_root():
-    return Path(subprocess.check_output(["git", "rev-parse", "--show-toplevel"], text=True).strip())
+    try:
+        return Path(subprocess.check_output(["git", "rev-parse", "--show-toplevel"], text=True).strip())
+    except Exception:
+        return Path("/app")