Doo-Wop

src-tauri/src/data_door.rs

@@ -21,33 +21,89 @@ impl DoorState {
 	}
 }
 
-struct Collector(Vec<u8>);
+#[derive(Debug)]
+struct Collector(Vec<u8>, Vec<u8>, usize);
 
 impl easy::Handler for Collector {
 	fn write(&mut self, data: &[u8]) -> Result<usize, easy::WriteError> {
 		self.0.extend_from_slice(data);
 		Ok(data.len())
 	}
+
+	fn read(&mut self, data: &mut [u8]) -> Result<usize, easy::ReadError> {
+		let p = self.2;
+		let src: &[u8] = self.1.as_ref();
+		let n = usize::min(src.len()-p, data.len());
+		data[..n].copy_from_slice(&src[p..(p+n)]);
+		self.2 = n+p;
+		Ok(n)
+	}
+
+	fn seek(&mut self, whence: std::io::SeekFrom) -> easy::SeekResult {
+		use std::io::SeekFrom::{Start, End, Current};
+		match whence {
+			Start(p) => {
+				self.2 = p as usize;
+				easy::SeekResult::Ok
+			},
+			End(d) => {
+				let p = self.1.len() as i64;
+				if p+d < 0 {
+					easy::SeekResult::Fail
+				} else {
+					self.2 = (p+d) as usize;
+					easy::SeekResult::Ok
+				}
+			},
+			Current(d) => {
+				let p = self.2 as i64;
+				if p+d < 0 {
+					easy::SeekResult::Fail
+				} else {
+					self.2 = (p+d) as usize;
+					easy::SeekResult::Ok
+				}
+			},
+		}
+	}
 }
 
-#[tauri::command]
-pub async fn pull_data(state: State<'_, Mutex<DoorState>>) -> Result<String, ()> {
-	println!("Hiya");
-	let mut client = Easy2::new(Collector(Vec::new()));
-	client.custom_request("PROPFIND").map_err(|_| ())?;
-	client.url("https://cloud.seebruecke.org/public.php/webdav/data/")
+pub fn data_client(file: &str) -> Result<Easy2<Collector>, ()> {
+	let mut client = Easy2::new(Collector(Vec::new(), Vec::new(), 0));
+	let url = format!("https://cloud.seebruecke.org/public.php/webdav/data/{}", file);
+	println!("{}", url);
+	client.url(&url)
 		.map_err(|_| ())?;
 	client.username(include_str!("cloud_user.txt")).map_err(|_| ())?;
 	client.http_auth(easy::Auth::new().auto(true)).map_err(|_| ())?;
 	client.ssl_cainfo_blob(include_bytes!("isrg-root-x1.pem"))
 		.map_err(|_| ())?;
-	client.perform().map_err(|_| ())?;
-	let content = client.get_ref();
-	Ok(String::from_utf8_lossy(&content.0).to_string())
+	Ok(client)
 }
 
 #[tauri::command]
-pub async fn push_data(state: State<'_, Mutex<DoorState>>) -> Result<(), ()> {
-	let mut client = Easy2::new(Collector(Vec::new()));
-	Ok(())
+pub async fn pull_data(state: State<'_, Mutex<DoorState>>) -> Result<String, ()> {
+	let mut client = data_client("")?;
+	client.custom_request("PROPFIND").map_err(|_| ())?;
+	client.perform().map_err(|_| ())?;
+	let content = &client.get_ref().0;
+	Ok(String::from_utf8_lossy(content).to_string())
+}
+
+#[tauri::command]
+pub async fn push_data(state: State<'_, Mutex<DoorState>>) -> Result<String, ()> {
+	let state = state.lock().await;
+	let key_file = format!("{:016X}.key", state.id);
+	let mut client = data_client(&key_file)?;
+	client.put(true).map_err(|_| ())?;
+	let v_key = state.key.verifying_key();
+	client.get_mut().1.extend_from_slice(v_key.as_ref());
+	client.in_filesize(v_key.as_ref().len() as u64);
+	client.upload(true);
+	println!("{:?}", client);
+	let perf = client.perform();
+	println!("{:?}", perf);
+	println!("{:?}", client);
+	let content = &client.get_ref().0;
+	Ok(String::from_utf8_lossy(content).to_string())
 }

src-tauri/src/lib.rs

@@ -57,7 +57,6 @@ async fn swap(
 	store: &str,
 	state: State<'_, Mutex<AppState>>,
 ) -> Result<(), ()> {
-	println!("Hi");
 	let state = state.lock().await;
 	let mut rng = rand::thread_rng();
 	let store: Store = store.try_into()?;

src/main.js

@@ -9,7 +9,7 @@ async function swap(s) {
 }
 
 async function push() {
-	await invoke("push_data", {});
+	pullMsgEl.textContent = await invoke("push_data", {});
 }
 
 async function pull() {