File tree Expand file tree Collapse file tree 2 files changed +18
-10
lines changed
src/murfey/client/contexts Expand file tree Collapse file tree 2 files changed +18
-10
lines changed Original file line number Diff line number Diff line change @@ -431,12 +431,15 @@ def _position_analysis(
431431 grid_square_metadata_file ,
432432 grid_square ,
433433 )
434+ metadata_source_as_str = (
435+ "/" .join (source .parts [:- 2 ])
436+ + f"/{ environment .visit } /"
437+ + source .parts [- 2 ]
438+ )
434439 metadata_source = Path (
435- (
436- "/" .join (source .parts [:- 2 ])
437- + f"/{ environment .visit } /"
438- + source .parts [- 2 ]
439- )[1 :]
440+ metadata_source_as_str [1 :]
441+ if metadata_source_as_str .startswith ("//" )
442+ else metadata_source_as_str
440443 )
441444 image_path = (
442445 _file_transferred_to (environment , metadata_source , Path (gs .image ))
Original file line number Diff line number Diff line change @@ -241,6 +241,8 @@ def post_transfer(
241241 )
242242 fh_positions = _foil_hole_positions (transferred_file , int (gs_name ))
243243 source = _get_source (transferred_file , environment = environment )
244+ if source is None :
245+ return None
244246 visitless_source_search_dir = str (source ).replace (
245247 f"/{ environment .visit } " , ""
246248 )
@@ -261,12 +263,15 @@ def post_transfer(
261263 transferred_file ,
262264 int (gs_name ),
263265 )
266+ metadata_source_as_str = (
267+ "/" .join (source .parts [:- 2 ])
268+ + f"/{ environment .visit } /"
269+ + source .parts [- 2 ]
270+ )
264271 metadata_source = Path (
265- (
266- "/" .join (Path (visitless_source ).parts [:- 2 ])
267- + f"/{ environment .visit } /"
268- + Path (visitless_source ).parts [- 2 ]
269- )[1 :]
272+ metadata_source_as_str [1 :]
273+ if metadata_source_as_str .startswith ("//" )
274+ else metadata_source_as_str
270275 )
271276 image_path = (
272277 _file_transferred_to (
You can’t perform that action at this time.
0 commit comments