rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved capture management into separate object

Browse source
This commit is contained in:
Joel Collins 2020-04-28 14:32:56 +01:00
parent 1a6088a816
commit caf553db7a
14 changed files with 302 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/rescue/check_capture_reload.py
View file

@ -1,6 +1,6 @@
from openflexure_microscope.rescue.monitor_timeout import launch_timeout_test_process
from openflexure_microscope.camera.capture import build_captures_from_exif
from openflexure_microscope.camera.base import BASE_CAPTURE_PATH
from openflexure_microscope.captures.capture_manager import BASE_CAPTURE_PATH
from openflexure_microscope.captures.capture import build_captures_from_exif
from openflexure_microscope.config import user_settings
import logging
@ -10,7 +10,7 @@ def check_capture_rebuild(timeout=10):
logging.info("Loading user settings...")
settings = user_settings.load()
cap_path = str(settings.get("camera", {}).get("paths", {}).get("default"))
cap_path = str(settings.get("captures", {}).get("paths", {}).get("default"))
logging.info(f"Capture path found: {cap_path}")
if not cap_path:
logging.error(