Fetches the calendar home set

This commit is contained in:
daladim 2021-02-20 00:10:05 +01:00
parent 3f7de0e802
commit de3c9cd7c5
7 changed files with 1159 additions and 13 deletions

View file

@ -9,14 +9,18 @@ pub struct Calendar {
}
impl Calendar {
pub fn name(&self) -> String {
self.name
pub fn name(&self) -> &str {
&self.name
}
pub fn tasks(&self) -> Vec<&Task> {
self.tasks
.iter()
.map(|t| &t)
.collect()
}
pub fn task_by_id_mut(&mut self, id: TaskId) -> &mut Task {
todo!();
&mut self.tasks[0]
}
}

View file

@ -1,7 +1,168 @@
pub struct Client {}
//! Code to connect to a Caldav server
//!
//! Some of it comes from https://github.com/marshalshi/caldav-client-rust.git
use std::error::Error;
use reqwest::Method;
use reqwest::header::CONTENT_TYPE;
use minidom::Element;
use url::Url;
static DAVCLIENT_BODY: &str = r#"
<d:propfind xmlns:d="DAV:">
<d:prop>
<d:current-user-principal />
</d:prop>
</d:propfind>
"#;
static HOMESET_BODY: &str = r#"
<d:propfind xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav" >
<d:self/>
<d:prop>
<c:calendar-home-set />
</d:prop>
</d:propfind>
"#;
pub struct Client {
url: Url,
username: String,
password: String,
principal: Option<Url>,
calendar_home_set: Option<Url>,
}
impl Client {
pub fn new(&mut self, url: String, username: String, password: String) -> Self {
Self{}
pub fn new<S: AsRef<str>, T: ToString, U: ToString>(url: S, username: T, password: U) -> Result<Self, Box<dyn Error>> {
let url = Url::parse(url.as_ref())?;
Ok(Self{
url,
username: username.to_string(),
password: password.to_string(),
principal: None,
calendar_home_set: None,
})
}
}
/// Return the Principal URL, or fetch it from server if not known yet
async fn get_principal(&mut self) -> Result<Url, Box<dyn Error>> {
if let Some(p) = &self.principal {
return Ok(p.clone());
}
let method = Method::from_bytes(b"PROPFIND")
.expect("cannot create PROPFIND method.");
let res = reqwest::Client::new()
.request(method, self.url.as_str())
.header("Depth", 0)
.header(CONTENT_TYPE, "application/xml")
.basic_auth(self.username.clone(), Some(self.password.clone()))
.body(DAVCLIENT_BODY)
.send()
.await?;
let text = res.text().await?;
let root: Element = text.parse().unwrap();
let principal = find_elem(&root, "current-user-principal".to_string()).unwrap();
let principal_href = find_elem(principal, "href".to_string()).unwrap();
let h_str = principal_href.text();
eprintln!("URL is {}", h_str);
let mut principal_url = self.url.clone();
principal_url.set_path(&h_str);
self.principal = Some(principal_url.clone());
return Ok(principal_url);
}
/// Return the Homeset URL, or fetch it from server if not known yet
async fn get_cal_home_set(&mut self) -> Result<Url, Box<dyn Error>> {
if let Some(h) = &self.calendar_home_set {
return Ok(h.clone());
}
let principal_url = self.get_principal().await?;
let method = Method::from_bytes(b"PROPFIND")
.expect("cannot create PROPFIND method. principal");
let res = reqwest::Client::new()
.request(method, principal_url.as_str())
.header("Depth", 0)
.header(CONTENT_TYPE, "application/xml")
.basic_auth(self.username.clone(), Some(self.password.clone()))
.body(HOMESET_BODY)
.send()
.await?;
let text = res.text().await?;
let root: Element = text.parse().unwrap();
let chs = find_elem(&root, "calendar-home-set".to_string()).unwrap();
let chs_href = find_elem(chs, "href".to_string()).unwrap();
let chs_str = chs_href.text();
let mut chs_url = self.url.clone();
chs_url.set_path(&chs_str);
println!("Calendar home set {:?}", chs_url.path());
self.calendar_home_set = Some(chs_url.clone());
Ok(chs_url)
}
}
pub fn find_elems(root: &Element, tag: String) -> Vec<&Element> {
let mut elems: Vec<&Element> = Vec::new();
for el in root.children() {
if el.name() == tag {
elems.push(el);
} else {
let ret = find_elems(el, tag.clone());
elems.extend(ret);
}
}
elems
}
pub fn find_elem(root: &Element, tag: String) -> Option<&Element> {
if root.name() == tag {
return Some(root);
}
for el in root.children() {
if el.name() == tag {
return Some(el);
} else {
let ret = find_elem(el, tag.clone());
if ret.is_some() {
return ret;
}
}
}
None
}
#[cfg(test)]
mod test {
use super::*;
use crate::settings::URL;
use crate::settings::USERNAME;
use crate::settings::PASSWORD;
#[tokio::test]
async fn test_client() {
let mut client = Client::new(URL, USERNAME, PASSWORD).unwrap();
client.get_cal_home_set().await.unwrap();
}
}

View file

@ -3,6 +3,7 @@
//! This gives access to data from both the server and a local database for quick retrieval when the app starts
use std::sync::Arc;
use std::error::Error;
mod calendar;
mod task;
@ -29,13 +30,14 @@ impl DataSource {
}
/// Tell this data source what the source server is
pub fn set_server(&mut self, url: String, username: String, password: String) {
self.client = Client::new(url, username, password);
pub fn set_server(&mut self, url: String, username: String, password: String) -> Result<(), Box<dyn Error>> {
self.client = Some(Client::new(url, username, password)?);
Ok(())
}
/// Update the local database with info from the Client
pub fn fetch_from_server(&self) {
// TODO: how to handle conflicts?
pub fn fetch_from_server(&mut self) {
}
pub fn update_changes_to_server(&self) {
@ -45,7 +47,6 @@ impl DataSource {
pub fn calendars(&self) -> Vec<&Calendar> {
self.calendars
.iter()
.map(|c| &c)
.collect()
}
}

View file

@ -6,11 +6,12 @@ pub type TaskId = Uuid;
pub struct Task {
id: TaskId,
name: String,
completed: bool,
}
impl Task {
pub fn id(&self) -> Uuid { self.id }
pub fn name(&self) -> String { self.name }
pub fn name(&self) -> &str { &self.name }
pub fn completed(&self) -> bool { self.completed }
pub fn set_completed(&mut self) {

View file

@ -1 +1,2 @@
pub mod data;
pub mod settings;