This commit is contained in:
Michael Zhang 2021-02-16 15:33:36 -06:00
parent 9116898a21
commit dbe92e4962
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
9 changed files with 74 additions and 11 deletions

View file

@ -3,8 +3,8 @@ on: [push]
name: CI name: CI
jobs: jobs:
build_and_test: doc:
name: Rust project name: panorama
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout

1
Cargo.lock generated
View file

@ -649,6 +649,7 @@ dependencies = [
"inotify", "inotify",
"lettre", "lettre",
"panorama-imap", "panorama-imap",
"parking_lot",
"pin-project", "pin-project",
"rustls-connector", "rustls-connector",
"serde", "serde",

View file

@ -23,6 +23,7 @@ futures = "0.3.12"
inotify = { version = "0.9.2", features = ["stream"] } inotify = { version = "0.9.2", features = ["stream"] }
lettre = "0.9.5" lettre = "0.9.5"
panorama-imap = { path = "imap", version = "0" } panorama-imap = { path = "imap", version = "0" }
parking_lot = "0.11.1"
pin-project = "1.0.4" pin-project = "1.0.4"
rustls-connector = "0.13.1" rustls-connector = "0.13.1"
serde = { version = "1.0.123", features = ["derive"] } serde = { version = "1.0.123", features = ["derive"] }

View file

@ -1,3 +1,3 @@
# Summary # Summary
- [Chapter 1](./chapter_1.md) - [Intro](./intro.md)

View file

@ -1 +0,0 @@
# Chapter 1

4
docs/src/intro.md Normal file
View file

@ -0,0 +1,4 @@
# Intro
Panorama is a personal information manager.

View file

@ -2,6 +2,8 @@
//! === //! ===
#![deny(missing_docs)] #![deny(missing_docs)]
// TODO: get rid of this before any kind of public release
#![allow(unused_imports)]
#[macro_use] #[macro_use]
extern crate anyhow; extern crate anyhow;

View file

@ -1,14 +1,22 @@
// let's try this again // let's try this again
use std::collections::HashMap;
use std::sync::Arc; use std::sync::Arc;
use anyhow::Result; use anyhow::Result;
use futures::stream::Stream; use futures::{
future::{Future, TryFuture},
stream::Stream,
};
use panorama_imap::builders::command::Command;
use parking_lot::Mutex;
use tokio::{ use tokio::{
io::{AsyncRead, AsyncWrite}, io::{AsyncRead, AsyncWrite},
net::TcpStream, net::TcpStream,
sync::{oneshot, Notify},
}; };
use tokio_rustls::{rustls::ClientConfig, webpki::DNSNameRef, TlsConnector}; use tokio_rustls::{rustls::ClientConfig, webpki::DNSNameRef, TlsConnector};
use tokio_util::codec::{Framed, Decoder, LinesCodec};
use crate::config::{ImapConfig, TlsMethod}; use crate::config::{ImapConfig, TlsMethod};
@ -25,6 +33,7 @@ pub async fn open_imap_connection(config: ImapConfig) -> Result<()> {
begin_authentication(config, stream).await begin_authentication(config, stream).await
} }
TlsMethod::Starttls => { TlsMethod::Starttls => {
let cmd_mgr = CommandManager::new(stream);
todo!() todo!()
} }
} }
@ -48,9 +57,62 @@ async fn perform_tls_negotiation(
Ok(stream) Ok(stream)
} }
async fn fetch_capabilities(stream: impl AsyncRead + AsyncWrite) -> Result<Vec<String>> {
let codec = LinesCodec::new();
let framed = codec.framed(stream);
// framed.send("a0 CAPABILITY");
todo!()
}
async fn begin_authentication( async fn begin_authentication(
config: ImapConfig, config: ImapConfig,
stream: impl AsyncRead + AsyncWrite, stream: impl AsyncRead + AsyncWrite,
) -> Result<()> { ) -> Result<()> {
Ok(()) Ok(())
} }
trait ImapStream: AsyncRead + AsyncWrite + Unpin {}
impl<T: AsyncRead + AsyncWrite + Unpin> ImapStream for T {}
struct CommandManager<'a> {
id: usize,
in_flight: Arc<Mutex<HashMap<usize, oneshot::Sender<()>>>>,
stream: Framed<Box<dyn ImapStream + 'a>, LinesCodec>,
}
impl<'a> CommandManager<'a> {
pub fn new(stream: impl ImapStream + 'a) -> Self {
let codec = LinesCodec::new();
let framed = codec.framed(Box::new(stream) as Box<_>);
CommandManager {
id: 0,
in_flight: Arc::new(Mutex::new(HashMap::new())),
stream: framed,
}
}
pub fn decompose(self) -> impl ImapStream + 'a {
let parts = self.stream.into_parts();
parts.io
}
pub async fn listen(&self) {
loop {
}
}
pub fn run(&mut self, command: Command) -> impl TryFuture {
let id = self.id;
self.id += 1;
let (tx, rx) = oneshot::channel();
{
let mut in_flight = self.in_flight.lock();
in_flight.insert(id, tx);
}
async { rx.await }
}
}

View file

@ -1,7 +1,6 @@
#[macro_use] #[macro_use]
extern crate tracing; extern crate tracing;
use std::fs::{File, OpenOptions};
use std::path::PathBuf; use std::path::PathBuf;
use anyhow::Result; use anyhow::Result;
@ -68,8 +67,3 @@ async fn main() -> Result<()> {
std::process::exit(0); std::process::exit(0);
// Ok(()) // Ok(())
} }
fn setup_logger(opt: &Opt) -> Result<()> {
debug!("logging set up.");
Ok(())
}