diff --git a/frigate/comms/webpush.py b/frigate/comms/webpush.py index a3d34c930..32eeb40e8 100644 --- a/frigate/comms/webpush.py +++ b/frigate/comms/webpush.py @@ -21,7 +21,7 @@ from frigate.config.camera.updater import ( CameraConfigUpdateEnum, CameraConfigUpdateSubscriber, ) -from frigate.const import CONFIG_DIR +from frigate.const import BASE_DIR, CONFIG_DIR from frigate.models import User logger = logging.getLogger(__name__) @@ -371,7 +371,7 @@ class WebPushClient(Communicator): sorted_objects.update(payload["after"]["data"]["sub_labels"]) - image = f"{payload['after']['thumb_path'].replace('/media/frigate', '')}" + image = f"{payload['after']['thumb_path'].replace(BASE_DIR, '')}" ended = state == "end" or state == "genai" if state == "genai" and payload["after"]["data"]["metadata"]: diff --git a/frigate/util/process.py b/frigate/util/process.py index aa9fde2a8..0bef991fc 100644 --- a/frigate/util/process.py +++ b/frigate/util/process.py @@ -14,6 +14,7 @@ from setproctitle import setproctitle import frigate.log from frigate.config.logger import LoggerConfig +from frigate.const import CONFIG_DIR class BaseProcess(mp.Process): @@ -92,7 +93,7 @@ class FrigateProcess(BaseProcess): try: import memray - reports_dir = pathlib.Path("/config/memray_reports") + reports_dir = pathlib.Path(CONFIG_DIR) / "memray_reports" reports_dir.mkdir(parents=True, exist_ok=True) safe_name = ( process_name.replace(":", "_").replace("/", "_").replace("\\", "_") @@ -126,7 +127,7 @@ class FrigateProcess(BaseProcess): self.__memray_tracker.__exit__(None, None, None) self.__memray_tracker = None - reports_dir = pathlib.Path("/config/memray_reports") + reports_dir = pathlib.Path(CONFIG_DIR) / "memray_reports" html_file = reports_dir / f"{safe_name}.html" result = subprocess.run(