Skip to content
Closed
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
2 changes: 2 additions & 0 deletions dist/py/src/codemp/codemp.pyi
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from typing import Tuple, Optional, Callable

def version() -> str: ...

class Driver:
"""
this is akin to a big red button with a white "STOP" on top of it.
Expand Down
9 changes: 5 additions & 4 deletions src/buffer/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl BufferController {

// received new change ack, merge editor branch up to that version
res = worker.ack_rx.recv() => match res {
None => break tracing::error!("ack channel closed"),
None => break tracing::debug!("stopping: ack channel closed"),
Some(v) => {
tracing::debug!("client acked change");
worker.branch.merge(&worker.oplog, &v);
Expand All @@ -126,7 +126,7 @@ impl BufferController {

// received a new poller, add it to collection
res = worker.poller.recv() => match res {
None => break tracing::error!("poller channel closed"),
None => break tracing::debug!("stopping: poller channel closed"),
Some(tx) => worker.pollers.push(tx),
},

Expand Down Expand Up @@ -213,10 +213,11 @@ impl BufferWorker {
#[tracing::instrument(skip(self))]
async fn handle_server_change(&mut self, change: BufferEvent) -> bool {
match self.controller.upgrade() {
None => { // clean exit actually, just weird we caught it here
None => {
// clean exit actually, just weird we caught it here
tracing::debug!("clean exit while handling server change");
true
},
}
Some(controller) => match self.oplog.decode_and_add(&change.op.data) {
Ok(local_version) => {
tracing::debug!("updating local version: {local_version:?}");
Expand Down
10 changes: 5 additions & 5 deletions src/ffi/python/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ impl Client {

#[pyo3(name = "create_workspace")]
fn pycreate_workspace(&self, py: Python<'_>, workspace: String) -> PyResult<super::Promise> {
tracing::info!("attempting to create workspace {}", workspace);
tracing::info!("creating workspace {}", workspace);
let this = self.clone();
a_sync_allow_threads!(py, this.create_workspace(workspace).await)
}

#[pyo3(name = "delete_workspace")]
fn pydelete_workspace(&self, py: Python<'_>, workspace: String) -> PyResult<super::Promise> {
tracing::info!("attempting to delete workspace {}", workspace);
tracing::info!("deleting workspace {}", workspace);
let this = self.clone();
a_sync_allow_threads!(py, this.delete_workspace(workspace).await)
}
Expand All @@ -50,21 +50,21 @@ impl Client {
workspace: String,
user: String,
) -> PyResult<super::Promise> {
tracing::info!("attempting to invite {user} to workspace {workspace}");
tracing::info!("inviting {user} to workspace {workspace}");
let this = self.clone();
a_sync_allow_threads!(py, this.invite_to_workspace(workspace, user).await)
}

#[pyo3(name = "fetch_owned_workspaces")]
fn pyfetch_owned_workspaces(&self, py: Python<'_>) -> PyResult<super::Promise> {
tracing::info!("attempting to fetch owned workspaces");
tracing::info!("fetching owned workspaces");
let this = self.clone();
a_sync_allow_threads!(py, this.fetch_owned_workspaces().await)
}

#[pyo3(name = "fetch_joined_workspaces")]
fn pyfetch_joined_workspaces(&self, py: Python<'_>) -> PyResult<super::Promise> {
tracing::info!("attempting to fetch joined workspaces");
tracing::info!("fetching joined workspaces");
let this = self.clone();
a_sync_allow_threads!(py, this.fetch_joined_workspaces().await)
}
Expand Down