Skip to content

Commit 32c9a7e

Browse files
committed
Register items in gridsquares folder as serialem metadata
1 parent e7411a1 commit 32c9a7e

2 files changed

Lines changed: 16 additions & 3 deletions

File tree

src/murfey/client/analyser.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,15 @@ def _find_context(self, file_path: Path) -> bool:
243243
)
244244
return True
245245

246-
if "Metadata" in file_path.parts or file_path.name == "EpuSession.dm":
246+
if (
247+
"Metadata" in file_path.parts
248+
or "gridsquares" in file_path.parts
249+
or file_path.name == "EpuSession.dm"
250+
):
247251
if (context := _get_context("SPAMetadataContext")) is None:
248252
return False
249253
self._context = context.load()(
250-
"epu",
254+
"serialem" if self._serialem else "epu",
251255
self._basepath,
252256
self._murfey_config,
253257
self._token,
@@ -357,12 +361,13 @@ def _analyse(self, transferred_file: Path):
357361
if self._limited:
358362
if (
359363
"Metadata" in transferred_file.parts
364+
or "gridsquares" in transferred_file.parts
360365
or transferred_file.name == "EpuSession.dm"
361366
) and not self._context:
362367
if not (context := _get_context("SPAMetadataContext")):
363368
return None
364369
self._context = context.load()(
365-
"epu",
370+
"serialem" if self._serialem else "epu",
366371
self._basepath,
367372
self._murfey_config,
368373
self._token,

src/murfey/client/contexts/spa_metadata.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,12 @@ def post_transfer_serialem(
138138
visitless_source = _get_visitless_source(
139139
source, environment, skip_search=True
140140
)
141+
destination_file = _file_transferred_to(
142+
environment,
143+
source,
144+
transferred_file,
145+
Path(self._machine_config.get("rsync_basepath", "")),
146+
)
141147
capture_post(
142148
base_url=str(environment.url.geturl()),
143149
router_name="session_control.spa_router",
@@ -148,7 +154,9 @@ def post_transfer_serialem(
148154
gsid=transferred_file.stem,
149155
data={
150156
"tag": visitless_source,
157+
"image_path": str(destination_file),
151158
"count": len(self._registered_squares_serialem) + 1,
159+
"serialem": self._acquisition_software == "serialem",
152160
},
153161
)
154162
self._registered_squares_serialem.add(transferred_file.stem)

0 commit comments

Comments
 (0)