Musselman/kitchen-freezer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added utils::build_url

Browse source
This commit is contained in:
daladim 2021-03-21 23:34:37 +01:00
parent a8ccdef0bb
commit 50ac358791
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/client.rs
View file

@ -115,8 +115,7 @@ impl Client {
}
let href = self.sub_request_and_process(&self.url, DAVCLIENT_BODY.into(), &["current-user-principal", "href"]).await?;
let mut principal_url = self.url.clone();
principal_url.set_path(&href);
let principal_url = crate::utils::build_url(&self.url, &href);
self.cached_replies.lock().unwrap().principal = Some(principal_url.clone());
log::debug!("Principal URL is {}", href);
@ -131,8 +130,7 @@ impl Client {
let principal_url = self.get_principal().await?;
let href = self.sub_request_and_process(&principal_url, HOMESET_BODY.into(), &["calendar-home-set", "href"]).await?;
let mut chs_url = self.url.clone();
chs_url.set_path(&href);
let chs_url = crate::utils::build_url(&self.url, &href);
self.cached_replies.lock().unwrap().calendar_home_set = Some(chs_url.clone());
log::debug!("Calendar home set URL is {:?}", chs_url.path());
@ -184,8 +182,7 @@ impl Client {
Some(h) => h.text(),
};
let mut this_calendar_url = self.url.clone();
this_calendar_url.set_path(&calendar_href);
let this_calendar_url = crate::utils::build_url(&self.url, &calendar_href);
let supported_components = match crate::calendar::SupportedComponents::try_from(el_supported_comps.clone()) {
Err(err) => {