(chore): minort touchups

Author: ghyatzo

src/ffi/python/controllers.rs

@@ -1,6 +1,6 @@
+use crate::api::Cursor;
 use crate::api::TextChange;
 use crate::api::controller::{AsyncReceiver, AsyncSender};
-use crate::api::{Cursor, Selection};
 use crate::buffer::Controller as BufferController;
 use crate::cursor::Controller as CursorController;
 use pyo3::exceptions::PyValueError;
@@ -13,7 +13,7 @@ use super::a_sync_detach;
 #[pymethods]
 impl CursorController {
 	#[pyo3(name = "send")]
-	fn pysend(&self, _py: Python, pos: Selection) -> PyResult<()> {
+	fn pysend(&self, _py: Python, pos: Cursor) -> PyResult<()> {
 		self.send(pos)?;
 		Ok(())
 	}
@@ -142,11 +142,11 @@ impl Cursor {
 
 	#[getter(buffer)]
 	fn pybuffer(&self) -> String {
-		self.sel.iter().map(|s| s.buffer.clone()).collect()
+		self.buffer.clone()
 	}
 
-	#[getter(user)]
-	fn pyuser(&self) -> Option<String> {
-		Some(self.user.clone())
-	}
+	// #[getter(user)]
+	// fn pyuser(&self) -> Option<String> {
+	// 	Some(self.user.clone())
+	// }
 }

src/ffi/python/mod.rs

@@ -48,7 +48,7 @@ pub fn tokio() -> &'static tokio::runtime::Runtime {
 // 	let _ = CREATE_FUTURE.get_or_init(|| create_future);
 // }
 
-#[pyclass(from_py_object)]
+#[pyclass]
 pub struct Promise(Option<tokio::task::JoinHandle<PyResult<Py<PyAny>>>>);
 
 #[pymethods]
@@ -121,7 +121,7 @@ impl std::io::Write for LoggerProducer {
 	}
 }
 
-#[pyclass(from_py_object)
+#[pyclass]
 pub struct Driver(Option<oneshot::Sender<()>>);
 #[pymethods]
 impl Driver {
@@ -231,13 +231,12 @@ impl Cursor {
 #[pymethods]
 impl Selection {
 	#[new]
-	#[pyo3(signature = (*, start_row, start_col, end_row, end_col, buffer, **kwds))]
+	#[pyo3(signature = (*, start_row, start_col, end_row, end_col, **kwds))]
 	pub fn py_new(
 		start_row: i32,
 		start_col: i32,
 		end_row: i32,
 		end_col: i32,
-		buffer: String,
 		kwds: Option<&Bound<'_, PyDict>>,
 	) -> PyResult<Self> {
 		if let Some(_kwds) = kwds {
@@ -246,15 +245,13 @@ impl Selection {
 				start_col,
 				end_row,
 				end_col,
-				buffer,
 			})
 		} else {
 			Ok(Self {
 				start_row,
 				start_col,
 				end_row,
 				end_col,
-				buffer,
 			})
 		}
 	}

src/ffi/python/workspace.rs

@@ -21,7 +21,7 @@ impl Workspace {
 	#[pyo3(name = "attach_buffer")]
 	fn pyattach_buffer(&self, py: Python, path: String) -> PyResult<Promise> {
 		let this = self.clone();
-		a_sync_detach!(py, this.attach_buffer(path.as_str()).await)
+		a_sync_detach!(py, this.attach_buffer(path).await)
 	}
 
 	#[pyo3(name = "detach_buffer")]
@@ -32,20 +32,20 @@ impl Workspace {
 	#[pyo3(name = "fetch_buffers")]
 	fn pylist_buffers(&self, py: Python, filter: String) -> PyResult<Promise> {
 		let this = self.clone();
-		a_sync_detach!(py, this.list_buffers(filter.as_str()).await)
+		a_sync_detach!(py, this.fetch_buffers(filter).await)
 	}
 
 	#[pyo3(name = "fetch_users")]
 	fn pylist_users(&self, py: Python) -> PyResult<Promise> {
 		let this = self.clone();
-		a_sync_detach!(py, this.list_users().await)
+		a_sync_detach!(py, this.fetch_users().await)
 	}
 
 	#[pyo3(name = "fetch_buffer_users")]
 	fn pylist_buffer_users(&self, py: Python, path: String) -> PyResult<Promise> {
 		// crate::Result<Vec<crate::api::User>>
 		let this = self.clone();
-		a_sync_detach!(py, this.list_buffer_users(path.as_str()).await)
+		a_sync_detach!(py, this.fetch_buffer_users(path).await)
 	}
 
 	#[pyo3(name = "delete_buffer")]