Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/murfey/client/multigrid_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from functools import partial
from pathlib import Path
from typing import Dict, List, Optional
from urllib.parse import urlparse
from urllib.parse import quote, urlparse

import aiohttp
import requests
Expand Down Expand Up @@ -189,9 +189,7 @@ def _start_rsyncer_multigrid(

def _rsyncer_stopped(self, source: Path, explicit_stop: bool = False):
if explicit_stop:
remove_url = (
f"{self.murfey_url}/sessions/{self.session_id}/rsyncer/{str(source)}"
)
remove_url = f"{self.murfey_url}/sessions/{self.session_id}/rsyncer?source={quote(str(source), safe='')}"
requests.delete(remove_url)
else:
stop_url = f"{self.murfey_url}/sessions/{self.session_id}/rsyncer_stopped"
Expand Down
25 changes: 16 additions & 9 deletions src/murfey/server/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,15 +296,22 @@
return rsyncer_info


@router.delete("/sessions/{session_id}/rsyncer/{source:path}")
def delete_rsyncer(session_id: int, source: str, db=murfey_db):
rsync_instance = db.exec(
select(RsyncInstance)
.where(RsyncInstance.session_id == session_id)
.where(RsyncInstance.source == source)
).one()
db.delete(rsync_instance)
db.commit()
@router.delete("/sessions/{session_id}/rsyncer")
def delete_rsyncer(session_id: int, source: Path, db=murfey_db):
try:
rsync_instance = db.exec(
select(RsyncInstance)
.where(RsyncInstance.session_id == session_id)
.where(RsyncInstance.source == str(source))
).one()
db.delete(rsync_instance)
db.commit()
except Exception:
log.error(
f"Failed to delete rsyncer for source directory {sanitise(str(source))!r} "
f"in session {session_id}.",
exc_info=True,
)


@router.post("/sessions/{session_id}/rsyncer_stopped")
Expand Down