Compare commits
3 Commits
4823c55e8b
...
a4f4cb3033
Author | SHA1 | Date |
---|---|---|
Hubert | a4f4cb3033 | |
Hubert | f007c47dbb | |
Hubert | 439e9546e7 |
42
src/main.rs
42
src/main.rs
|
@ -1,6 +1,7 @@
|
|||
mod git;
|
||||
mod ite;
|
||||
mod tostream;
|
||||
mod reader;
|
||||
mod writer;
|
||||
|
||||
use actix_files::Files;
|
||||
use actix_web::{get, post, web, App, HttpResponse, HttpServer, Responder, Error, HttpRequest, HttpMessage};
|
||||
|
@ -19,8 +20,8 @@ use crate::ite::SuperIterator;
|
|||
use std::ops::Add;
|
||||
use std::path::{PathBuf, Path};
|
||||
use serde::Deserialize;
|
||||
use tokio::process::{Command, Child};
|
||||
use tokio::io::{AsyncWriteExt, AsyncBufReadExt, AsyncReadExt};
|
||||
use tokio::process::{Command, Child, ChildStdout};
|
||||
use tokio::io::{AsyncWriteExt, AsyncBufReadExt, AsyncReadExt, BufReader};
|
||||
use std::process::Stdio;
|
||||
use actix_web::http::{header, StatusCode};
|
||||
use std::io;
|
||||
|
@ -30,6 +31,8 @@ use futures::{Stream, StreamExt, TryStreamExt, future, stream, TryFutureExt, pin
|
|||
use actix_web::web::{Buf, Bytes};
|
||||
use actix_web::http::header::IntoHeaderValue;
|
||||
use actix_web::client::PayloadError;
|
||||
use crate::reader::ToStream;
|
||||
use crate::writer::Writer;
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "hello.html")]
|
||||
|
@ -146,7 +149,7 @@ async fn git_main(web::Path((owner, reponame)): web::Path<(String, String)>, web
|
|||
GitMainTemplate { repo, browse : browse, root : path, user_opt : Some(user)}
|
||||
}
|
||||
//#[get("/git/{owner}/{repo}.git/{path:.*}")]
|
||||
async fn git_proto(payload : web::Payload, web::Path((owner, reponame)): web::Path<(String, String)>, mut req: HttpRequest) -> io::Result<HttpResponse>{
|
||||
async fn git_proto(mut payload : web::Payload, web::Path((owner, reponame)): web::Path<(String, String)>, mut req: HttpRequest) -> io::Result<HttpResponse>{
|
||||
println!("enter git_proto");
|
||||
let mut cmd = Command::new("git");
|
||||
cmd.arg("http-backend");
|
||||
|
@ -170,23 +173,19 @@ async fn git_proto(payload : web::Payload, web::Path((owner, reponame)): web::Pa
|
|||
.stdout(Stdio::piped())
|
||||
.stdin(Stdio::piped());
|
||||
let mut p: Child = cmd.spawn()?;
|
||||
//p.stdin.take().unwrap().write()
|
||||
let mut input = p.stdin.take().unwrap();
|
||||
payload.try_for_each(|bytes| {
|
||||
// println!("{:?}", bytes);
|
||||
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(()))
|
||||
}).await;
|
||||
while let Some(Ok(bytes)) = payload.next().await {
|
||||
input.write_all(bytes.bytes()).await;
|
||||
}
|
||||
println!("input sent");
|
||||
let mut rdr = tokio::io::BufReader::new(p.stdout.take().unwrap());
|
||||
|
||||
let mut headers = HashMap::new();
|
||||
while true {
|
||||
loop {
|
||||
let mut line = String::new();
|
||||
let len = rdr.read_line(&mut line).await?;
|
||||
if line == "" || line == "\r" {
|
||||
// println!("line : \"{}\"", line);
|
||||
if line.len() == 2 {
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -223,14 +222,15 @@ async fn git_proto(payload : web::Payload, web::Path((owner, reponame)): web::Pa
|
|||
|
||||
println!("Write body...");
|
||||
|
||||
let unfold = stream::try_unfold(rdr, move |mut rdr| {
|
||||
let mut buff: [u8; 1024] = [0; 1024];
|
||||
let read = rdr.read(&mut buff[..]);
|
||||
let result = read.map_ok(|l| Some((Bytes::copy_from_slice(&buff[0..l]), rdr)));
|
||||
return result;
|
||||
});
|
||||
// let unfold = stream::try_unfold(rdr, move |mut rdr| {
|
||||
// let mut buff: [u8; 1024] = [0; 1024];
|
||||
// let read = rdr.read(&mut buff[..]);
|
||||
// let result = read.map_ok(|l| Some((Bytes::copy_from_slice(&buff[0..l]), rdr)));
|
||||
// return result;
|
||||
// });
|
||||
// pin_mut!(unfold);
|
||||
let response = builder.streaming(unfold);
|
||||
// let response = builder.streaming(unfold);
|
||||
let response = builder.streaming(ToStream(rdr));
|
||||
return Ok(response);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
use futures::{Stream, AsyncRead};
|
||||
// use futures::{Stream, AsyncRead, TryStream};
|
||||
use std::task::{Context, Poll};
|
||||
use std::pin::Pin;
|
||||
use actix_web::web::Bytes;
|
||||
use std::io::Error;
|
||||
|
||||
struct ToStream<T>(T);
|
||||
pub struct ToStream<T>(pub T);
|
||||
|
||||
impl<T> ToStream<T> {
|
||||
fn get_field(self: Pin<&mut Self>) -> Pin<&mut T> {
|
||||
|
@ -14,7 +14,7 @@ impl<T> ToStream<T> {
|
|||
|
||||
impl <T : Unpin> Unpin for ToStream<T>{}
|
||||
|
||||
impl <T : AsyncRead> Stream for ToStream<T>{
|
||||
impl <T : tokio::io::AsyncRead> futures::Stream for ToStream<T>{
|
||||
type Item = Result<Bytes, Error>;
|
||||
|
||||
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
|
@ -0,0 +1,13 @@
|
|||
use actix_web::web::{Bytes, Buf};
|
||||
use tokio::io::AsyncWriteExt;
|
||||
use actix_web::error::PayloadError;
|
||||
|
||||
pub struct Writer<T>(pub T);
|
||||
|
||||
impl <T : tokio::io::AsyncWrite + Unpin> Writer<T> {
|
||||
pub async fn write(&mut self, bytes : Bytes) -> Result<(), PayloadError> {
|
||||
let write_all = self.0.write_all(bytes.bytes()).await;
|
||||
let res = write_all.map_err(|e| actix_web::client::PayloadError::Io(e));
|
||||
return res;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue