hurlebouc
/
gitust
mirror of https://forge.pointfixe.fr/hubert/gitust.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

save

This commit is contained in:
Hubert 2021-07-11 09:53:38 +02:00
parent e026ff4bbb
commit b22b5f81c7
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -17,4 +17,4 @@ askama_actix = "0.11.1"
env_logger = "0.8.4" env_logger = "0.8.4"
serde = "1.0.126" serde = "1.0.126"
futures = "0.3.15" futures = "0.3.15"
tokio = {version = "0.2.25", features = ["time", "process"]} tokio = {version = "0.2.25", features = ["time", "process", "io-util"]}

22
src/main.rs
View File

@ -28,6 +28,7 @@ use std::io::{Read, BufRead, Write, ErrorKind};
use futures::{Stream, StreamExt, TryStreamExt, future, stream, TryFutureExt, pin_mut}; use futures::{Stream, StreamExt, TryStreamExt, future, stream, TryFutureExt, pin_mut};
use actix_web::web::{Buf, Bytes}; use actix_web::web::{Buf, Bytes};
use actix_web::http::header::IntoHeaderValue; use actix_web::http::header::IntoHeaderValue;
use actix_web::client::PayloadError;
#[derive(Template)] #[derive(Template)]
#[template(path = "hello.html")] #[template(path = "hello.html")]
@ -172,7 +173,9 @@ async fn git_proto(payload : web::Payload, web::Path((owner, reponame)): web::Pa
let mut input = p.stdin.take().unwrap(); let mut input = p.stdin.take().unwrap();
payload.try_for_each(|bytes| { payload.try_for_each(|bytes| {
// println!("{:?}", bytes); // println!("{:?}", bytes);
input.write_all(bytes.bytes()).map_err(|e| actix_web::client::PayloadError::Io(e)) let write_all = input.write_all(bytes.bytes());
let res = write_all.map_err(|e| actix_web::client::PayloadError::Io(e));
return res;
// future::ready(Ok(())) // future::ready(Ok(()))
}).await; }).await;
println!("input sent"); println!("input sent");
@ -254,19 +257,22 @@ async fn git_proto(payload : web::Payload, web::Path((owner, reponame)): web::Pa
// } // }
// }); // });
let unfold = stream::try_unfold(0, |_useless| async move { let unfold = stream::try_unfold(0, |_useless| {
let mut buff: [u8; 1024] = [0; 1024]; let mut buff: [u8; 1024] = [0; 1024];
let result = rdr.read(&mut buff[..]).await; let read = rdr.read(&mut buff[..]);
match result { let result = read.map_ok(|l| Some((Bytes::copy_from_slice(&buff[0..l]), 0)));
Ok(l) => {Ok(Some((Bytes::copy_from_slice(&buff[0..l]), 0)))} return result;
Err(e) => {Err(e)} // match result {
} // Ok(l) => {Ok(Some((Bytes::copy_from_slice(&buff[0..l]), 0)))}
// Err(e) => {Err(e)}
// }
// result.map(|l| { // result.map(|l| {
// print!("{}", String::from_utf8_lossy(&buff[0..l])); // print!("{}", String::from_utf8_lossy(&buff[0..l]));
// Some((Bytes::copy_from_slice(&buff[0..l]), 0)) // Some((Bytes::copy_from_slice(&buff[0..l]), 0))
// }); // });
}); });
pin_mut!(unfold); // pin_mut!(unfold);
let response = builder.streaming(unfold); let response = builder.streaming(unfold);
// let response = builder.streaming(stream::repeat_with(move || { // let response = builder.streaming(stream::repeat_with(move || {